From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51364+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51364+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880272; cv=none; d=zohomail.com; s=zohoarc; b=EoSVFYSU71SlbBD08bqvCl2Wov3gicpi6v9sAOuarHIr4mt6ABXO/NK6I8Mi7dT+TfcPkbRa/k8uLOhVqjuJ5TZIOaQlUvSUnlKVhRj6lyJJ6CyMJDDpLCC4oXUZ9hLS3yg8ylFY0hIe1BxotePcB4fa2xl3XkQo9f1s8aadHDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880272; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=/o17RaynrrYxkEDH5ou3DMbRcMLE7zMMZGeYWGfcAlg=; b=Vj2jVM6YTLXOdUD0e1qBYISARV1ZKBEgERCGbY05GQIbcOeWHDN2oJSQL02SfzNOaoFi6kFjnqbmGuYmbxs6BU/r9tvOka/H18q1A1DUVE/3ddiXvVEp/f7bmmvpghEFhUCCfAy2kvkmanYWBvqKfeiW6vUpdPz5Nt2yHJKVdHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51364+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880272407659.2439215377522; Wed, 27 Nov 2019 10:44:32 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id p4XxYY1788612xONPt0qwb7h; Wed, 27 Nov 2019 10:44:31 -0800 X-Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web10.1008.1574880270819198550 for ; Wed, 27 Nov 2019 10:44:31 -0800 X-Received: by mail-wr1-f43.google.com with SMTP id t2so27919836wrr.1 for ; Wed, 27 Nov 2019 10:44:30 -0800 (PST) X-Gm-Message-State: YZD8JjMxK3KJkJhf12aSSuH5x1787277AA= X-Google-Smtp-Source: APXvYqxLRPqghi8HbQECX+HKskuCUosbVPPaAl9p56n0d3UxWR8JR6/bbDlITbg8TxlOyv81m7rykQ== X-Received: by 2002:adf:f20f:: with SMTP id p15mr41196244wro.370.1574880269141; Wed, 27 Nov 2019 10:44:29 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:28 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 1/8] Platform/Overdrive: add missing resolution for FileHandleLib Date: Wed, 27 Nov 2019 19:44:32 +0100 Message-Id: <20191127184439.16793-2-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880271; bh=TSa/9kI4PGm4nBY0ngLxINJfa/iCc0h3T3CZUGrFGGM=; h=Cc:Date:From:Reply-To:Subject:To; b=KS1nX0KEDf0+dOOjq3m6uGfO8MuTJ70+bRQYFiF4PrTe6bgWnPC6UvBN4G3hJoB2to3 EFi/X7AcfRfU/k3PuThaf33vez1tNVnF3DZaOktSOCc/t+WO2/mswkIQ3nKqfvlMg0kpZ JYHm5UfDeJohYQveOtPKAZQFSHIqUmPdPAI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Changes to the core EDK2 repository have caused the build for Overdrive to break. Move the existing FileHandleLib resolution to global scope to get things working again. Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/OverdriveBoard.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/= OverdriveBoard/OverdriveBoard.dsc index 7369173cc125..5a38b9dd96ae 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -142,6 +142,7 @@ [LibraryClasses.common] DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf =20 DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf @@ -697,7 +698,6 @@ [Components.common] PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.inf =20 - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf =20 --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51364): https://edk2.groups.io/g/devel/message/51364 Mute This Topic: https://groups.io/mt/62736729/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51365+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51365+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880273; cv=none; d=zohomail.com; s=zohoarc; b=W6YAnhdu8czIZp4WGMW+qzADTr+kWdSEbtktM8bZicbZPMhTjVNJNebQhmRVU2EHVfvny7aPe8T9jNT0owACWB1ZaA7m4msKzomsDVscICZeWL782jo2Q+49AoYULOurNRCR+SNdRS1M+iRO+ub48fsd/TuJLkZiChO/nYVwuZA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880273; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=y8OtlHsk3wKAqzYBj2ESh8gDeH3cBFuWvR/zOX9qVkk=; b=iowslxrpbEXdLbIloWH+2MoPjgEkyGEbmbKhZcf3g+HXVkcE7Zam5dQ5bY4A+dSfSdXnTts01Y/jdTBF8gdQ+O6sFSYfJ9JshpcNQy5tFcyI9ptPoqwV8WpYi7HtGJ9qpmodFQOeLjol7goeg3P53/i9SuZAHtDvTAj15GrOP64= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51365+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880273197194.98615065901356; Wed, 27 Nov 2019 10:44:33 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id UODYYY1788612x21r0eA078f; Wed, 27 Nov 2019 10:44:32 -0800 X-Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web12.1038.1574880272000942246 for ; Wed, 27 Nov 2019 10:44:32 -0800 X-Received: by mail-wr1-f65.google.com with SMTP id j42so2074960wrj.12 for ; Wed, 27 Nov 2019 10:44:31 -0800 (PST) X-Gm-Message-State: XXSnZQEvEUR8vOeVd1hdz6wgx1787277AA= X-Google-Smtp-Source: APXvYqwR0v2b7UvXYQERUDzesaCmNhYK1uFFLVtf6LFZ2ycx6GTUtjrmgmOs6NyT5K3X7D8NWDsReg== X-Received: by 2002:a5d:5345:: with SMTP id t5mr6727606wrv.0.1574880270331; Wed, 27 Nov 2019 10:44:30 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:29 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 2/8] Platform/Overdrive: clean up stream ID descriptions in DT Date: Wed, 27 Nov 2019 19:44:33 +0100 Message-Id: <20191127184439.16793-3-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880272; bh=swx7E4T++HTkHSv8k64Xi1RxrVI3sq65SAw5byN4Oq0=; h=Cc:Date:From:Reply-To:Subject:To; b=Vog1EF8kTrcV6qdW5gfGo8a72wjwjmUS10lEjGz2ZxipWMTRPRgpf877wtPPLYWbvZG lxMt6JOQ3dAouFQTvoLFYKJ0F4dMhTy7ZMBDovbqhu1mNpru09SF8+hrfjoUuroiEF+zz jdaH3z6bL8JCJG8E4Z+cY6eGUgG3VG8cb/4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Align the DT description of the SMMU topology and stream IDs with the actual routing of the SoC. As with the preceding IORT change, this is mostly a cleanup exercise, but it does actually fix an issue with the CCP crypto accelerator on B1 silicon. Since the CCP shares its SMMU with the second SATA controller, which is only enabled on B1 silicon, we can drop the logic that disables this SMMU on B0 silicon or on platforms that do not expose any SATA ports on the second controller (such as the Cello). Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts | 23 ++++++++= +++++++----- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 6 +---- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts b/Pl= atform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts index 1ba0d403eaf0..1d8a6caafd82 100644 --- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts +++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts @@ -86,7 +86,7 @@ */ <0 332 4>, <0 332 4>; - #iommu-cells =3D <2>; + #iommu-cells =3D <1>; dma-coherent; }; =20 @@ -99,7 +99,7 @@ */ <0 331 4>, <0 331 4>; - #iommu-cells =3D <2>; + #iommu-cells =3D <1>; dma-coherent; }; =20 @@ -109,7 +109,12 @@ interrupts =3D <0x0 0x163 0x4>; clocks =3D <&sata_clk>; dma-coherent; - iommus =3D <&sata0_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&sata0_smmu 0x0a>, + <&sata0_smmu 0x0b>, + <&sata0_smmu 0x0e>, + <&sata0_smmu 0x0f>, + <&sata0_smmu 0x1a>, + <&sata0_smmu 0x1e>; }; =20 sata@e0d00000 { @@ -119,7 +124,9 @@ interrupts =3D <0x0 0x162 0x4>; clocks =3D <&sata_clk>; dma-coherent; - iommus =3D <&sata1_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&sata1_smmu 0x0e>, + <&sata1_smmu 0x0f>, + <&sata1_smmu 0x1e>; }; =20 i2c@e1000000 { @@ -233,6 +240,10 @@ interrupts =3D <0x0 0x3 0x4>; dma-coherent; amd,zlib-support =3D <0x1>; + iommus =3D <&sata1_smmu 0x00>, + <&sata1_smmu 0x02>, + <&sata1_smmu 0x40>, + <&sata1_smmu 0x42>; }; =20 pcie: pcie@f0000000 { @@ -409,7 +420,7 @@ phy-handle =3D <&xgmac0_phy>; phy-mode =3D "xgmii"; dma-coherent; - iommus =3D <&xgmac0_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&xgmac0_smmu 0x00 0x17>; /* 0-7, 16-23 */ }; =20 xgmac@e0900000 { @@ -428,7 +439,7 @@ phy-handle =3D <&xgmac1_phy>; phy-mode =3D "xgmii"; dma-coherent; - iommus =3D <&xgmac1_smmu 0x00 0x1f>; /* 0-31 */ + iommus =3D <&xgmac1_smmu 0x00 0x17>; /* 0-7, 16-23 */ }; }; =20 diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index c84c1a81c3ec..261b5f59c8df 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -212,8 +212,6 @@ DisableSmmu ( =20 Node =3D fdt_path_offset (Fdt, SmmuNodeName); if (Node <=3D 0) { - DEBUG ((DEBUG_WARN, "%a: Failed to find path %s: %a\n", - __FUNCTION__, SmmuNodeName, fdt_strerror (Node))); return; } =20 @@ -251,9 +249,7 @@ SetSocIdStatus ( if (!PcdGetBool (PcdEnableSmmus)) { DisableSmmu (Fdt, "iommu-map", "/smb/smmu@e0a00000", "/smb/pcie@f00000= 00"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0200000", "/smb/sata@e0300000"= ); - } - - if (!PcdGetBool (PcdEnableSmmus) || !IsRevB1 || FixedPcdGet8 (PcdSata1Po= rtCount) =3D=3D 0) { + DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/ccp@e0100000"); DisableSmmu (Fdt, "iommus", "/smb/smmu@e0c00000", "/smb/sata@e0d00000"= ); } =20 --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51365): https://edk2.groups.io/g/devel/message/51365 Mute This Topic: https://groups.io/mt/62736781/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51366+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51366+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880274; cv=none; d=zohomail.com; s=zohoarc; b=U+s4bS4WAUIO/PrcddMEYZNbdh0OgWQ8NkYqRTEMBuylwcxdxjf5TM4o4yWByhGr8RQ+PDF2SFGYZUytzUB53nRpM6v2TD+ThMMFGHr2vKOBlZ+RFSp8tnWx8kMyeXXvsnrdM8SZCe2b6AKzdYIIXqUc4Yqyp9z8IQUlPGlyI/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880274; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=lxPgQBdOBquFm66ULphsiivBRB/Z3CruNiSn9RBhg4o=; b=Up1Us6iqpajerYXjAfsErdf3IlR4GQKZ15kuI16w5txzwcDfFwdyIV64Fs3/wQJF44i/5iRCk3CicKL/3O059HA6qw35GnxuqaWEAX3uW78vl5ZmG6dt+1B796tJfylOWGwFyplqPwjwL50Vt9sFGHsj+QRr/X8vegve4syp+ko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51366+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880274909391.1369325153678; Wed, 27 Nov 2019 10:44:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id zvcoYY1788612x3y7FbTKmaJ; Wed, 27 Nov 2019 10:44:33 -0800 X-Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mx.groups.io with SMTP id smtpd.web09.1072.1574880273287748248 for ; Wed, 27 Nov 2019 10:44:33 -0800 X-Received: by mail-wm1-f67.google.com with SMTP id j18so5541442wmk.1 for ; Wed, 27 Nov 2019 10:44:32 -0800 (PST) X-Gm-Message-State: HMD4m0bcqTnT5LQGIxghFrnNx1787277AA= X-Google-Smtp-Source: APXvYqztkONO4slu0iuZbzNeODoRHfg+oC3qvgO44UiQQ1yEXvMe7UvIfW5SOscUmDt2Zz1q87aXcw== X-Received: by 2002:a7b:cb09:: with SMTP id u9mr5784805wmj.28.1574880271604; Wed, 27 Nov 2019 10:44:31 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:30 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 3/8] Platform/Overdrive: fix a typo in the DT Date: Wed, 27 Nov 2019 19:44:34 +0100 Message-Id: <20191127184439.16793-4-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880273; bh=INT+fFBAYgO/4/oLjfm3ySyjWHiKJiBmXEf1joDDQ4A=; h=Cc:Date:From:Reply-To:Subject:To; b=TYuYPdFbozM6dvIRgjEAKwA9BHqShgpFHN7Co85Zhh8lKZWN0gnGY4mLbKVmqHfEenB Igqj981WGV1IrXQGiGc23F0CJNKPI1Oq3eOwNjZAPjVgi/tQCEX+S2iC84d2TTZVXpSeb GGGRdRNRF2/ueVCTQnNnjzS6DsOfhUog+vI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" DT unit addresses are hex quantities but they should not include the 0x prefix. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts b/Pl= atform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts index 1d8a6caafd82..a92ab695fb2e 100644 --- a/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts +++ b/Platform/AMD/OverdriveBoard/DeviceTree/OverdriveBoard.dts @@ -291,7 +291,7 @@ dma-coherent; }; =20 - ccn@0xe8000000 { + ccn@e8000000 { compatible =3D "arm,ccn-504"; reg =3D <0x0 0xe8000000 0x0 0x1000000>; interrupts =3D <0x0 0x17c 0x4>; --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51366): https://edk2.groups.io/g/devel/message/51366 Mute This Topic: https://groups.io/mt/62736828/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51367+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51367+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880275; cv=none; d=zohomail.com; s=zohoarc; b=ijp60CGI50CV/vqXL+rbwZRtSs1VVl7wC00WZIGY6pWi/NU4ABo0PmtwxiwPEBCjQOcBZRDyiwxuqmLhwowbso7qtxDWl8yqw9/MF8/6SGj1N7NCPc3e0iKlAy9vM7KuamsaRF54jr4b4P0ejY4WZpUqsn1kDRQcvb7Av9fl4i4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880275; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=ivEEWEH3pvtlp35k4NGCVq0Mohps6Wqj4Bis8tuX+cw=; b=eHjhlq5pDOwcohEk7GKYAzZXLzvlNzMBftoeD5i26/WOzxvDLsPfvlhJXohMUhlH9GHRw8mmO6BEN4E4IbzzjQL6W731NySfUv5FHg9rzn8R6IeeIZG//Wd8iZRtgQauCBgM5S5qK9t1dT4megJ37E2YfPbFyMqfZ0/5HvYke3c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51367+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880275667506.2505734115539; Wed, 27 Nov 2019 10:44:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id r0dzYY1788612x0j5xgEM54X; Wed, 27 Nov 2019 10:44:35 -0800 X-Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web11.1020.1574880274512452919 for ; Wed, 27 Nov 2019 10:44:34 -0800 X-Received: by mail-wr1-f65.google.com with SMTP id j42so2075092wrj.12 for ; Wed, 27 Nov 2019 10:44:34 -0800 (PST) X-Gm-Message-State: GgCwDcE1mmk0BOU2TcVHjlnux1787277AA= X-Google-Smtp-Source: APXvYqx1inLjIS0YP4cMMvD3KJC9L5NrVE1ebWYFnUgKBx072aEpDxZihnfUaWj5uxiypbnoTT1SRg== X-Received: by 2002:adf:c611:: with SMTP id n17mr45258641wrg.317.1574880272834; Wed, 27 Nov 2019 10:44:32 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:32 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 4/8] Silicon/AMD/Styx: clean up stream ID mappings for SMMU Date: Wed, 27 Nov 2019 19:44:35 +0100 Message-Id: <20191127184439.16793-5-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880275; bh=5666dK96BUmUuHpOi12Y3rdDwcVxX3xyd23Z6QABY94=; h=Cc:Date:From:Reply-To:Subject:To; b=IILlkBDox7Rz0/DBKdOh5IsGB7ItWp54kS872yLAonp/JJrXzyUjkkR/MTGRZK/rnCu YuRJAXigpVnopYPOl2Y7IE4AaC9hbC40EmCWK0XVCY/wEYM2sGV/uWVzzZggNX9YC4EfY 6XvwNWgA1RSWGD/VB0+jhijYwDmJYQOWCTA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Tighten the stream ID mappings for the SMMU to only cover the stream IDs that are actually being issued by the respective masters. This is mostly just a cleanup exercise, since specifying unused stream IDs does not typically create any problems. However, the CCP crypto accelerator on B1 silicon actually uses stream IDs that we assigned to the second SATA controller, so there this actually fixes a problem. Since the crypto accelerator shares its SMMU with the second AHCI controller, we can drop the logic that hides the associated IORT node when running on B0 silicon. Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c | 5 - Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 117 ++++--------= -------- 2 files changed, 22 insertions(+), 100 deletions(-) diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c b/Sili= con/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c index 743ef0f65523..7c267542db19 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/AcpiPlatform.c @@ -123,7 +123,6 @@ InstallSystemDescriptionTables ( UINTN TableSize; UINTN TableHandle; EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE *Gtdt; - EFI_ACPI_6_0_IO_REMAPPING_TABLE *Iort; EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER *Madt; EFI_ACPI_5_1_GIC_STRUCTURE *GicC; UINT8 MacPackage[sizeof(mDefaultMacPackageA)]; @@ -177,10 +176,6 @@ InstallSystemDescriptionTables ( if (!PcdGetBool (PcdEnableSmmus)) { continue; } - if ((CpuId & STYX_SOC_VERSION_MASK) < STYX_SOC_VERSION_B1) { - Iort =3D (EFI_ACPI_6_0_IO_REMAPPING_TABLE *)Table; - Iort->NumNodes -=3D 2; - } break; =20 case EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE: diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/A= MD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc index d46be49f0318..7bdc34f6737e 100644 --- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc +++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc @@ -46,7 +46,7 @@ typedef struct { typedef struct { EFI_ACPI_6_0_IO_REMAPPING_NAMED_COMP_NODE Node; CONST CHAR8 Name[11]; - EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMapping[32]; + EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMapping[16]; } STYX_NC_NODE; =20 typedef struct { @@ -63,6 +63,7 @@ typedef struct { STYX_NC_NODE Sata0NamedNode; STYX_SMMU_NODE Sata1SmmuNode; STYX_NC_NODE Sata1NamedNode; + STYX_NC_NODE CcpNamedNode; } STYX_IO_REMAPPING_STRUCTURE; =20 #define __STYX_SMMU_NODE(Base, Size, Irq) \ @@ -114,14 +115,18 @@ typedef struct { EFI_ACPI_IORT_ID_MAPPING_FLAGS_SINGLE \ } =20 -#define __STYX_NAMED_COMPONENT_NODE(Name) \ +#define __STYX_NUM_NODES(Type) \ + ((sizeof(Type) - FIELD_OFFSET(Type, RcIdMapping)) / \ + sizeof(EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE)) + +#define __STYX_NAMED_COMPONENT_NODE(Name, Num) \ { \ { \ EFI_ACPI_IORT_TYPE_NAMED_COMP, \ sizeof(STYX_NC_NODE), \ 0x0, \ 0x0, \ - 0x20, \ + Num, \ FIELD_OFFSET(STYX_NC_NODE, RcIdMapping), \ }, \ 0x0, \ @@ -139,7 +144,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { AMD_ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE, STYX_IO_REMAPPING_STRUCTURE, EFI_ACPI_IO_REMAPPING_TABLE_REVISION), - 10, // NumNodes + 11, // NumNodes sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE), // NodeOffset 0 // Reserved }, { @@ -175,7 +180,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_ETH0_SMMU_INTERRUPT) }, { // Eth0NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH0"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH0", 16), { __STYX_ID_MAPPING_SINGLE(0x00, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x01, Eth0SmmuNode), @@ -185,14 +190,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x05, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x06, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x07, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0E, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0F, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x10, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x11, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x12, Eth0SmmuNode), @@ -201,14 +198,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x15, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x16, Eth0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x17, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1E, Eth0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Eth0SmmuNode), } }, { // Eth1SmmuNode @@ -217,7 +206,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_ETH1_SMMU_INTERRUPT) }, { // Eth1NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH1"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.ETH1", 16), { __STYX_ID_MAPPING_SINGLE(0x00, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x01, Eth1SmmuNode), @@ -227,14 +216,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x05, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x06, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x07, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0E, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0F, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x10, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x11, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x12, Eth1SmmuNode), @@ -243,14 +224,6 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { __STYX_ID_MAPPING_SINGLE(0x15, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x16, Eth1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x17, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1E, Eth1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Eth1SmmuNode), } }, { // Sata0SmmuNode @@ -259,40 +232,14 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_SATA0_SMMU_INTERRUPT) }, { // Sata0NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC0"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC0", 6), { - __STYX_ID_MAPPING_SINGLE(0x00, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x01, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x02, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x03, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x04, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x05, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x06, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x07, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0A, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0B, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0E, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0F, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x10, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x11, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x12, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x13, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x14, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x15, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x16, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x17, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1A, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Sata0SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1E, Sata0SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Sata0SmmuNode), } }, { // Sata1SmmuNode @@ -301,40 +248,20 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort =3D { STYX_SATA1_SMMU_INTERRUPT) }, { // Sata1NamedNode - __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC1"), + __STYX_NAMED_COMPONENT_NODE("\\_SB_.AHC1", 3), { - __STYX_ID_MAPPING_SINGLE(0x00, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x01, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x02, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x03, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x04, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x05, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x06, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x07, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x08, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x09, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0A, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0B, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0C, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x0D, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0E, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x0F, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x10, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x11, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x12, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x13, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x14, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x15, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x16, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x17, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x18, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x19, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1A, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1B, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1C, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1D, Sata1SmmuNode), __STYX_ID_MAPPING_SINGLE(0x1E, Sata1SmmuNode), - __STYX_ID_MAPPING_SINGLE(0x1F, Sata1SmmuNode), + } + }, { + // CcpNamedNode + __STYX_NAMED_COMPONENT_NODE("\\_SB_.CCP0", 4), + { + __STYX_ID_MAPPING_SINGLE(0x00, Sata1SmmuNode), + __STYX_ID_MAPPING_SINGLE(0x02, Sata1SmmuNode), + __STYX_ID_MAPPING_SINGLE(0x40, Sata1SmmuNode), + __STYX_ID_MAPPING_SINGLE(0x42, Sata1SmmuNode), } } }; --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51367): https://edk2.groups.io/g/devel/message/51367 Mute This Topic: https://groups.io/mt/62736883/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51368+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51368+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880277; cv=none; d=zohomail.com; s=zohoarc; b=QsAlmbCCJTyimsPqRX73D2gM51+bBATakmyybTJjDBhIva4edwzpjOm+kbsNqco0UY2NrVpgj14wh9M6Ul7swCms+mmoX9dxPCQcTrkmg2yIVpfiCghu8bPJkZk8e31+J070up2qUt04HdKuJSSsZ/7a4nA3PHdI5J7Q6/SyYPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880277; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=SgfIgFXmMjk4gS96Y4DC4XjIvRYelIfeIEMPv0m7KTo=; b=Ox7ZCckxxW8RSuCKFwHH0UNRG1fuax4piYKmLEsGsPImcDkMa3gokRtQvda5iiZrNjuxPR9TspwArL/GALoNB3MOd605Lngu+8cv7m19qUTbGMGtWuK7zf8soWxU8CJaqpNRGWDnKn+4xJpcaHjh1tEanxIR6/VpYVY1O+O8xLY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51368+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880277541462.1691268866276; Wed, 27 Nov 2019 10:44:37 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id BhmjYY1788612xRzPnCs4LMl; Wed, 27 Nov 2019 10:44:36 -0800 X-Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web11.1021.1574880275916759868 for ; Wed, 27 Nov 2019 10:44:36 -0800 X-Received: by mail-wr1-f67.google.com with SMTP id a15so27924846wrf.9 for ; Wed, 27 Nov 2019 10:44:35 -0800 (PST) X-Gm-Message-State: Y54XbWDwJJsTJRo0sBY0dqgIx1787277AA= X-Google-Smtp-Source: APXvYqwUIH3BT65VAn3PFwlea8g6jJW7sNqNZqxWIfPUvEOy0iG34OcK3BOinm3UaYMMmXDegSc74w== X-Received: by 2002:adf:f103:: with SMTP id r3mr7567537wro.295.1574880274308; Wed, 27 Nov 2019 10:44:34 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:33 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 5/8] Silicon/AMD/StyxDtbLoaderLib: add interrupt-affinity property to PMU node Date: Wed, 27 Nov 2019 19:44:36 +0100 Message-Id: <20191127184439.16793-6-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880276; bh=GH4GvNjL2k04M3unyzMSEc5xhefPUdwA3AJyOdFkbNU=; h=Cc:Date:From:Reply-To:Subject:To; b=BN6tY3JbE3ZGI0IWYemYBnNadT9FcASZnHbcthHUigiRxQSjJGJRxpmLCOPae2nd6jc 2DwQRrKVJMnyTdHQp6ARdJ9o+CaV/OXbYXNwvpWVTUx5jOSVUNDU2T6Gh75dDxIusnAJf qJLUPE2X7+Yan3CtN7XO0OPXl30CphD2znY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" AMD Seattle uses a range of SPIs to signal PMU events, and this requires a description in the DT which SPI maps to which CPU. This requires us to defer the generation of the PMU node to a point where the CPU phandles have been allocated. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 55 ++++++++= ++---------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index 261b5f59c8df..2f7b5e2a7b25 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -331,33 +331,6 @@ PrepareFdt ( // Get Id from primary CPU MpId =3D (UINTN)ArmReadMpidr (); =20 - // Create /pmu node - PmuNode =3D fdt_add_subnode(Fdt, 0, "pmu"); - if (PmuNode >=3D 0) { - fdt_setprop_string (Fdt, PmuNode, "compatible", "arm,armv8-pmuv3"); - - // append PMU interrupts - for (Index =3D 0; Index < ArmCoreCount; Index++) { - MpId =3D (UINTN)GET_MPID (ArmCoreInfoTable[Index].ClusterId, - ArmCoreInfoTable[Index].CoreId); - - Status =3D AmdMpCoreInfoProtocol->GetPmuSpiFromMpId (MpId, &PmuInt.I= ntId); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, - "FDT: Error getting PMU interrupt for MpId '0x%x'\n", MpId)); - return Status; - } - - PmuInt.Flag =3D cpu_to_fdt32 (PMU_INT_FLAG_SPI); - PmuInt.IntId =3D cpu_to_fdt32 (PmuInt.IntId); - PmuInt.Type =3D cpu_to_fdt32 (PMU_INT_TYPE_HIGH_LEVEL); - fdt_appendprop (Fdt, PmuNode, "interrupts", &PmuInt, sizeof(PmuInt)); - } - } else { - DEBUG ((DEBUG_ERROR, "FDT: Error creating 'pmu' node\n")); - return EFI_INVALID_PARAMETER; - } - // Create /cpus noide Node =3D fdt_add_subnode (Fdt, 0, "cpus"); if (Node >=3D 0) { @@ -449,6 +422,34 @@ PrepareFdt ( return EFI_INVALID_PARAMETER; } =20 + // Create /pmu node + PmuNode =3D fdt_add_subnode(Fdt, 0, "pmu"); + if (PmuNode >=3D 0) { + fdt_setprop_string (Fdt, PmuNode, "compatible", "arm,armv8-pmuv3"); + + // append PMU interrupts + for (Index =3D 0; Index < ArmCoreCount; Index++) { + MpId =3D (UINTN)GET_MPID (ArmCoreInfoTable[Index].ClusterId, + ArmCoreInfoTable[Index].CoreId); + + Status =3D AmdMpCoreInfoProtocol->GetPmuSpiFromMpId (MpId, &PmuInt.I= ntId); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, + "FDT: Error getting PMU interrupt for MpId '0x%x'\n", MpId)); + return Status; + } + + PmuInt.Flag =3D cpu_to_fdt32 (PMU_INT_FLAG_SPI); + PmuInt.IntId =3D cpu_to_fdt32 (PmuInt.IntId); + PmuInt.Type =3D cpu_to_fdt32 (PMU_INT_TYPE_HIGH_LEVEL); + fdt_appendprop (Fdt, PmuNode, "interrupts", &PmuInt, sizeof(PmuInt)); + fdt_appendprop_cell (Fdt, PmuNode, "interrupt-affinity", Phandle[Ind= ex]); + } + } else { + DEBUG ((DEBUG_ERROR, "FDT: Error creating 'pmu' node\n")); + return EFI_INVALID_PARAMETER; + } + SetSocIdStatus (Fdt); SetXgbeStatus (Fdt); =20 --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51368): https://edk2.groups.io/g/devel/message/51368 Mute This Topic: https://groups.io/mt/62736947/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51369+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51369+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880278; cv=none; d=zohomail.com; s=zohoarc; b=MIC8Xuy2hnz5R2VWFgee+Irb+o7xC4VIilu1eDc5tAJW5vCQnL8O9ltjK5Wa5+cfjEcppR+4TkynP3/X0vxUbrjfYxsKg8v9S56C94ZIR8oy2fqvnFTfV3VQ+HZ1dwseGadCc1ODZhbs8iq2CoHTt9GRQldT1xe/H3ADU6ENn20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880278; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=uBXJxLNBCJGwVLQiwZzUgWsTO5hSZTbZXPqCKUhE0ng=; b=mPfPtHnbJ+De44SVmTjaSBwlZREm73GTSsxq9g7Md+wy3zpDjxchw90nJLtewExemjOyJkIsXWQaPxFsSAR2qJUd1hXe7H3pf/Sc0l8IpGOJE1OXA+UcXARqpaCKPXmOzMGdim3h7Rbpl9alxLVD/YeRKlV2U1fPxkBID3tJ5OU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51369+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880278207797.6676560218095; Wed, 27 Nov 2019 10:44:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id LHAlYY1788612xPfy8GrNp2t; Wed, 27 Nov 2019 10:44:37 -0800 X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web09.1074.1574880277127090349 for ; Wed, 27 Nov 2019 10:44:37 -0800 X-Received: by mail-wr1-f66.google.com with SMTP id i12so27992597wro.5 for ; Wed, 27 Nov 2019 10:44:36 -0800 (PST) X-Gm-Message-State: Uco6f9UxaBN48p2lCiQukUSmx1787277AA= X-Google-Smtp-Source: APXvYqxONJZkv4fT4nyyXYTmcyKtKGlHcvoahhSZ2ziHJO9ZOULqbtxZDcop89ydqi6Rirh9LSUJaw== X-Received: by 2002:adf:f5c6:: with SMTP id k6mr42657017wrp.245.1574880275537; Wed, 27 Nov 2019 10:44:35 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:34 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 6/8] Silicon/AMD/StyxDtbLoaderLib: add description of the cache topology Date: Wed, 27 Nov 2019 19:44:37 +0100 Message-Id: <20191127184439.16793-7-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880277; bh=zXAlYJwpEzJQzRPH7Gb3D5Rje9rpmuE6lGr3KqqppLc=; h=Cc:Date:From:Reply-To:Subject:To; b=VD0KHwMXaJh6z0K/xeSmzsyY/EG1blbtNPDbu+LHhPkHT7+W8vypi8CoQcKiAY13uT9 nywCJYm/xn9A1MKHZVhFEaaXewnk8hj8wAXrgQL+3MfEJlVmHuS9bBi1wsOHjNv6HGUVI WcITXwLz0phLQkG/DnmaBtTYiE4NkyYuvcg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Emit the cache topology into the device tree too when generating the CPU nodes and the cpu-map. Note that the cache geometries are all fixed and thus hardcoded - the only runtime variable aspect is how many L2 nodes to generate (one per detected cluster) Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 49 ++++++++= ++++++++++++ 1 file changed, 49 insertions(+) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index 2f7b5e2a7b25..e723e77c7965 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -305,6 +305,10 @@ PrepareFdt ( UINT32 ClusterCount; UINT32 CoresInCluster; UINT32 ClusterId; + INT32 L2Node; + INT32 L3Node; + INT32 L2Phandle[NUM_CORES / 2]; + INT32 L3Phandle; UINTN MpId; CHAR8 Name[10]; AMD_MP_CORE_INFO_PROTOCOL *AmdMpCoreInfoProtocol; @@ -328,6 +332,42 @@ PrepareFdt ( ASSERT (ArmCoreInfoTable !=3D NULL); ASSERT (ArmCoreCount <=3D NUM_CORES); =20 + // Create the L3 cache node + L3Node =3D fdt_add_subnode (Fdt, 0, "l3cache"); + if (L3Node < 0) { + DEBUG ((DEBUG_ERROR, "FDT: Error creating 'l3cache' node\n")); + return EFI_INVALID_PARAMETER; + } + + L3Phandle =3D fdt_alloc_phandle (Fdt); + fdt_setprop_cell (Fdt, L3Node, "cache-level", 3); + fdt_setprop_cell (Fdt, L3Node, "cache-size", SIZE_8MB); + fdt_setprop_cell (Fdt, L3Node, "cache-line-size", 64); + fdt_setprop_cell (Fdt, L3Node, "cache-sets", 8192); + fdt_setprop_empty (Fdt, L3Node, "cache-unified"); + fdt_setprop_cell (Fdt, L3Node, "phandle", L3Phandle); + + ClusterCount =3D NumberOfClustersInTable (ArmCoreInfoTable, ArmCoreCount= ); + ASSERT (ClusterCount <=3D ARRAY_SIZE (L2Phandle)); + + for (Index =3D 0; Index < ClusterCount; Index++) { + AsciiSPrint (Name, sizeof (Name), "l2cache%d", Index); + + L2Node =3D fdt_add_subnode (Fdt, 0, Name); + if (L2Node < 0) { + DEBUG ((DEBUG_ERROR, "FDT: Error creating '%a' node\n", Name)); + return EFI_INVALID_PARAMETER; + } + + L2Phandle[Index] =3D fdt_alloc_phandle (Fdt); + fdt_setprop_cell (Fdt, L2Node, "cache-size", SIZE_1MB); + fdt_setprop_cell (Fdt, L2Node, "cache-line-size", 64); + fdt_setprop_cell (Fdt, L2Node, "cache-sets", 1024); + fdt_setprop_empty (Fdt, L2Node, "cache-unified"); + fdt_setprop_cell (Fdt, L2Node, "next-level-cache", L3Phandle); + fdt_setprop_cell (Fdt, L2Node, "phandle", L2Phandle[Index]); + } + // Get Id from primary CPU MpId =3D (UINTN)ArmReadMpidr (); =20 @@ -367,6 +407,15 @@ PrepareFdt ( fdt_setprop (Fdt, CpuNode, "reg", &MpId, sizeof (MpId)); fdt_setprop_string (Fdt, CpuNode, "compatible", "arm,armv8"); fdt_setprop_string (Fdt, CpuNode, "device_type", "cpu"); + + fdt_setprop_cell (Fdt, CpuNode, "i-cache-size", 3 * SIZE_16KB); + fdt_setprop_cell (Fdt, CpuNode, "i-cache-line-size", 64); + fdt_setprop_cell (Fdt, CpuNode, "i-cache-sets", 256); + fdt_setprop_cell (Fdt, CpuNode, "d-cache-size", 2 * SIZE_16KB); + fdt_setprop_cell (Fdt, CpuNode, "d-cache-line-size", 64); + fdt_setprop_cell (Fdt, CpuNode, "d-cache-sets", 256); + fdt_setprop_cell (Fdt, CpuNode, "l2-cache", + L2Phandle[ArmCoreInfoTable[Index].ClusterId]); } =20 // Create /cpu-map node --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51369): https://edk2.groups.io/g/devel/message/51369 Mute This Topic: https://groups.io/mt/62736997/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51370+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51370+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880279; cv=none; d=zohomail.com; s=zohoarc; b=b2Od3Jys6xO8td6cA6HB9CUJcPeFZed4YvDWeO+S877aWtV2B1h70sYGrE/1eoA/peFykny0zjlhAX4fcCt6C1PKO3CAIYscL/iHjBYBTH9rWLk8mTPZtJHxPAhL4pIlVNTg3ZpSd8kyYP3lTgx4igsXh+Jj6e9Xj1NM6aPODTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880279; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=AK85Jjn50eQVBkDrq/9BqYRKbTp0Zyldnao0Wgi44tI=; b=M6rcsEyZiorjqeTmwHBVl0UDDGqDBkcWF4KUia4vhoRJqMNXN97LVagixU8+Q2ZT309PQSQtkCwi4RrXOJSQyBS+uFJlyHypnaaxZo4BOtiK7Gbf3ESuVKwUhKhejiUSBg4CTdmw9QEalOQKs4HCQ3vycIvNXk2IcHMifVI1XRA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51370+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880279857905.8007549593984; Wed, 27 Nov 2019 10:44:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mTWeYY1788612xWA84vZPtvA; Wed, 27 Nov 2019 10:44:39 -0800 X-Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web09.1075.1574880278273535619 for ; Wed, 27 Nov 2019 10:44:38 -0800 X-Received: by mail-wr1-f68.google.com with SMTP id s5so27912072wrw.2 for ; Wed, 27 Nov 2019 10:44:38 -0800 (PST) X-Gm-Message-State: p61Nu0My1BKvSwXNvGpLN3xOx1787277AA= X-Google-Smtp-Source: APXvYqzXLnugxV6TI6OBq73Z13WLtjr+HsBtwHEHGxQZqyWna45+VnI8ph8XtipCjMVlzGPO/DOasg== X-Received: by 2002:a5d:558e:: with SMTP id i14mr12398559wrv.140.1574880276665; Wed, 27 Nov 2019 10:44:36 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:36 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 7/8] Silicon/AMD/StyxDtbLoaderLib: use Cortex-A57 IDs instead of generic ARMv8 Date: Wed, 27 Nov 2019 19:44:38 +0100 Message-Id: <20191127184439.16793-8-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880279; bh=jrXf0DRA4dyJNfC5AF3+09617VfUCcQ9OPYUVCoMwHY=; h=Cc:Date:From:Reply-To:Subject:To; b=uSnAqj59kowBulWAVHPEjfrhnoul09l6zfJVCYeNriKZsgEanLAUfA+Ugt48cILIr3W BrTr/Hv9BhVuyJ2f0MoDT0Oc7VV/2H9pQdEKaQVqjGxFMP5bhcQkiJu4AoB4V9amwtjo/ qhWuG1euqs+MWR4sgN96xL8tHjyzQfRatI0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use the more precise Cortex-A57 based compatible strings to describe the CPUs and the PMUs in the device tree. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index e723e77c7965..091d151ac722 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -405,7 +405,7 @@ PrepareFdt ( ArmCoreInfoTable[Index].CoreId); MpId =3D cpu_to_fdt64 (MpId); fdt_setprop (Fdt, CpuNode, "reg", &MpId, sizeof (MpId)); - fdt_setprop_string (Fdt, CpuNode, "compatible", "arm,armv8"); + fdt_setprop_string (Fdt, CpuNode, "compatible", "arm,cortex-a57"); fdt_setprop_string (Fdt, CpuNode, "device_type", "cpu"); =20 fdt_setprop_cell (Fdt, CpuNode, "i-cache-size", 3 * SIZE_16KB); @@ -474,7 +474,7 @@ PrepareFdt ( // Create /pmu node PmuNode =3D fdt_add_subnode(Fdt, 0, "pmu"); if (PmuNode >=3D 0) { - fdt_setprop_string (Fdt, PmuNode, "compatible", "arm,armv8-pmuv3"); + fdt_setprop_string (Fdt, PmuNode, "compatible", "arm,cortex-a57-pmu"); =20 // append PMU interrupts for (Index =3D 0; Index < ArmCoreCount; Index++) { --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51370): https://edk2.groups.io/g/devel/message/51370 Mute This Topic: https://groups.io/mt/62737049/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 18 09:23:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+51371+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51371+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1574880281; cv=none; d=zohomail.com; s=zohoarc; b=BVyJ5zPi3BKSsQsH8XYDnk5AZclnPfFUd2MWLkU/iiMtIEK8RdbJdEU3Z9h3sWPiXOAYSDGiEwJfgSbquOzshzP8LjO/4FEz/9uMMkDn8rxiSuyKEjXynO8zW9y/caauQu6KlJHKH+1Jpw5M3VdZ+gX1VUGDalcSK4nKKEv0r9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574880281; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=0enm5PJl8o5OSK9TYoU14X2piOJzZtJs1dYQ7pHmqk0=; b=Zobfa49t7m7TjrdW64TfUlel7Kggxqs/X+WEtv/JyYfDVUOCEfLjt2CjZ7Y5ABLvUi+0NETl0Ro8e8mp7yN6f6+4bVLtS2WpBoz7rONU0wvZE3UQwUSSjDSJQBthQvOBCQdbUeDZSjtF/phXRyqDBMBziB/b5yyybi2Nt8b3rCo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+51371+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1574880281008953.2147232357283; Wed, 27 Nov 2019 10:44:41 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id TdWpYY1788612xnOpwu2H61p; Wed, 27 Nov 2019 10:44:40 -0800 X-Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web12.1042.1574880279289880389 for ; Wed, 27 Nov 2019 10:44:39 -0800 X-Received: by mail-wr1-f66.google.com with SMTP id n1so27932289wra.10 for ; Wed, 27 Nov 2019 10:44:39 -0800 (PST) X-Gm-Message-State: JJzFJJYrFSoNY6mjBlEK6mZZx1787277AA= X-Google-Smtp-Source: APXvYqzJJS71+MFlE3pjzG64tgOIz9XJcLuObkgiFsxHe278/Ntt41lgAm+J8Nomn6lb9IQuxQyr3g== X-Received: by 2002:adf:ec8f:: with SMTP id z15mr26739582wrn.128.1574880277709; Wed, 27 Nov 2019 10:44:37 -0800 (PST) X-Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr. [109.210.65.247]) by smtp.gmail.com with ESMTPSA id f67sm7947741wme.16.2019.11.27.10.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 10:44:36 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, Ard Biesheuvel Subject: [edk2-devel] [PATCH edk2-platforms v2 8/8] Silicon/AMD/StyxDtbLoaderLib: omit linux,phandle properties Date: Wed, 27 Nov 2019 19:44:39 +0100 Message-Id: <20191127184439.16793-9-ard.biesheuvel@linaro.org> In-Reply-To: <20191127184439.16793-1-ard.biesheuvel@linaro.org> References: <20191127184439.16793-1-ard.biesheuvel@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ard.biesheuvel@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1574880280; bh=4iwQgXa1gMvLGbmb16UGqj3nUhMReINRub/+XOCG9pU=; h=Cc:Date:From:Reply-To:Subject:To; b=Hxt/ciPSG+4xabQteB4oCX6yfyUm8M6Om7n2a+Kt9n7yRNEoFyY4lISCmet2WTXF2Jr eFE0WQLll91hvDzwlCWE4Gx0KbVvBTiIuh1NZmBHcJCJdg3xxyovNnzmBrMbuUeXzu9BA btqAsV+TVh3AdVMvQjnEyrwbCJUJsRAWGx0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The linux,phandle property is a deprecated alias for the phandle property which was standardized long ago, so don't bother emitting it. Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c b= /Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c index 091d151ac722..6ce694573f9f 100644 --- a/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c +++ b/Silicon/AMD/Styx/Library/StyxDtbLoaderLib/StyxDtbLoaderLib.c @@ -397,7 +397,6 @@ PrepareFdt ( } Phandle[Index] =3D fdt_alloc_phandle (Fdt); fdt_setprop_cell (Fdt, CpuNode, "phandle", Phandle[Index]); - fdt_setprop_cell (Fdt, CpuNode, "linux,phandle", Phandle[Index]); =20 fdt_setprop_string (Fdt, CpuNode, "enable-method", "psci"); =20 --=20 2.17.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#51371): https://edk2.groups.io/g/devel/message/51371 Mute This Topic: https://groups.io/mt/62737086/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-