From patchwork Mon Oct 29 18:58:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 149688 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4516273ljp; Mon, 29 Oct 2018 11:58:54 -0700 (PDT) X-Google-Smtp-Source: AJdET5cEZeOx/rtH3SfW+y2MO+L7kdZ9Oh3b9LNsUdDj/GigzTfYa8CmcQ+TkXCTiqMX5+c2zrPJ X-Received: by 2002:a17:902:b90c:: with SMTP id bf12-v6mr12544210plb.1.1540839534437; Mon, 29 Oct 2018 11:58:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540839534; cv=none; d=google.com; s=arc-20160816; b=gRnkplOfLdi/tFktHo1dlOwsh+W1n0lSJCBzUuLZQ9bOCylMUiJxVeNfpKZF7XYx9j gvMWkTmVTUxhJ9ka1d03nZqLL3r6btQOMVsTJS+kXjejau5O09xPr8pozp01EV8Q0Z93 fuk/PpcjUzCsxIK+oa22//YhkuBO1U6tCV5SuaqUbYuzKCCS6NEB6xXeLV9WCoFeuAJC dTxktum3Rqh+Ww19Ly9oYmmS+ssdebV+mwLcz9nfNz4DYAa4JUfvb5vq3awOIdPf9u1o RJl/Z15QgvfZ0RiAGIFUAstDI8jP3kcTEYN+3iFbSfhPvHcS2CWohau1ZkcVO4UorENz NiUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:user-agent:content-disposition :mime-version:message-id:to:from:date:dkim-signature:delivered-to; bh=Qy3TAaTJwVWHTVTAC03BdqwmDCsPrrPqKxzmFBDckxw=; b=NUMdnE7ofxi+V9/id1Q7kIjvENA8RXRV7YHvu0UIhvAFOvGrR4q4pI2JnHrPMWRgeJ jZrAmwMmVAJreIQlckcsLgkHuVsYd1Niy7rW0zyTQuTUQrgxF45o14BWeZ81LiRFs623 mYfzmJSRhZ2nQ5JqyNbefpRL1gVB38JuDlmQKlSdtYlK5CmMsXDmd9NoCYtB1WUIya4S 9KwFqU0ChQSg3+CnVwHnlyTEGavvaLChZ7HofREm3OBnowedUDTJurPadnn4pyjmmEjI 9aV2EF2vmEbaEPPyG3dTzAz9VwgaoAhyJ1wjYfNoTcTvI2qnlBlravZmHpGd2YsQRzpb W4xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=EoVBcrkj; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id d8-v6si19691492pgq.296.2018.10.29.11.58.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Oct 2018 11:58:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=EoVBcrkj; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9D8BC21184E86; Mon, 29 Oct 2018 11:58:53 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::32c; helo=mail-wm1-x32c.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B0FFD21184E83 for ; Mon, 29 Oct 2018 11:58:51 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id r63-v6so9374771wma.4 for ; Mon, 29 Oct 2018 11:58:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=gt8r+iB0btHGXBPjbit6z0mBjYZDcqZgUJSV+AWe5v0=; b=EoVBcrkjnrY5G3IKobO7gR0r5BHN0zKRqg0ehuKvb0tW5ky/pafHmEXhXmSL7yDlMr VDnmjaAFMCyD5rkytCTSIBbdBPMiBRwQg04AYrOZuYMm8xAI4VMivCqOGxoB3pR6szUI vgrx+ajajQKqcLiC0wXEiHZJmZ7VFg9K3jUww= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=gt8r+iB0btHGXBPjbit6z0mBjYZDcqZgUJSV+AWe5v0=; b=in6wr1i1UMX6NAwIFDvXPIZEWvDbVDtg+ELaLh8XY1TuPNwV9bPduY8yqXkoB9R0fr 6uNq0D4H80mFdH/pJw6DkD6wp3QtCMTthlg9iAa39CiNnITDJIjPuRTCYOOmLpIF8ASy 1xvHW25WiUCNaQTaPmroXEqkLYCRx9/s4BWypwQ5umzFsz1qLNq99lamwb1SCfm7Zku3 mKfkwdGXYuglkJW2ltHmsGxuctgB8FSNjWNOkZDcQBbcF0nzlBjFX9JJr9//d48Begoj sdY+ClJ6Jq3VQktswmjYC1m27j+a1bg9BKFDIDISl+niPqCKbCvKeP5d7B9bO2vONZx5 LEeQ== X-Gm-Message-State: AGRZ1gLjzug+Cyouq3G8pa+hfcjO8tuJof58Vlk8v5kP6FZC31KHAZnu bH0GEX7yQCF57Z4ntvqLGC4A7ovnBvY= X-Received: by 2002:a7b:c049:: with SMTP id u9-v6mr14920361wmc.14.1540839529753; Mon, 29 Oct 2018 11:58:49 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id a193-v6sm10261935wma.19.2018.10.29.11.58.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Oct 2018 11:58:48 -0700 (PDT) Date: Mon, 29 Oct 2018 18:58:46 +0000 From: Leif Lindholm To: Ming Huang Message-ID: <20181029185846.apm6guluuqsc444i@bivouac.eciton.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Subject: [edk2] D06 ACPI X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: EDK II Development Cc: edk2-devel@lists.01.org, ahs3@redhat.com, linaro-uefi@lists.linaro.org Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Hi Ming, A while back, I forwarded to Al Stone (on cc) the issues we were having with different versions of acpica-tools and the D06 ACPI table generation. He's come back with a few bugs he found in the .asl, as well as a weird bug in iasl ... apparently only reproducible under Fedora. Since the latter has not been fully investigated yet, I'll ignore that until someone flags this as an issue for them. I'm attaching a simple patch that resolves all the issues on current master. Can you please turn this into a proper patch and send out (giving Al a Reported-by:)? Main gist is reformatting some of the IORT into a form the current acpica-tools can handle, but there are also some bugfixes and closing of comment blocks. Once I have given feedback for v1 of your edk2-platforms series, please rebase that onto a version that incorporates these fixes for v2. Best Regards, Leif >From 5651683495f3d36c886f97db17976c9a6eac7b47 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Mon, 29 Oct 2018 16:34:23 +0000 Subject: [PATCH edk2-platforms] ahs3-fixes --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl | 32 +++++++------------- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl | 2 ++ 2 files changed, 13 insertions(+), 21 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl index 33b5d5250b..4037ea4f1b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl @@ -53,9 +53,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000001 [0004] DeviceID mapping index : 00000002 [0004] Input base : 00000000 @@ -99,9 +97,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000001 [0004] DeviceID mapping index : 0001 [0004] Input base : 00007c00 @@ -139,9 +135,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000001 [0004] DeviceID mapping index : 00000001 [0004] Input base : 00007400 @@ -179,9 +173,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000003 [0004] DeviceID mapping index : 00000002 [0004] Input base : 00008000 @@ -225,9 +217,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000003 [0004] DeviceID mapping index : 0001 [0004] Input base : 0000BC00 @@ -265,9 +255,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 -[0001] Reserved : 00 -[0002] Reserved : 0000 +[0001] Proximity Domain : 00000003 [0004] DeviceID mapping index : 00000001 [0004] Input base : 0000B400 @@ -290,7 +278,7 @@ [0001] Revision : 00 [0004] Reserved : 00000000 [0004] Mapping Count : 0000000C -[0004] Mapping Offset : 00000028 +[0004] Mapping Offset : 00000024 [0008] Memory Properties : [IORT Memory Access Properties] [0004] Cache Coherency : 00000001 @@ -305,6 +293,8 @@ Device Attribute : 0 [0004] ATS Attribute : 00000000 [0004] PCI Segment Number : 00000000 // should match with above MCFG + Memory Size Limit : 00 + Reserved : 00000000 /* BDF of pcie host 0 -> stream ID of pcie 0/1 SMMU */ [0004] Input base : 00000000 @@ -322,7 +312,7 @@ [0004] Flags (decoded below) : 00000000 Single Mapping : 1 -/* host2 and host3 should no open smmu for chips smmu bug * +/* host2 and host3 should no open smmu for chips smmu bug */ /* BDF of pcie host 2 -> stream ID of pcie 0/1 ITS */ [0004] Input base : 00007a00 [0004] ID Count : 00000100 // the number of IDs in range @@ -371,7 +361,7 @@ [0004] Flags (decoded below) : 00000000 Single Mapping : 1 -/* host8 and host9 should no open smmu for chips smmu bug * +/* host8 and host9 should no open smmu for chips smmu bug */ /* BDF of pcie host 8 -> stream ID of pcie ITS */ [0004] Input base : 0000BA00 [0004] ID Count : 00000100 // the number of IDs in range diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl index 63d11b83eb..f4bef6ec89 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620IortNoSmmu.asl @@ -54,6 +54,8 @@ Device Attribute : 0 [0004] ATS Attribute : 00000000 [0004] PCI Segment Number : 00000000 // should match with above MCFG + Memory Size Limit : 00 + Reserved : 00000000 /* BDF of pcie host 0 -> stream ID of pcie 0/1 SMMU */ [0004] Input base : 00000000