From nobody Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83613+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83613+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590283; cv=none; d=zohomail.com; s=zohoarc; b=Rs0UPEdVtpPQBGPViVGjYJmSHkr1kMtt/qvxqJEO31sr+0KEiGYA9qixL5jw+HjVjq19Ehg2hauy5QyZOYwLkVW2fEtGbm6prn/3nKAZoQWYPapdr7vJ2fPgfc7e1K9CX/l4srzMN0jQN7SUUgNmaTau+2PeR2BteAuD5E+VQfk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590283; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2B9YHEkjxHgildPOG6/NDJs3QkUpqa48aR4Q97s385A=; b=iFUGyxQDrdNkMf2iVwvgw9owRzdEbxWutX0z/TUH3Icw7s1p30uaoLo8CwoIrnWYyjhcuVQNEulq9Z7GsQcyttYitYpDNaeiB9IGush4wu99/wS+rRkIrbSMoslubBr/CIz7SdgwoYs7DgGgwtHC3dZL/RZeXVRDIh9zLREJpG4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83613+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163659028364017.210550416583487; Wed, 10 Nov 2021 16:24:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id XUiLYY1788612xf3Flwg0yLH; Wed, 10 Nov 2021 16:24:43 -0800 X-Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web12.3943.1636590282644923850 for ; Wed, 10 Nov 2021 16:24:42 -0800 X-Received: by mail-pj1-f43.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso3214313pji.0 for ; Wed, 10 Nov 2021 16:24:42 -0800 (PST) X-Gm-Message-State: i3Al4pycU5q24F9ZzQim1DErx1787277AA= X-Google-Smtp-Source: ABdhPJz+6XqLmIz6DD/c/rnY3TN3u4cY3zLoWdHx+TjFrsCwxyYYzEAYzjXSlXymwmeykyGEAX2DZA== X-Received: by 2002:a17:90a:fe0b:: with SMTP id ck11mr3477171pjb.15.1636590281971; Wed, 10 Nov 2021 16:24:41 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:41 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sean Brogan Subject: [edk2-devel] [PATCH v3 01/14] ArmPkg/ArmMmuBaseLib: Disallow STANDALONE_MM Date: Wed, 10 Nov 2021 16:24:03 -0800 Message-Id: <20211111002416.1770-2-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590283; bh=mzaDwKRSvEdLxrQc4pJ4/aw0lW5UuASNiVscYWJVfHM=; h=Cc:Date:From:Reply-To:Subject:To; b=dUrvctbyi7rhpuOiqL1dfmrSWiklQWlloKbiqCdLqW1C7nHaBn9GxiRnYt6HD0wo73a Lsq6NwwXKOi/ZPlRZiI1X4ftOlZ/lV1OLxvzMTpFhUMTmVDFeLrzK2Cra6LUFxUGT9hJs XzKCZ5wlNYma9Jo/Af7/SjYTC6u4N1fotO4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590284742100001 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew Not sure what all module types this HAS been validated against, but it doesn't work with STANDALONE_MM or STANDALONE_MM_CORE. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3647 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew Reviewed-by: Leif Lindholm --- ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf b/ArmPkg/Library/Ar= mMmuLib/ArmMmuBaseLib.inf index 2a7e7147958c..d0988b27d582 100644 --- a/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf +++ b/ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf @@ -13,7 +13,7 @@ [Defines] FILE_GUID =3D da8f0232-fb14-42f0-922c-63104d2c70bd MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D ArmMmuLib + LIBRARY_CLASS =3D ArmMmuLib | DXE_DRIVER PEIM PEI_CORE = DXE_CORE DXE_RUNTIME_DRIVER SEC =20 [Defines.AARCH64] CONSTRUCTOR =3D ArmMmuBaseLibConstructor --=20 2.31.1.windows.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 (#83613): https://edk2.groups.io/g/devel/message/83613 Mute This Topic: https://groups.io/mt/86971551/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83614+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83614+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590285; cv=none; d=zohomail.com; s=zohoarc; b=RDM7sO7gtiY53rCBjN6bNc4LikkMzH3l2N0Ut9q+eczpoKjM8lUWNTvrEVFSRXOZBbo+iXi/PVnSc/InH1rz6sfxFfKVPT9C+WJz8iAcz76FvVvEigRUIsqBQa1RGwiD6LN6x0eCy0eXbttCGYXxz6PC2XleqN2MReKTEs579tM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590285; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=FnO9fp6cGdLmLZrtuiJ5CDba1XMq6icnPRKaK1XU0xg=; b=PWViMVw6dAl/JrBg7Y0EgQPv96a+OvrILqk6xyTDxASxDjwIyZlgIe7QekTls0ZcaTnFhK9OT1413ikpv73KM5DMYzTSdyWvOR8RbdSBfbuQkNOAIVmpzcpUJ3ubUAeNbwmxq5a+LSG7nqL4/fRDy84Snbhd6LQbTYULJJ74M4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83614+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590285412870.4253550397547; Wed, 10 Nov 2021 16:24:45 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id fG06YY1788612xYwAgx2UGUq; Wed, 10 Nov 2021 16:24:45 -0800 X-Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web08.4013.1636590284537974835 for ; Wed, 10 Nov 2021 16:24:44 -0800 X-Received: by mail-pf1-f171.google.com with SMTP id m26so4086738pff.3 for ; Wed, 10 Nov 2021 16:24:44 -0800 (PST) X-Gm-Message-State: tzSJ8ZcRTE5d1syWmxE71Sc6x1787277AA= X-Google-Smtp-Source: ABdhPJzsVd/6484I2MrwCf5IVveo4l8GkgLnf8PFtCW5yVH7tjEVN4LzxQIDG8Im1cENk1+Nx3m+2A== X-Received: by 2002:a63:86c8:: with SMTP id x191mr684922pgd.390.1636590283835; Wed, 10 Nov 2021 16:24:43 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:43 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sean Brogan Subject: [edk2-devel] [PATCH v3 02/14] ArmPkg/ArmMmuStandaloneMmLib: Update to match ArmMmuLib Date: Wed, 10 Nov 2021 16:24:04 -0800 Message-Id: <20211111002416.1770-3-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590285; bh=lNo8J6NKmMmMZJhljp36HuRAubhbUDTEmdmKqQoBYH0=; h=Cc:Date:From:Reply-To:Subject:To; b=ZgNKAlz+ShuqDs5HRUFYdME3dWS+9F88AeNwx+RwFrHVJPb+5lirFIxtVo3SBQUmf5V 8N5KSRZvemOQQg18uf984WSyA59zrnVH9DgxbpKKhtptRB92frqEXEZkQzQnkJjnFjcF6 79ZUdEgpqQjwubOIgImao8o3z48P2wjCbXI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590286822100006 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew Drop switch from the custom "StandaloneMmMmuLib" class to the more generic "ArmMmuLib" class and add the missing functions to fulfill that interface. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3647 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew Reviewed-by: Leif Lindholm --- ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c | 67 +++++++++= +++++++++++ ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c b/Ar= mPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c index 20f873e6802c..dde623f8ec69 100644 --- a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c +++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c @@ -325,3 +325,70 @@ ArmClearMemoryRegionReadOnly ( } return Status; } + +/** + Placeholder function to fulfill API. + + @param [in] MemoryTable + @param [out] TranslationTableBase + @param [out] TranslationTableSize + + @retval EFI_UNSUPPORTED This function is not implemented by the + callee. + +**/ +EFI_STATUS +EFIAPI +ArmConfigureMmu ( + IN ARM_MEMORY_REGION_DESCRIPTOR *MemoryTable, + OUT VOID **TranslationTableBase OPTIONAL, + OUT UINTN *TranslationTableSize OPTIONAL + ) +{ + DEBUG ((DEBUG_ERROR, "%a() interface not implemented!\n", __FUNCTION__)); + ASSERT (FALSE); + return EFI_UNSUPPORTED; +} + +/** + Placeholder function to fulfill API. + + @param [in] Entry + @param [in] Value + @param [in] RegionStart + +**/ +VOID +EFIAPI +ArmReplaceLiveTranslationEntry ( + IN UINT64 *Entry, + IN UINT64 Value, + IN UINT64 RegionStart + ) +{ + DEBUG ((DEBUG_ERROR, "%a() interface not implemented!\n", __FUNCTION__)); + ASSERT (FALSE); +} + +/** + Placeholder function to fulfill API. + + @param [in] BaseAddress + @param [in] Length + @param [in] Attributes + + @retval EFI_UNSUPPORTED This function is not implemented by the + callee. + +**/ +EFI_STATUS +ArmSetMemoryAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ) +{ + DEBUG ((DEBUG_ERROR, "%a() interface not implemented!\n", __FUNCTION__)); + ASSERT (FALSE); + return EFI_UNSUPPORTED; +} diff --git a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf b/= ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf index ff20e5898051..d34086853d32 100644 --- a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf +++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf @@ -13,7 +13,7 @@ [Defines] FILE_GUID =3D 44a741c2-655f-41fc-b066-179f5a9aa78a MODULE_TYPE =3D MM_CORE_STANDALONE VERSION_STRING =3D 1.0 - LIBRARY_CLASS =3D StandaloneMmMmuLib + LIBRARY_CLASS =3D ArmMmuLib | MM_CORE_STANDALONE MM_STA= NDALONE PI_SPECIFICATION_VERSION =3D 0x00010032 =20 [Sources] --=20 2.31.1.windows.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 (#83614): https://edk2.groups.io/g/devel/message/83614 Mute This Topic: https://groups.io/mt/86971553/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83615+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83615+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590287; cv=none; d=zohomail.com; s=zohoarc; b=kcR597iyzsjd8XHDCtEvK/7z7NGPl8Xk5Zip9GRy46SEex/NneyXkNktcbvRL+dJyAK/QXKPsK4QlNq1iKzx+Y25a4IbWjGGA4gUU8vcBE9dGLOAjUgBFLth7i1rQUAyMUGDqZMQM/F3maDEYLNHStYnO3AZ1/oqdhX5fp+FLxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590287; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=TnUwg3ISLLaVFTpETs4XS0yqjisaG4kdvouXVLy0r6Q=; b=i5t1eUEphImEDJLTCEvtSjTVkvE0yr/bWk/9izxDXzHPeLCboVDBZk86Mduk57T17kZQFxtTdoKfN2VAdygAygisI0zeX4Q4IkbdCRD7wTV9SJLoo+M7nnlB8NwTPieUegNX2qevnu3juu+p52D+peENWhTn4PecJzJsFzVExqQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83615+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590287587312.4896560306863; Wed, 10 Nov 2021 16:24:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id jh1rYY1788612xtvRd08XB4u; Wed, 10 Nov 2021 16:24:47 -0800 X-Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by mx.groups.io with SMTP id smtpd.web09.3948.1636590286599615659 for ; Wed, 10 Nov 2021 16:24:46 -0800 X-Received: by mail-pg1-f178.google.com with SMTP id f5so3620964pgc.12 for ; Wed, 10 Nov 2021 16:24:46 -0800 (PST) X-Gm-Message-State: YVyvx5Ue8hLBKdSfJvH6l4Qgx1787277AA= X-Google-Smtp-Source: ABdhPJxRYpj3gVKDSHQcUJKOh1OVQ/X9d4dFDT28iAnFntmXslykANmOXocPac2bFHPn2ibcBSab7g== X-Received: by 2002:a62:1544:0:b0:49f:f74e:8327 with SMTP id 65-20020a621544000000b0049ff74e8327mr2988271pfv.55.1636590285936; Wed, 10 Nov 2021 16:24:45 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:45 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [edk2-devel] [PATCH v3 03/14] ArmPkg/StandaloneMmCoreEntryPoint: Swap to ArmMmuLib Date: Wed, 10 Nov 2021 16:24:05 -0800 Message-Id: <20211111002416.1770-4-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590287; bh=nkUfuziuqb4+VIv5ITzdgQNQa4nrDIqTeSFf50KvRfI=; h=Cc:Date:From:Reply-To:Subject:To; b=Ptt367ur/CNciR0rev5UdR0hgWwOjbbtsPXCssGar8vhMbyce6NX1ZkKFJVHw1oaL3a Pbf7HF6AXvqlFplfzZIGzyccP2nGUqoRnQmHj9e9Xa6SqeqJQ3w2WWffBCkPQOXdbFIav 4JK3UQyUb42GOoOKO2dRM6F7WY6unhyLqF8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590288907100010 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew StandaloneMmMmuLib has been turned into an implementation of the ArmMmuLib class (without any change to the interface itself), so this module can now change its dependency. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3647 Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPo= int.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/St= andaloneMmCoreEntryPoint.inf index 75cfb98c0e75..a0629cbc1a6f 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEn= tryPoint.inf +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEn= tryPoint.inf @@ -42,7 +42,7 @@ [LibraryClasses] DebugLib =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - StandaloneMmMmuLib + ArmMmuLib ArmSvcLib =20 [Guids] --=20 2.31.1.windows.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 (#83615): https://edk2.groups.io/g/devel/message/83615 Mute This Topic: https://groups.io/mt/86971555/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83616+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83616+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590289; cv=none; d=zohomail.com; s=zohoarc; b=ce/dyqxmkn2agHDHzfBbg9fBeXFDaeulPGcw4M+koIFsbXifaIzCCTgcaSkqt+mFQQa8zaofWCVnFZ/2o1c0SShF8/yDfY1ezj2Y0ywqfhDTGLh0Dkn+Yxybru8XIEkt2nXI8CYnq2H+NnpxR1g73Q4NvcMRWo6QRDwqgzrexiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590289; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=iFZxQ7T5bgj0tTQ1ZMF+Vrv0sebLvJH4UM9M3S5BcaQ=; b=jP0i8yZqph7LZ/PQLd/rVDMuhNGEF42lDazsAlQgElExXCMeKdHF66js9ePmtIqwvjqL9N7iLlVDAVbsMYc0xUuWw6kWaAH8UZugdCLKHubUK4P8wSpdDbsGfR9Lf97FYWXpOnR7OStcJhskdX/bSzjm1Xqsur4kbXWlrShIG7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83616+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590289220295.3219332531096; Wed, 10 Nov 2021 16:24:49 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ajfxYY1788612xMgU7lDL0HM; Wed, 10 Nov 2021 16:24:48 -0800 X-Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web10.4016.1636590288274749828 for ; Wed, 10 Nov 2021 16:24:48 -0800 X-Received: by mail-pj1-f47.google.com with SMTP id nh10-20020a17090b364a00b001a69adad5ebso3270821pjb.2 for ; Wed, 10 Nov 2021 16:24:48 -0800 (PST) X-Gm-Message-State: 16WtFczgD4JDKejc9r647xS8x1787277AA= X-Google-Smtp-Source: ABdhPJxGyGaYlrqNN55tT+mjUB0odgLTSB5fxTA71DNXCwSK9lfLtayDn3txr45fV9j71L7xtR/nNw== X-Received: by 2002:a17:903:286:b0:142:4abc:88b8 with SMTP id j6-20020a170903028600b001424abc88b8mr3605545plr.25.1636590287567; Wed, 10 Nov 2021 16:24:47 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:47 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sean Brogan Subject: [edk2-devel] [PATCH v3 04/14] ArmPkg: Disavow StandaloneMmMmuLib. It's just ArmMmuLib Date: Wed, 10 Nov 2021 16:24:06 -0800 Message-Id: <20211111002416.1770-5-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590288; bh=NBHtP+3cuoCR4NVEMV9IAjF6PPG5JqgsSDp45BsyKag=; h=Cc:Date:From:Reply-To:Subject:To; b=pmo2b4J3noj8r4kizb7UakRWuLmoWYWiLqkVbNn8cFt6ga+1P+kPuvufhZ/s2pBoBEG WS68UFmHL1DFVDhYhU/6lQ5ImR1go40VghiJg2KMCkb45hrJMDdjqNmiy+1QyQiZF2esS ShhrnwazTqHxr0lvUMezTJklroolRQ8BXls= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590290915100013 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This extra interface is redundant and unnecessary. Dropping it is more EDK2-ish. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3647 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew Reviewed-by: Leif Lindholm --- ArmPkg/ArmPkg.dec | 4 --- ArmPkg/Include/Library/StandaloneMmMmuLib.h | 36 -------------------- 2 files changed, 40 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 9da1bbc9f216..f5c235ecc11b 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -88,10 +88,6 @@ [LibraryClasses.common] # SemihostLib|Include/Library/SemihostLib.h =20 - ## @libraryclass Provides an interface for a StandaloneMm Mmu. - # - StandaloneMmMmuLib|Include/Library/StandaloneMmMmuLib.h - [Guids.common] gArmTokenSpaceGuid =3D { 0xBB11ECFE, 0x820F, 0x4968, { 0xBB, 0xA6,= 0xF7, 0x6A, 0xFE, 0x30, 0x25, 0x96 } } =20 diff --git a/ArmPkg/Include/Library/StandaloneMmMmuLib.h b/ArmPkg/Include/L= ibrary/StandaloneMmMmuLib.h deleted file mode 100644 index ccc016d0350a..000000000000 --- a/ArmPkg/Include/Library/StandaloneMmMmuLib.h +++ /dev/null @@ -1,36 +0,0 @@ -/** @file - - Copyright (c) 2018, ARM Ltd. All rights reserved. - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef STANDALONE_MM_MMU_LIB_ -#define STANDALONE_MM_MMU_LIB_ - -EFI_STATUS -ArmSetMemoryRegionNoExec ( - IN EFI_PHYSICAL_ADDRESS BaseAddress, - IN UINT64 Length - ); - -EFI_STATUS -ArmClearMemoryRegionNoExec ( - IN EFI_PHYSICAL_ADDRESS BaseAddress, - IN UINT64 Length - ); - -EFI_STATUS -ArmSetMemoryRegionReadOnly ( - IN EFI_PHYSICAL_ADDRESS BaseAddress, - IN UINT64 Length - ); - -EFI_STATUS -ArmClearMemoryRegionReadOnly ( - IN EFI_PHYSICAL_ADDRESS BaseAddress, - IN UINT64 Length - ); - -#endif /* STANDALONE_MM_MMU_LIB_ */ --=20 2.31.1.windows.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 (#83616): https://edk2.groups.io/g/devel/message/83616 Mute This Topic: https://groups.io/mt/86971556/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83617+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83617+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590294; cv=none; d=zohomail.com; s=zohoarc; b=gppDeFrHAXYVMWR2sRM4skY+rAK3YWdHgLc6rF7B+zN2blVgUyKx0HfLu+cun6slkQvFMy2eHWBXUMt4j4gSZx5x6MDziMF+ucrmRrVq5XiL9vrrEz4eJuh/bPhd5XGgGBgW28gIU8acz7TPWirveR1g0RV9KR9nF8A1kKajDGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590294; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=pvCYO/GN6Pydqn6ExKZ2lk98oe/6i0Rg/UdqeFups+A=; b=HnEVOa8hWfGWZi9ftW0clYuBwuE6pyyGbaGlcIlaGESUAE5sEssQOBMAkURsefaHr5p/akS4HelkHSRl1HLFVxfWfp6TuqZmMgrXkU3nNP5T7wG44Xg+7TCg2ZUTXjOlVjhUQ7AHkyKsW1DR8+obKSHfZaqr417zy5ns+8TbjhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83617+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590294553670.0711787731149; Wed, 10 Nov 2021 16:24:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id XKmyYY1788612x21TQYzzs3B; Wed, 10 Nov 2021 16:24:54 -0800 X-Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.4017.1636590293663933142 for ; Wed, 10 Nov 2021 16:24:53 -0800 X-Received: by mail-pl1-f172.google.com with SMTP id k4so4335299plx.8 for ; Wed, 10 Nov 2021 16:24:53 -0800 (PST) X-Gm-Message-State: MmQxYfxBjpysuVZdYbNTFXFNx1787277AA= X-Google-Smtp-Source: ABdhPJyChNUTLc870YpEAxgxWrlGrjpB+9dEBBRc2Z6PaERGjOyJ2e+QZhOnXK5hGszzgWYvgXzdZQ== X-Received: by 2002:a17:902:7005:b0:142:4452:25de with SMTP id y5-20020a170902700500b00142445225demr3424255plk.3.1636590292868; Wed, 10 Nov 2021 16:24:52 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:52 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Michael D Kinney , Liming Gao , Zhiguang Liu , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Maciej Rabeda , Jiaxin Wu , Siyuan Fu , Ray Ni , Zhichao Gao , Sean Brogan Subject: [edk2-devel] [PATCH v3 05/14] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg Date: Wed, 10 Nov 2021 16:24:07 -0800 Message-Id: <20211111002416.1770-6-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590294; bh=V5jU4TskVbyRrKTvrGDDPkmMIZblEbeQG+xmQMl411s=; h=Cc:Date:From:Reply-To:Subject:To; b=DPjjEfce3sltwk9xIRDAhbW3wB3SwfGvB3JDdQOcJtgR97XvIuyE+ZDiKXQQt7kDY0z vW0XALHIz7gefOWI8yGsTs80jdsj0cbETKLc5m2QYrXgeZ7zYCjkJVhgJETtQqNsKLX7X kIJQi3ptDjqP448mNFJE/9bWm1ZGSueNWvg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590295321100002 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3649 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Ray Ni Cc: Zhichao Gao Cc: Sean Brogan Signed-off-by: Bret Barkelew Reviewed-by: Leif Lindholm --- {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcmp_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memcpy_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memmove_ms.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset.c = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/memset_ms.c = | 0 ArmPkg/ArmPkg.dsc = | 3 +-- ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc = | 2 +- ArmPlatformPkg/ArmPlatformPkg.dsc = | 2 +- ArmVirtPkg/ArmVirt.dsc.inc = | 2 +- CryptoPkg/CryptoPkg.dsc = | 2 +- DynamicTablesPkg/DynamicTablesPkg.dsc = | 2 +- EmbeddedPkg/EmbeddedPkg.dsc = | 2 +- FatPkg/FatPkg.dsc = | 2 +- FmpDevicePkg/FmpDevicePkg.dsc = | 2 +- MdeModulePkg/MdeModulePkg.dsc = | 2 +- {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/AArch64/Atomics.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashldi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/clzsi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/div.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/divsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lasr.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsl.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/llsr.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/memmove.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/moddi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/modsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/muldi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/mullu.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/sourcery.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch16.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch32.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switch8.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/switchu8.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivdi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/udivsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uldiv.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umoddi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/umodsi3.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uread.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.S = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/Arm/uwrite.asm = | 0 {ArmPkg =3D> MdePkg}/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.i= nf | 1 - MdePkg/MdePkg.dsc = | 1 + NetworkPkg/NetworkPkg.dsc = | 2 +- RedfishPkg/RedfishPkg.dsc = | 2 +- SecurityPkg/SecurityPkg.dsc = | 2 +- ShellPkg/ShellPkg.dsc = | 2 +- SignedCapsulePkg/SignedCapsulePkg.dsc = | 2 +- StandaloneMmPkg/StandaloneMmPkg.dsc = | 2 +- UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc = | 2 +- 68 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcmp_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcmp_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/MdePkg/Library= /CompilerIntrinsicsLib/memcpy.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memcpy_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memcpy_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/MdePkg/Lib= rary/CompilerIntrinsicsLib/memmove_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memmove_ms.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/MdePkg/Library= /CompilerIntrinsicsLib/memset.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memset.c rename to MdePkg/Library/CompilerIntrinsicsLib/memset.c diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/MdePkg/Libr= ary/CompilerIntrinsicsLib/memset_ms.c similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c rename to MdePkg/Library/CompilerIntrinsicsLib/memset_ms.c diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 59fd8f295d4f..f9268de8347e 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -101,7 +101,7 @@ [LibraryClasses.common.PEIM] PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/Pei= ServicesTablePointerLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf @@ -109,7 +109,6 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] [Components.common] ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf - ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf diff --git a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc b/ArmPkg/Dr= ivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc index 2818ce65db98..ac818f0d98a2 100644 --- a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc +++ b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc @@ -43,7 +43,7 @@ [LibraryClasses] UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [Components.common] diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatform= Pkg.dsc index 661a4cea220d..b146e4fe8a69 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dsc +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc @@ -76,7 +76,7 @@ [LibraryClasses.common] DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [LibraryClasses.common.PEIM] diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 5a1598d90ca7..502ddee78529 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -96,7 +96,7 @@ [LibraryClasses.common] # It is not possible to prevent the ARM compiler from inserting calls to= intrinsic functions. # This library provides the instrinsic functions such a compiler may gen= erate calls to. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 0aa72ed87846..2d4d4c2797e5 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -74,7 +74,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this l= ibrary # into all ARM and AARCH64 images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/Dynam= icTablesPkg.dsc index e1439a130143..d0b2110a05aa 100644 --- a/DynamicTablesPkg/DynamicTablesPkg.dsc +++ b/DynamicTablesPkg/DynamicTablesPkg.dsc @@ -34,7 +34,7 @@ [LibraryClasses] UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf =20 diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index f7ed61545c2e..4c4a6029d6fd 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -128,7 +128,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc index 4ddb5c3e004b..32708b1e58cf 100644 --- a/FatPkg/FatPkg.dsc +++ b/FatPkg/FatPkg.dsc @@ -57,7 +57,7 @@ [LibraryClasses.common.PEIM] MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 ##########################################################################= ######################### diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc index 7b1af285dd65..258b5ce0cded 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -78,7 +78,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this l= ibrary # into all ARM and AARCH64 images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index b1d83461865e..e3146c378800 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -183,7 +183,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # # Since software stack checking may be heuristically enabled by the comp= iler diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S b/MdePk= g/Library/CompilerIntrinsicsLib/AArch64/Atomics.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S rename to MdePkg/Library/CompilerIntrinsicsLib/AArch64/Atomics.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ashldi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ashrdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/clzsi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/ctzsi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S b/MdePkg/Librar= y/CompilerIntrinsicsLib/Arm/div.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/div.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/div.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/div.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/divdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/divsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/lasr.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/lasr.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lasr.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ldivmod.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm b/MdePkg/= Library/CompilerIntrinsicsLib/Arm/ldivmod.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/llsl.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/llsl.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsl.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S b/MdePkg/Libra= ry/CompilerIntrinsicsLib/Arm/llsr.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/llsr.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/lshrdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/memmove.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm b/MdePkg/= Library/CompilerIntrinsicsLib/Arm/memmove.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/memmove.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/moddi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/modsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/muldi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/mullu.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/mullu.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/mullu.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/sourcery.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch16.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch16.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switch32.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch32.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/switch8.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switch8.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/switchu8.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/ucmpdi2.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/udivdi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/MdePkg= /Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/udivsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/uldiv.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/uldiv.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uldiv.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/umoddi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/umodsi3.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S b/MdePkg/Libr= ary/CompilerIntrinsicsLib/Arm/uread.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm b/MdePkg/Li= brary/CompilerIntrinsicsLib/Arm/uread.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uread.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S b/MdePkg/Lib= rary/CompilerIntrinsicsLib/Arm/uwrite.S similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm b/MdePkg/L= ibrary/CompilerIntrinsicsLib/Arm/uwrite.asm similarity index 100% rename from ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm rename to MdePkg/Library/CompilerIntrinsicsLib/Arm/uwrite.asm diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf= b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf similarity index 95% rename from ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf rename to MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index fcf48c678119..6fa09e5f0dec 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -84,7 +84,6 @@ [Sources.AARCH64] =20 [Packages] MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec =20 [BuildOptions] MSFT:*_*_*_CC_FLAGS =3D /GL- diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index a94959169b2f..a04f0aec8c20 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -183,5 +183,6 @@ [Components.EBC] [Components.ARM, Components.AARCH64] MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicArmVirt.inf MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 [BuildOptions] diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index 8691a0f5d07a..3e2df982c0fb 100644 --- a/NetworkPkg/NetworkPkg.dsc +++ b/NetworkPkg/NetworkPkg.dsc @@ -75,7 +75,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc index 16139146ff83..0dc120d82699 100644 --- a/RedfishPkg/RedfishPkg.dsc +++ b/RedfishPkg/RedfishPkg.dsc @@ -45,7 +45,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # # This library provides the instrinsic functions generated by a given co= mpiler. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 73a93c2285b1..2b5ef67016b8 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -79,7 +79,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the intrinsic functions generate by a given comp= iler. # And NULL mean link this library into all ARM images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index 6f0d0929319d..4d050d215510 100644 --- a/ShellPkg/ShellPkg.dsc +++ b/ShellPkg/ShellPkg.dsc @@ -69,7 +69,7 @@ [LibraryClasses.ARM,LibraryClasses.AARCH64] # This library provides the instrinsic functions generate by a given com= piler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/Signe= dCapsulePkg.dsc index 8a27207a6f20..72b533cd04e8 100644 --- a/SignedCapsulePkg/SignedCapsulePkg.dsc +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc @@ -104,7 +104,7 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM] # This library provides the instrinsic functions generate by a given com= piler. # And NULL mean link this library into all ARM images. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index 8012f93b7dcc..e9488538cb21 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -67,7 +67,7 @@ [LibraryClasses.AARCH64, LibraryClasses.ARM] CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf PeCoffExtraActionLib|StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActi= onLib/StandaloneMmPeCoffExtraActionLib.inf =20 - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 [LibraryClasses.common.MM_CORE_STANDALONE] diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc b/Unit= TestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc index 8adf690098ae..9f2b671f7c86 100644 --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc @@ -37,7 +37,7 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # This library provides the instrinsic functions generated by a given co= mpiler. # [LibraryClasses.ARM] and NULL mean link this library into all ARM imag= es. # - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + NULL|MdePkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 # # Since software stack checking may be heuristically enabled by the comp= iler --=20 2.31.1.windows.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 (#83617): https://edk2.groups.io/g/devel/message/83617 Mute This Topic: https://groups.io/mt/86971557/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83618+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83618+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590296; cv=none; d=zohomail.com; s=zohoarc; b=ZeyyqqSpLKO/rVz2WIk9qx5Wc6PtZMioyzQ2SMRk3BybjI+N8nb2OoBKpNMZo7asDCulRB0o8EOZPoNRC5Tfyq/ViHWtoB2OGbbxRfy2rpNjbbZGeapbuTX8ja0Mxx7YJJo/c9tFqPFEYjCjNFQ6HN8fZLaQ6CFC46AMGnC8GNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590296; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5siE4qVARADXsSiuVaplcdAZvCsB2cZT8EEndYunpwY=; b=WxfB2AkpGKoeqF5eTQAhvfsm7rUziWjLvOBjT+aGtj/14PywApGi6y2rFXR96NSbLMv8Y9MnqrfIUcQYGakm34QxXtvHwc0E3firJhrjEWosSftUQ2VndsI9DlnWPRXrX4HGojN4LHKo6QHdDI5HKCh0o4RrEyG5qLtSJyuqH5E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83618+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590296351370.10308505977855; Wed, 10 Nov 2021 16:24:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tMLbYY1788612xDAMnGopvgu; Wed, 10 Nov 2021 16:24:55 -0800 X-Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by mx.groups.io with SMTP id smtpd.web10.4018.1636590295206194808 for ; Wed, 10 Nov 2021 16:24:55 -0800 X-Received: by mail-pj1-f46.google.com with SMTP id fv9-20020a17090b0e8900b001a6a5ab1392so3272095pjb.1 for ; Wed, 10 Nov 2021 16:24:55 -0800 (PST) X-Gm-Message-State: SgZuKz5515AAQogrsZQEzsiox1787277AA= X-Google-Smtp-Source: ABdhPJx0W2T8tsaF+xLigoL9ePHtmh31vsHRMY/3RVLVde0582iZr2MIrgqtOg5DugBz7Z0sKycExA== X-Received: by 2002:a17:902:c943:b0:142:1758:8ee7 with SMTP id i3-20020a170902c94300b0014217588ee7mr3134540pla.58.1636590294537; Wed, 10 Nov 2021 16:24:54 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:54 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Bob Feng , Liming Gao , Yuwei Chen , Sean Brogan Subject: [edk2-devel] [PATCH v3 06/14] ArmPkg and BaseTools: Move the GccLto binaries from ArmPkg to BaseTools Date: Wed, 10 Nov 2021 16:24:08 -0800 Message-Id: <20211111002416.1770-7-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590295; bh=5op7ESoD3/Bgi2K7ejwpVDdyjtyDjHYgRYKYLR9cjB8=; h=Cc:Date:From:Reply-To:Subject:To; b=tE29jGSEMhD5Bi5QXo/q//j5XlNZ8JSDuTHppvgl5vSC4PHPCqdPpWHSUcs+OEVMwrz 5AZw1ybcEKPTu3zrrEo0Fe9tZ+SK4QY+ZPcqsQRTBl2Xe4HwIYlxUEEf41kpaLNj6Eb3l oOFpMiX2A4So1Q5SMjU04QAsRkwQuyqWnbs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590297434100001 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3650 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Bob Feng Cc: Liming Gao Cc: Yuwei Chen Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-aarch64.a | Bin {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-aarch64.s | 0 {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-arm.a | Bin {ArmPkg/Library =3D> BaseTools/Bin}/GccLto/liblto-arm.s | 0 BaseTools/Conf/tools_def.template | 19 ++++++++++= --------- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ArmPkg/Library/GccLto/liblto-aarch64.a b/BaseTools/Bin/GccLto/= liblto-aarch64.a similarity index 100% rename from ArmPkg/Library/GccLto/liblto-aarch64.a rename to BaseTools/Bin/GccLto/liblto-aarch64.a diff --git a/ArmPkg/Library/GccLto/liblto-aarch64.s b/BaseTools/Bin/GccLto/= liblto-aarch64.s similarity index 100% rename from ArmPkg/Library/GccLto/liblto-aarch64.s rename to BaseTools/Bin/GccLto/liblto-aarch64.s diff --git a/ArmPkg/Library/GccLto/liblto-arm.a b/BaseTools/Bin/GccLto/libl= to-arm.a similarity index 100% rename from ArmPkg/Library/GccLto/liblto-arm.a rename to BaseTools/Bin/GccLto/liblto-arm.a diff --git a/ArmPkg/Library/GccLto/liblto-arm.s b/BaseTools/Bin/GccLto/libl= to-arm.s similarity index 100% rename from ArmPkg/Library/GccLto/liblto-arm.s rename to BaseTools/Bin/GccLto/liblto-arm.s diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.t= emplate index 2e6b382ab623..cd8899d24d4a 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -15,7 +15,8 @@ # 2.00 - Initial version with changes for CI # - Change RC path to use plugin # -#!VERSION=3D2.00 +# 2.10 - Move GccLto files to a tools path to be more repository layout ag= nostic +#!VERSION=3D2.10 =20 IDENTIFIER =3D Default TOOL_CHAIN_CONF =20 @@ -2386,10 +2387,10 @@ RELEASE_GCC5_X64_DLINK_FLAGS =3D DEF(GCC5_X64_D= LINK_FLAGS) -flto -Os *_GCC5_ARM_CC_XIPFLAGS =3D DEF(GCC5_ARM_CC_XIPFLAGS) =20 DEBUG_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unu= sed-but-set-variable -Wno-unused-const-variable - DEBUG_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throu= gh=3D-llto-arm + DEBUG_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throug= h=3D-llto-arm =20 RELEASE_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -flto -Wno-unu= sed-but-set-variable -Wno-unused-const-variable -RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throu= gh=3D-llto-arm +RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -flto -Os -= L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass-throug= h=3D-llto-arm =20 NOOPT_GCC5_ARM_CC_FLAGS =3D DEF(GCC5_ARM_CC_FLAGS) -O0 NOOPT_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_DLINK_FLAGS) -O0 @@ -2420,11 +2421,11 @@ RELEASE_GCC5_ARM_DLINK_FLAGS =3D DEF(GCC5_ARM_D= LINK_FLAGS) -flto -Os -L$(WORKS *_GCC5_AARCH64_CC_XIPFLAGS =3D DEF(GCC5_AARCH64_CC_XIPFLAGS) =20 DEBUG_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno= -unused-but-set-variable -Wno-unused-const-variable - DEBUG_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pa= ss-through=3D-llto-aarch64 -Wno-lto-type-mismatch + DEBUG_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pas= s-through=3D-llto-aarch64 -Wno-lto-type-mismatch DEBUG_GCC5_AARCH64_DLINK_XIPFLAGS =3D -z common-page-size=3D0x20 =20 RELEASE_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -flto -Wno= -unused-but-set-variable -Wno-unused-const-variable -RELEASE_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pa= ss-through=3D-llto-aarch64 -Wno-lto-type-mismatch +RELEASE_GCC5_AARCH64_DLINK_FLAGS =3D DEF(GCC5_AARCH64_DLINK_FLAGS) -flto -= Os -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-opt=3D-pas= s-through=3D-llto-aarch64 -Wno-lto-type-mismatch RELEASE_GCC5_AARCH64_DLINK_XIPFLAGS =3D -z common-page-size=3D0x20 =20 NOOPT_GCC5_AARCH64_CC_FLAGS =3D DEF(GCC5_AARCH64_CC_FLAGS) -O0 @@ -2681,11 +2682,11 @@ DEFINE CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_AR= M_TARGET) DEF(GCC_ARM_DLINK_FLA *_CLANG38_ARM_CC_XIPFLAGS =3D DEF(GCC_ARM_CC_XIPFLAGS) =20 DEBUG_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -flto -O1 - DEBUG_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pas= s-through=3D-llto-arm + DEBUG_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass= -through=3D-llto-arm NOOPT_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -O0 NOOPT_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) RELEASE_CLANG38_ARM_CC_FLAGS =3D DEF(CLANG38_ARM_CC_FLAGS) $(ARCHCC_FL= AGS) $(PLATFORM_FLAGS) -flto -O3 -RELEASE_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-arm -Wl,-plugin-opt=3D-pas= s-through=3D-llto-arm +RELEASE_CLANG38_ARM_DLINK_FLAGS =3D DEF(CLANG38_ARM_DLINK_FLAGS) -flto -W= l,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-arm -Wl,-plugin-opt=3D-pass= -through=3D-llto-arm =20 ################## # CLANG38 AARCH64 definitions @@ -2727,11 +2728,11 @@ DEFINE CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38= _AARCH64_TARGET) DEF(GCC_AARCH6 *_CLANG38_AARCH64_CC_XIPFLAGS =3D DEF(GCC_AARCH64_CC_XIPFLAGS) =20 DEBUG_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O1 - DEBUG_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O1 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64 + DEBUG_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O1 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-= opt=3D-pass-through=3D-llto-aarch64 NOOPT_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -O0 NOOPT_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) RELEASE_CLANG38_AARCH64_CC_FLAGS =3D DEF(CLANG38_AARCH64_CC_FLAGS) $(AR= CHCC_FLAGS) $(PLATFORM_FLAGS) -flto -O3 -RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/ArmPkg/Library/GccLto -llto-aarch64 -Wl,-plugin= -opt=3D-pass-through=3D-llto-aarch64 +RELEASE_CLANG38_AARCH64_DLINK_FLAGS =3D DEF(CLANG38_AARCH64_DLINK_FLAGS) -= flto -Wl,-O3 -L$(WORKSPACE)/BaseTools/Bin/GccLto -llto-aarch64 -Wl,-plugin-= opt=3D-pass-through=3D-llto-aarch64 =20 ##########################################################################= ########## # --=20 2.31.1.windows.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 (#83618): https://edk2.groups.io/g/devel/message/83618 Mute This Topic: https://groups.io/mt/86971558/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83619+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83619+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590299; cv=none; d=zohomail.com; s=zohoarc; b=ZKlsVoJV6VbjecBNvubLYHpL9zwgk8dO7/PBi3BcjNFytxBnGlFRzhTqRkOkdDdoRAGuvs5OwYhxwM4oi61PSBSGZEz2U9wvPJGftyE5AsbgJrfEWE/OW5yfu8FwwpZveYRFMTSP//2rY1hObtBEv7cmWeGllML42gI+QagKZ1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590299; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=eiEsoSq3GZKrVSnGcIEHOFD1tPNQ5c/YisczRch01DU=; b=flqcEpUmpGUPOdy5Kd92l7sAS+vSODF59CXo2p2ho3bLqLef5IThDvfEGIjNPhMaSqnI9n/Sts1LGSPS9q0UVxgzMiCbhI/jD4ZENHaPyS1E31qdU6LLr2SHpyr9FJsntEJsZbq2nfQHQ4Bl5z5w9yTg7LsHgmG2ZDdHGv0yXy0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83619+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16365902991621005.3978135857705; Wed, 10 Nov 2021 16:24:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id b8UdYY1788612x7KPogDia3p; Wed, 10 Nov 2021 16:24:58 -0800 X-Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.3961.1636590298163800032 for ; Wed, 10 Nov 2021 16:24:58 -0800 X-Received: by mail-pj1-f45.google.com with SMTP id x7so2835030pjn.0 for ; Wed, 10 Nov 2021 16:24:58 -0800 (PST) X-Gm-Message-State: QspScgy6BAtIHDgIY5KxO487x1787277AA= X-Google-Smtp-Source: ABdhPJyQTDHeKSLrlK9ZfW+uRwYFfktf8a5vBfEK8M3oz2M6UaIJg+ca9J7IpFix5GJZFi42KXgkWQ== X-Received: by 2002:a17:902:744b:b0:142:46fe:7fbf with SMTP id e11-20020a170902744b00b0014246fe7fbfmr3102597plt.83.1636590297506; Wed, 10 Nov 2021 16:24:57 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:24:56 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Michael D Kinney , Liming Gao , Zhiguang Liu , Sean Brogan Subject: [edk2-devel] [PATCH v3 07/14] ArmPkg and MdePkg: Move the AsmMacroIoLib from ArmPkg to MdePkg Date: Wed, 10 Nov 2021 16:24:09 -0800 Message-Id: <20211111002416.1770-8-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590298; bh=n2G2fRhNU8bsAI7/V6B0yByMJjVui2PZVqmsx4pVOx4=; h=Cc:Date:From:Reply-To:Subject:To; b=mcWZac7OZYIBokoLpsI9w5bSYFqFmtK8tt//adinorhocWsQMpex9Y/3rrbZTeq8lWa NuopzrlWkZHyTisyaxWGuj8tCUTinLWllRz7Qf5+QFfLdp4Hs8vO8zC5d86cM1Yqamz8m hA6y2AI2Vn7gsLdp9NQPidGlOiKRiXX28H4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590299525100006 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Sean Brogan Signed-off-by: Bret Barkelew Reviewed-by: Leif Lindholm --- {ArmPkg/Include =3D> MdePkg/Include/AArch64}/AsmMacroIoLibV8.h | 0 {ArmPkg/Include =3D> MdePkg/Include/Arm}/AsmMacroIoLib.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ArmPkg/Include/AsmMacroIoLibV8.h b/MdePkg/Include/AArch64/AsmM= acroIoLibV8.h similarity index 100% rename from ArmPkg/Include/AsmMacroIoLibV8.h rename to MdePkg/Include/AArch64/AsmMacroIoLibV8.h diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/MdePkg/Include/Arm/AsmMacroIo= Lib.h similarity index 100% rename from ArmPkg/Include/AsmMacroIoLib.h rename to MdePkg/Include/Arm/AsmMacroIoLib.h --=20 2.31.1.windows.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 (#83619): https://edk2.groups.io/g/devel/message/83619 Mute This Topic: https://groups.io/mt/86971559/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83620+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83620+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590353; cv=none; d=zohomail.com; s=zohoarc; b=P+QTwOrTijROURApVlROUG8E6gLSrmOmGsI4EsmytpWnappnXCmRhcBrB/yBeKewnIsy+JRS10D1hqtCFshOWYxN3+gfBEI//QAc1/qxFmA1rpjpenmXtz8dWOYZ2hC+QEXjT/xgei5d8mrCCLIWInZCu6Y+cCeC+tp0dOIcs6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590353; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=gNHzkaVMLg7IripzUrEQCkPzSTcsbsYmQ7GruHovcJI=; b=DSGOwA/VTn9rLkqIRUhuklIzIrI96YsAhEusyVGCDrCbVMBOi2w7uqFn1zJs37c89q72e8UOefqdwUB/opI6iJ5ntCZWB87dIUhzJSKVSnonn3iOn6E49vUM5QnkEQHX2Py8gzs7GydKEa7WtmplCw89c08Ks+Ok/fRO4kMhjy0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83620+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590353598600.773446754739; Wed, 10 Nov 2021 16:25:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id X47AYY1788612xT9ct4qodym; Wed, 10 Nov 2021 16:25:53 -0800 X-Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web09.3958.1636590330511516611 for ; Wed, 10 Nov 2021 16:25:30 -0800 X-Received: by mail-pl1-f175.google.com with SMTP id u17so4342919plg.9 for ; Wed, 10 Nov 2021 16:25:30 -0800 (PST) X-Gm-Message-State: Of1JlOkoeTSwj8kuYhTK5hSkx1787277AA= X-Google-Smtp-Source: ABdhPJzqzuXm3tNBGBhIAdYf0Jb8hl+haW86QpnnjEygwZDE/QjvaGh267DYfYdgNGZplgXlzWB3fQ== X-Received: by 2002:a17:90a:f002:: with SMTP id bt2mr3424010pjb.221.1636590329822; Wed, 10 Nov 2021 16:25:29 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:29 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Zhiguang Liu , Sean Brogan Subject: [edk2-devel] [PATCH v3 08/14] MdePkg: Create the MMU access lib to abstract memory protection settings Date: Wed, 10 Nov 2021 16:24:10 -0800 Message-Id: <20211111002416.1770-9-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590353; bh=0YO2UqkdBT0+ZTcMAz85gP6RYR55PYC2uZIOjeOCj+U=; h=Cc:Date:From:Reply-To:Subject:To; b=JCOjdAhhFXRXMHSHF/05pH5aQICaXqz61s3Bkna3b5/lYSh8nJPTOaWPQ5zUXIv2H1x uwIuGGwMVBEBFZe8+7g9Iuzos9nVvasQbH/V1r0sUPYk0ccpYk2oebbMy55epRFb+6wcl /rs6e8BPrSV/896KQascN8rItP9dHDikiHo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590354903100002 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew There are a number of Arm-specific accesses that are abstracted behind this. It may need to be refactored to work better across architectures. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3651 Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Sean Brogan Signed-off-by: Bret Barkelew --- MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.c | 86 ++++++++++++++++++++ MdePkg/Include/Library/MmuLib.h | 75 +++++++++++++++++ MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf | 28 +++++++ MdePkg/MdePkg.dec | 5 ++ MdePkg/MdePkg.dsc | 2 + 5 files changed, 196 insertions(+) diff --git a/MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.c b/MdePkg/Librar= y/BaseMmuLibNull/BaseMmuLibNull.c new file mode 100644 index 000000000000..0398bc03f8f7 --- /dev/null +++ b/MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.c @@ -0,0 +1,86 @@ +/** @file +This lib abstracts some of the MMU accesses currently hardcoded against +an Arm lib. It's likely that this will need to be refactored at some point. + +Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include + +/** + Bitwise sets the memory attributes on a range of memory based on an attr= ibutes mask. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to set. See "P= hysical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuSetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ) +{ + DEBUG ((DEBUG_ERROR, "%a() NULL implementation used!\n", __FUNCTION__)); + ASSERT (FALSE); + return EFI_UNSUPPORTED; +} + + +/** + Bitwise clears the memory attributes on a range of memory based on an at= tributes mask. + + @param BaseAddress The start of the range for which to clear = attributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to clear. See = "Physical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuClearAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ) +{ + DEBUG ((DEBUG_ERROR, "%a() NULL implementation used!\n", __FUNCTION__)); + ASSERT (FALSE); + return EFI_UNSUPPORTED; +} + + +/** + Returns the memory attributes on a range of memory. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Attributes A return pointer for the attributes. + + @return EFI_SUCCESS + @return EFI_INVALID_PARAMETER A return pointer is NULL. + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuGetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + OUT UINT64 *Attributes + ) +{ + DEBUG ((DEBUG_ERROR, "%a() NULL implementation used!\n", __FUNCTION__)); + ASSERT (FALSE); + return EFI_UNSUPPORTED; +} diff --git a/MdePkg/Include/Library/MmuLib.h b/MdePkg/Include/Library/MmuLi= b.h new file mode 100644 index 000000000000..34b363bf712f --- /dev/null +++ b/MdePkg/Include/Library/MmuLib.h @@ -0,0 +1,75 @@ +/** @file +This lib abstracts some of the MMU accesses currently hardcoded against +an Arm lib. It's likely that this will need to be refactored at some point. + +Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef MMU_LIB_H_ +#define MMU_LIB_H_ + +#include + +/** + Bitwise sets the memory attributes on a range of memory based on an attr= ibutes mask. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to set. See "P= hysical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuSetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ); + + +/** + Bitwise clears the memory attributes on a range of memory based on an at= tributes mask. + + @param BaseAddress The start of the range for which to clear = attributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to clear. See = "Physical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuClearAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ); + + +/** + Returns the memory attributes on a range of memory. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Attributes A return pointer for the attributes. + + @return EFI_SUCCESS + @return EFI_INVALID_PARAMETER A return pointer is NULL. + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuGetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + OUT UINT64 *Attributes + ); + +#endif diff --git a/MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf b/MdePkg/Libr= ary/BaseMmuLibNull/BaseMmuLibNull.inf new file mode 100644 index 000000000000..9f1b4422cc04 --- /dev/null +++ b/MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf @@ -0,0 +1,28 @@ +## @file +# This lib abstracts some of the MMU accesses currently hardcoded against +# an Arm lib. It's likely that this will need to be refactored at some poi= nt. +# +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + + +[Defines] + INF_VERSION =3D 0x00010017 + BASE_NAME =3D BaseMmuLibNull + FILE_GUID =3D 97196A48-00C0-4487-802A-CC5540583EEB + VERSION_STRING =3D 1.0 + MODULE_TYPE =3D BASE + LIBRARY_CLASS =3D MmuLib + + +[Sources] + BaseMmuLibNull.c + + +[LibraryClasses] + DebugLib + + +[Packages] + MdePkg/MdePkg.dec diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec index 8b18415b107a..43ad9726bf7f 100644 --- a/MdePkg/MdePkg.dec +++ b/MdePkg/MdePkg.dec @@ -267,6 +267,11 @@ [LibraryClasses] # RegisterFilterLib|Include/Library/RegisterFilterLib.h =20 + ## @libraryclass This lib abstracts some of the MMU accesses currently = hardcoded against + # an Arm lib. It's likely that this will need to be refa= ctored at some point. + # + MmuLib|Include/Library/MmuLib.h + [LibraryClasses.IA32, LibraryClasses.X64, LibraryClasses.AARCH64] ## @libraryclass Provides services to generate random number. # diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc index a04f0aec8c20..c0f9bac787f2 100644 --- a/MdePkg/MdePkg.dsc +++ b/MdePkg/MdePkg.dsc @@ -131,6 +131,8 @@ [Components] =20 MdePkg/Library/RegisterFilterLibNull/RegisterFilterLibNull.inf =20 + MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf + [Components.IA32, Components.X64, Components.ARM, Components.AARCH64] # # Add UEFI Target Based Unit Tests --=20 2.31.1.windows.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 (#83620): https://edk2.groups.io/g/devel/message/83620 Mute This Topic: https://groups.io/mt/86971567/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83621+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83621+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590357; cv=none; d=zohomail.com; s=zohoarc; b=CCPKYYj3JtwHspghz2VPIkhGw8VCtWbcXGijr4ZORhEZcHPdirbvyYLfE3KliyW7C13TZaAeAGfUT3n1P/pV/yfS7KRhcPP8qasCyD1SVUZ4sil2ts5pxjHqJrk1lHVvnojEKmzADryZap6N2qdaI5Df6HiutJ5sLWU2pQg+Yeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590357; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=80xMScUYS4o1XMZ+mVexeN63tVypYtGGeOm+brb45X4=; b=hD18D3686QPESoMlX792jVb63HHZLnt1e7Lo9Jna6dxtAzOhuWllImwzUayk8UtgExZjSdFHZco7q8mcO6ORY8Jndi055HvBQ+p23dNJHYMreHqoja36I0LudmVoMgxKr18fGsvBT4Hbl40954zVd3C2nZiGSqOuvaPDP2LMbLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83621+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590357394407.2968705612218; Wed, 10 Nov 2021 16:25:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id pXG6YY1788612xQJaDUzxXif; Wed, 10 Nov 2021 16:25:57 -0800 X-Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web11.3966.1636590336222896137 for ; Wed, 10 Nov 2021 16:25:36 -0800 X-Received: by mail-pf1-f182.google.com with SMTP id o4so4038115pfp.13 for ; Wed, 10 Nov 2021 16:25:36 -0800 (PST) X-Gm-Message-State: 9SoeSQjiE2Npb1ahkABuWqQlx1787277AA= X-Google-Smtp-Source: ABdhPJy/OApGlpEzHKZUKc5lB946+sA5mRYFyP4jmrPPHCr+7vCqXBBaGS6TUCOQAKSDWDgj4vobPQ== X-Received: by 2002:a63:2b48:: with SMTP id r69mr1881668pgr.421.1636590335553; Wed, 10 Nov 2021 16:25:35 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:35 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sean Brogan Subject: [edk2-devel] [PATCH v3 09/14] ArmPkg: Add Basic MMU Lib for Arm silicon Date: Wed, 10 Nov 2021 16:24:11 -0800 Message-Id: <20211111002416.1770-10-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590357; bh=PnxeRtInkNdvANSpG0kEWWa1Tv+C6QAAWhkH1sYjHWA=; h=Cc:Date:From:Reply-To:Subject:To; b=C01zHxdVRHYRMlDNfrQShrdaXf6ku8pxnOPQwsB9r79zMavTvvqWU69ogrqSKynV5Cn n+Amkoa0wSqqRsuuKhlnQ/3GPilajj8C/hdzeNnM/lTSmsFoABVZYab9Ly5uORv/Jmalc 41kVCQE1ONmhrsol358DTPJzjkha4QcMHQw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590359034100010 Content-Type: text/plain; charset="utf-8" From: Sean Brogan After adding the abstract MmuLib to MdePkg, add an implementation backed by the existing ArmMmuLib to ArmPkg. This implementation is currently just a shim to the old library, while enabling higher-level code to be more common. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3651 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew --- ArmPkg/Library/MmuLib/MmuLib.c | 120 ++++++++++++++++++++ ArmPkg/ArmPkg.dsc | 1 + ArmPkg/Library/MmuLib/BaseMmuLib.inf | 30 +++++ 3 files changed, 151 insertions(+) diff --git a/ArmPkg/Library/MmuLib/MmuLib.c b/ArmPkg/Library/MmuLib/MmuLib.c new file mode 100644 index 000000000000..6f3b664971da --- /dev/null +++ b/ArmPkg/Library/MmuLib/MmuLib.c @@ -0,0 +1,120 @@ +/** @file +This library instance implements a very limited MMU Lib instance +for the ARM/AARCH64 architectures. This library shims a common library +interface to the ArmPkg defined ArmMmuLib.ib. + +Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include + +/** + Bitwise sets the memory attributes on a range of memory based on an attr= ibutes mask. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to set. See "P= hysical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuSetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ) +{ + EFI_STATUS Status; + + Status =3D EFI_UNSUPPORTED; + + if ((Attributes & EFI_MEMORY_XP) =3D=3D EFI_MEMORY_XP) { + Status =3D ArmSetMemoryRegionNoExec (BaseAddress, Length); + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "%a - Failed to set NX. Status =3D %r\n", __F= UNCTION__, Status)); + } + } + + ASSERT_EFI_ERROR(Status); + return Status; +} + + +/** + Bitwise clears the memory attributes on a range of memory based on an at= tributes mask. + + @param BaseAddress The start of the range for which to clear = attributes. + @param Length The length of the range. + @param Attributes A bitmask of the attributes to clear. See = "Physical memory + protection attributes" in UefiSpec.h + + @return EFI_SUCCESS + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuClearAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length, + IN UINT64 Attributes + ) +{ + EFI_STATUS Status; + + Status =3D EFI_UNSUPPORTED; + + if ((Attributes & EFI_MEMORY_XP) =3D=3D EFI_MEMORY_XP) { + Status =3D ArmClearMemoryRegionNoExec (BaseAddress, Length); + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "%a - Failed to clear NX. Status =3D %r\n", _= _FUNCTION__, Status)); + } + } + + if ((Attributes & EFI_MEMORY_RO) =3D=3D EFI_MEMORY_RO) { + Status =3D ArmClearMemoryRegionReadOnly(BaseAddress, Length); + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "%a - Failed to clear RO. Status =3D %r\n", _= _FUNCTION__, Status)); + } + } + + ASSERT_EFI_ERROR(Status); + return Status; +} + + +/** + Returns the memory attributes on a range of memory. + + @param BaseAddress The start of the range for which to set at= tributes. + @param Attributes A return pointer for the attributes. + + @return EFI_SUCCESS + @return EFI_INVALID_PARAMETER A return pointer is NULL. + @return Others + +**/ +EFI_STATUS +EFIAPI +MmuGetAttributes ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + OUT UINT64 *Attributes + ) +{ + EFI_STATUS Status; + + Status =3D EFI_UNSUPPORTED; + + DEBUG ((DEBUG_ERROR, "%a() API not implemented\n", __FUNCTION__)); + + ASSERT_EFI_ERROR(Status); + return Status; +} diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index f9268de8347e..197519a64718 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -165,3 +165,4 @@ [Components.AARCH64] =20 [Components.AARCH64, Components.ARM] ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf + ArmPkg/Library/MmuLib/BaseMmuLib.inf diff --git a/ArmPkg/Library/MmuLib/BaseMmuLib.inf b/ArmPkg/Library/MmuLib/B= aseMmuLib.inf new file mode 100644 index 000000000000..15095abee9c3 --- /dev/null +++ b/ArmPkg/Library/MmuLib/BaseMmuLib.inf @@ -0,0 +1,30 @@ +## @file +# This library instance implements a very limited MMU Lib instance +# for the ARM/AARCH64 architectures. This library shims a common library +# interface to the ArmPkg defined ArmMmuLib. +# +# Copyright (c) Microsoft Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[Defines] + INF_VERSION =3D 0x00010005 + BASE_NAME =3D MmuLib + FILE_GUID =3D 6f2ee9a4-79b3-4b77-9a47-e2bd4b917b75 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D MmuLib + +[Sources] + MmuLib.c + +[Packages] + MdePkg/MdePkg.dec + MdeModulePkg/MdeModulePkg.dec + ArmPkg/ArmPkg.dec + +[LibraryClasses] + DebugLib + ArmMmuLib --=20 2.31.1.windows.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 (#83621): https://edk2.groups.io/g/devel/message/83621 Mute This Topic: https://groups.io/mt/86971568/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83622+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83622+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590355; cv=none; d=zohomail.com; s=zohoarc; b=haA9Vm1gBYpG3ti+e863CMj2XWzLwSLHoZCbYcjmLER4x7J9UWo8YzAc5yqtDgZwfFWT0MAsUTIR4CTY1x7ZTwgZuvomquKcsA1/wIb7EiBWy39YPTB7Tfe8Ivo2kiTAnkABqt3FtnS/eTevgMLrYIkmsqYau80/sSN2+FKtefc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590355; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1AZYkpCwPYP4Rwf8RZK27Z7/+ThdYSCVYJXiApCg69w=; b=BD+zzSe6dVNVqjDVO2FyHtTom46yWHDr/+yZbtCBAmw9d9jSludpPVYKuEYXAXsPJFl5jceIsWqkZXTgmGa/MGesxAWAe3TnG5h7Vc9Ki7KodbElIYUq42dTdWl84BojcmhLBG+3m4ixipLUtQPQfHSRJko1b8A1OQ2hnq1538c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83622+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590355668985.1246781615256; Wed, 10 Nov 2021 16:25:55 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Qv1OYY1788612xIwIZUOGXjk; Wed, 10 Nov 2021 16:25:55 -0800 X-Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web08.4023.1636590341940675068 for ; Wed, 10 Nov 2021 16:25:42 -0800 X-Received: by mail-pj1-f42.google.com with SMTP id fv9-20020a17090b0e8900b001a6a5ab1392so3273417pjb.1 for ; Wed, 10 Nov 2021 16:25:41 -0800 (PST) X-Gm-Message-State: 9loS6Vxut871UMDdIDaE9ZyQx1787277AA= X-Google-Smtp-Source: ABdhPJzJ2rHNq07QaI1gTemLlrVEuIe+7wmGCgvwlI91RVShUaCHcuh2WJZZeZoru53LT+7wY987yA== X-Received: by 2002:a17:902:d718:b0:13d:e2ec:1741 with SMTP id w24-20020a170902d71800b0013de2ec1741mr3449953ply.38.1636590341034; Wed, 10 Nov 2021 16:25:41 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:40 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Dandan Bi , Sean Brogan Subject: [edk2-devel] [PATCH v3 10/14] MdeModulePkg: Swap to MmuLib instead of Arm-specific lib Date: Wed, 10 Nov 2021 16:24:12 -0800 Message-Id: <20211111002416.1770-11-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590355; bh=XtyeKLxqj5jppHeGdVntj1W83i6j4VyMs/7vpbfwicI=; h=Cc:Date:From:Reply-To:Subject:To; b=Zd1RiE8F0ljOgnldazrGag3p6u7TvHvq/xJN2fbi7ZaMUAYjPa1J/KeHTUX3CvXUVSd pp84Tya3OWlhPBq3V3ZH2bIEqsPWA101eiWbOer1IsOG7uysGpsojXqE9qWfPnKgUc2Fn Q8uNEYH32rPBKOQyv18G6BS7yKRxZ0LrcT4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590356949100005 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3651 Cc: Jian J Wang Cc: Liming Gao Cc: Dandan Bi Cc: Liming Gao Cc: Sean Brogan Signed-off-by: Bret Barkelew --- MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c | 4 ++-- MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 4 +--- MdeModulePkg/MdeModulePkg.dsc | 3 +-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c b/MdeModulePkg/= Core/DxeIplPeim/Arm/DxeLoadFunc.c index 6619a650661b..16c20930a662 100644 --- a/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c +++ b/MdeModulePkg/Core/DxeIplPeim/Arm/DxeLoadFunc.c @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "DxeIpl.h" =20 -#include +#include =20 /** Transfers control to DxeCore. @@ -40,7 +40,7 @@ HandOffToDxeCore ( ASSERT (BaseOfStack !=3D NULL); =20 if (PcdGetBool (PcdSetNxForStack)) { - Status =3D ArmSetMemoryRegionNoExec ((UINTN)BaseOfStack, STACK_SIZE); + Status =3D MmuSetAttributes ((UINTN)BaseOfStack, STACK_SIZE, EFI_MEMOR= Y_XP); ASSERT_EFI_ERROR (Status); } =20 diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/Dx= eIplPeim/DxeIpl.inf index 19b8a4c8aefa..3634d836548f 100644 --- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf +++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf @@ -57,8 +57,6 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec =20 -[Packages.ARM, Packages.AARCH64] - ArmPkg/ArmPkg.dec =20 [LibraryClasses] PcdLib @@ -77,7 +75,7 @@ [LibraryClasses] PerformanceLib =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - ArmMmuLib + MmuLib =20 [Ppis] gEfiDxeIplPpiGuid ## PRODUCES diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index e3146c378800..1530ea6796da 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -103,6 +103,7 @@ [LibraryClasses] DisplayUpdateProgressLib|MdeModulePkg/Library/DisplayUpdateProgressLibGr= aphics/DisplayUpdateProgressLibGraphics.inf VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/Var= iablePolicyHelperLib.inf MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf + MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 [LibraryClasses.EBC.PEIM] IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf @@ -174,8 +175,6 @@ [LibraryClasses.common.MM_STANDALONE] MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf =20 [LibraryClasses.ARM, LibraryClasses.AARCH64] - ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf - ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf =20 # --=20 2.31.1.windows.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 (#83622): https://edk2.groups.io/g/devel/message/83622 Mute This Topic: https://groups.io/mt/86971570/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83623+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83623+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590358; cv=none; d=zohomail.com; s=zohoarc; b=l+E+BBu2Q0PdKORI+L3UWuMeSHq5RhzfFKTfm4tQXxoTfkYl32uhWEnH7KaN0OfCjKu8jzVlTHB5TgPZPoFaS0SydZquMO7bM/CTdX5YyHdEc9KEfADknRIxaAZzbBUm46fEua4yeJIl102cRpL2yMh2iF8IovZ+tUcXGjCplbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590358; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=4ocanRYjc4qcw0sMKTFOQoc95maLchJznjKnYEluuPI=; b=WlqohUZuOZLR8JNH9hzxMT1vBGC2LiQLRjcqyeZfybojpbkdNXbZ/A169J0K8WU6jaJUgc3lP3K88YItu27GXgJWLK6OA6qoOC3F4pKxYVqfHa4BoFlXrOcIgtIUUzoU498bH2FtJVuy8lGj+KMzAsiFMPIpws0g6GofsHE7S8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83623+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163659035848364.84389863301499; Wed, 10 Nov 2021 16:25:58 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 62D9YY1788612xykEDbtyiYv; Wed, 10 Nov 2021 16:25:58 -0800 X-Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web12.3953.1636590344884871729 for ; Wed, 10 Nov 2021 16:25:44 -0800 X-Received: by mail-pj1-f47.google.com with SMTP id v23so2884678pjr.5 for ; Wed, 10 Nov 2021 16:25:44 -0800 (PST) X-Gm-Message-State: ZdGZyz7WsjRWjsUaASRLjnQGx1787277AA= X-Google-Smtp-Source: ABdhPJxf7auz/O7B+uA9sUAFlLeBb/DynLnL7fGzKmrd2bqGnkyhZiEmBaecl/sbmGOYGL4Lr/u4GA== X-Received: by 2002:a17:902:b907:b0:13f:ccaf:9ed8 with SMTP id bf7-20020a170902b90700b0013fccaf9ed8mr3467516plb.46.1636590343833; Wed, 10 Nov 2021 16:25:43 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:42 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [edk2-devel] [PATCH v3 11/14] StandaloneMmPkg: Switch to the MmuLib abstraction Date: Wed, 10 Nov 2021 16:24:13 -0800 Message-Id: <20211111002416.1770-12-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590358; bh=64DWFO1LwO2QSYmlMkhiLhV5TUgLCzbEHUq4N4MhekI=; h=Cc:Date:From:Reply-To:Subject:To; b=eEyoiKpiaA80lsj8w1/p/5CBUS38LOwz27Y07GEWH/W20R3Q7MgXc34xNgcTidnoVND Gs8SaQEJa/CKFdnOSFs1Kwvt6GJSnLm6+FhxfywMfUHk59efjV9Bks2kO152Fcij7BeJW aEbHASqAq1pBC9DmlPWHVLESgczemCq7tj0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590359161100011 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3651 Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/AArch64/Standalon= eMmPeCoffExtraActionLib.c | 82 ++++++++++++++++++-- StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCof= fExtraActionLib.inf | 3 +- StandaloneMmPkg/StandaloneMmPkg.dsc = | 1 + 3 files changed, 79 insertions(+), 7 deletions(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/AArch= 64/StandaloneMmPeCoffExtraActionLib.c b/StandaloneMmPkg/Library/StandaloneM= mPeCoffExtraActionLib/AArch64/StandaloneMmPeCoffExtraActionLib.c index ca8b1244a313..986f6ade5f47 100644 --- a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/AArch64/Stan= daloneMmPeCoffExtraActionLib.c +++ b/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/AArch64/Stan= daloneMmPeCoffExtraActionLib.c @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -#include +#include #include #include #include @@ -163,6 +163,78 @@ UpdatePeCoffPermissions ( return RETURN_SUCCESS; } =20 +/** + Internal function to parameterize the call int MmuSetAttributes. + + @param [in] BaseAddress + @param [in] Length + + @retval EFI_STATUS Returned by MmuSetAttributes +**/ +STATIC +EFI_STATUS +ArmPeSetMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuSetAttributes (BaseAddress, Length, EFI_MEMORY_XP); +} + +/** + Internal function to parameterize the call int MmuSetAttributes. + + @param [in] BaseAddress + @param [in] Length + + @retval EFI_STATUS Returned by MmuSetAttributes +**/ +STATIC +EFI_STATUS +ArmPeClearMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuClearAttributes (BaseAddress, Length, EFI_MEMORY_XP); +} + +/** + Internal function to parameterize the call int MmuSetAttributes. + + @param [in] BaseAddress + @param [in] Length + + @retval EFI_STATUS Returned by MmuSetAttributes +**/ +STATIC +EFI_STATUS +ArmPeSetMemoryRegionReadOnly ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuSetAttributes (BaseAddress, Length, EFI_MEMORY_RO); +} + +/** + Internal function to parameterize the call int MmuSetAttributes. + + @param [in] BaseAddress + @param [in] Length + + @retval EFI_STATUS Returned by MmuSetAttributes +**/ +STATIC +EFI_STATUS +ArmPeClearMemoryRegionReadOnly ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuClearAttributes (BaseAddress, Length, EFI_MEMORY_RO); +} + /** Performs additional actions after a PE/COFF image has been loaded and re= located. =20 @@ -180,8 +252,8 @@ PeCoffLoaderRelocateImageExtraAction ( { UpdatePeCoffPermissions ( ImageContext, - ArmClearMemoryRegionNoExec, - ArmSetMemoryRegionReadOnly + ArmPeClearMemoryRegionNoExec, + ArmPeSetMemoryRegionReadOnly ); } =20 @@ -205,7 +277,7 @@ PeCoffLoaderUnloadImageExtraAction ( { UpdatePeCoffPermissions ( ImageContext, - ArmSetMemoryRegionNoExec, - ArmClearMemoryRegionReadOnly + ArmPeSetMemoryRegionNoExec, + ArmPeClearMemoryRegionReadOnly ); } diff --git a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/Stand= aloneMmPeCoffExtraActionLib.inf b/StandaloneMmPkg/Library/StandaloneMmPeCof= fExtraActionLib/StandaloneMmPeCoffExtraActionLib.inf index 89083df679a1..25306dd3e707 100644 --- a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMm= PeCoffExtraActionLib.inf +++ b/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMm= PeCoffExtraActionLib.inf @@ -27,10 +27,9 @@ [Sources.common] AArch64/StandaloneMmPeCoffExtraActionLib.c =20 [Packages] - ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec StandaloneMmPkg/StandaloneMmPkg.dec =20 [LibraryClasses] - StandaloneMmMmuLib + MmuLib PcdLib diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index e9488538cb21..da3488e0d3fe 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -59,6 +59,7 @@ [LibraryClasses] StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf + MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 [LibraryClasses.AARCH64, LibraryClasses.ARM] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf --=20 2.31.1.windows.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 (#83623): https://edk2.groups.io/g/devel/message/83623 Mute This Topic: https://groups.io/mt/86971571/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83624+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83624+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590359; cv=none; d=zohomail.com; s=zohoarc; b=SDESVK/uB97jxAr0v+vd42aZlPNCokM7LHv+f7MqulwvNV6H7+EJ26YBvwgQZguQ/TiySPCj/lFD63Pq6PnimWaDlGXOhNg8ly3yGZ88hxwGbebqM3YSrlR82OMfPVoyOEU1EW/ApDvtdwOOAiDZJHtApp3ngPpaP6Z+MXMmEaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590359; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1Y+XnlANaFby/+++WsmwZ0l1vk1o4FgJbKT5KBUghRI=; b=OgTdGU1E0kYZAewsoklxZ3vMjkZLNqDDn4qApaBrjR+Q2hLRdJoRheJnaYYhgWvN1KFDmb/lGIJ9KWlrwRKQiGjsA/a6Fo3JL8EfWDGBD90bbHDlAyvMNYXSZHmrcLdEQ36fRyol+SkUkyMR1KpivH6nZHRMkV8pM0DbAsnee70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83624+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16365903595421011.6939563241021; Wed, 10 Nov 2021 16:25:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id q93xYY1788612xDCh51QBHsk; Wed, 10 Nov 2021 16:25:59 -0800 X-Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by mx.groups.io with SMTP id smtpd.web08.4024.1636590349866988900 for ; Wed, 10 Nov 2021 16:25:49 -0800 X-Received: by mail-pg1-f171.google.com with SMTP id r28so3708102pga.0 for ; Wed, 10 Nov 2021 16:25:49 -0800 (PST) X-Gm-Message-State: k8i2ougGLwe3xab8BqMmbHW8x1787277AA= X-Google-Smtp-Source: ABdhPJzH8e/KLysRgpazBz+lybKM/njgI3NSobaeL1QtL0shkJTvZJMhHwvGh/SrCbQwVGdH9shwMA== X-Received: by 2002:a63:545f:: with SMTP id e31mr1991478pgm.8.1636590349212; Wed, 10 Nov 2021 16:25:49 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:48 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [edk2-devel] [PATCH v3 12/14] ArmPkg: Move the StandaloneMmCpu driver to ArmPkg Date: Wed, 10 Nov 2021 16:24:14 -0800 Message-Id: <20211111002416.1770-13-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590359; bh=SkCNEU1NSL174MvlyDP5YNP1ld1GL5LsV25DeG+jQSs=; h=Cc:Date:From:Reply-To:Subject:To; b=kjrga3A6HPAuLvYSyr8VosNMsBqUarQIHcDbLcyuZOzpH/g6ZL3PEVNS8Z3GsYIkItf KSJvlSiHnbmpb12sHKQOnutn5Flnnq/Z0V1ONWEzJ7cngVAGFLU3bVc05XtQmWmkoYH9M fCFRTnXh/ZCY5edxNJY4BNy4NdUx8W3k+zc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590361240100018 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/EventHandle.c = | 0 {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/StandaloneMmCpu.c = | 0 ArmPkg/ArmPkg.dsc | = 7 +++++++ {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/StandaloneMmCpu.h = | 0 {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf = | 0 StandaloneMmPkg/StandaloneMmPkg.dsc | = 1 - 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c b/ArmPkg= /Drivers/StandaloneMmCpu/EventHandle.c similarity index 100% rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/EventHandle.c rename to ArmPkg/Drivers/StandaloneMmCpu/EventHandle.c diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c b/Ar= mPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c similarity index 100% rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c rename to ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.c diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 197519a64718..04462c355922 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -93,6 +93,8 @@ [LibraryClasses.common] =20 OemMiscLib|ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf =20 + ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf + [LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf @@ -106,6 +108,11 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64] # Add support for GCC stack protector NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 +[LibraryClasses.common.MM_STANDALONE] + HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf + MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Standalon= eMmServicesTableLib.inf + StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf + [Components.common] ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h b/Ar= mPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h similarity index 100% rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h rename to ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.h diff --git a/StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf b/= ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf similarity index 100% rename from StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf rename to ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index da3488e0d3fe..a7b42d9c2882 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -120,7 +120,6 @@ [Components.common] StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf =20 [Components.AARCH64, Components.ARM] - StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf =20 ##########################################################################= ######################### --=20 2.31.1.windows.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 (#83624): https://edk2.groups.io/g/devel/message/83624 Mute This Topic: https://groups.io/mt/86971572/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83625+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83625+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590361; cv=none; d=zohomail.com; s=zohoarc; b=C7p1Pp0xvfomBjbQfIKgkLOrl0yvU14GLWQ0qmo0mSvMGsGXb+FSeiD37FDTqn0ZBypT/6rosr9eHiYcUCX29LO+7fXlqM8bfqlSyNaB0yqlUJWo13hF/hcckKTnvt9ZYSPGKLS3RMnKCHSsbR9qru4oXNGU77YudiioVAMa5mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590361; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YDJw/DM+SouvpJCcfTy2ANrSJlutjzTxytm3eeYA9Sk=; b=PRGEkI/HHQ3hBH/Mwvf5XAuRpFOh7fMkJPAeH0BTbsO01XhIdtuavCyI86pf02cGPrT6Halc3R9HE70vRdV22pm8T02O1e43BzSGVba+4peQ2J+vAPQ9i3PPT8M4gVmtt8fUfSHMJ6Mdc7cjkaEOhgw5u31vtAG9tpAlLzWZh7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83625+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590361028833.112744212275; Wed, 10 Nov 2021 16:26:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JD1jYY1788612xOnU7uKAfo6; Wed, 10 Nov 2021 16:26:00 -0800 X-Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web11.3970.1636590353993511863 for ; Wed, 10 Nov 2021 16:25:54 -0800 X-Received: by mail-pf1-f175.google.com with SMTP id b68so4047937pfg.11 for ; Wed, 10 Nov 2021 16:25:53 -0800 (PST) X-Gm-Message-State: 2X3GI19RCZxGjaGtcAIoBk4Ix1787277AA= X-Google-Smtp-Source: ABdhPJyxaMBZ2nGsJWu/vJVXZ+J70JYk7MOZvo2LhxyX90Bao9LYGeBHHWxzr/eNikpmx3LmTmtaTA== X-Received: by 2002:a63:720c:: with SMTP id n12mr1924733pgc.95.1636590353099; Wed, 10 Nov 2021 16:25:53 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:52 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [edk2-devel] [PATCH v3 13/14] StandaloneMmPkg: Add StandaloneMmCoreEntryNull to satisfy CI on all archs Date: Wed, 10 Nov 2021 16:24:15 -0800 Message-Id: <20211111002416.1770-14-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590360; bh=TBRTRIlLgLUeaI1ZJl6jeujICSD0FW6pwWRYMU7nw2U=; h=Cc:Date:From:Reply-To:Subject:To; b=o1te8gMhqnDfjtQDp6+QE3xrBftDWR1UiSlKmxPY7wnPsK/wLj09zA11lqbXaVdPQ7s rARhdMqEXeWKH2Z3aNu93Kt1QvV9knmc5BUGeJHoqjgOMocq/d8VRvOg61jGlCdeDAsL0 Td1IhQ9RvAyOZZ4s48dNw4j9xvfXqR1b35c= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590361357100020 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew In order to separate this libary into architecture-specific versions, first create a NULL implementation that can pass CI on any arch. Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreEnt= ryPointNull.c | 51 ++++++++++++++++++++ StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreEnt= ryPointNull.inf | 32 ++++++++++++ StandaloneMmPkg/StandaloneMmPkg.dsc = | 10 +++- StandaloneMmPkg/{StandaloneMmPkg.dsc =3D> StandaloneMmPkg.dsc.orig} = | 16 +++++- 4 files changed, 105 insertions(+), 4 deletions(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/Standal= oneMmCoreEntryPointNull.c b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPo= intNull/StandaloneMmCoreEntryPointNull.c new file mode 100644 index 000000000000..2c1fd5a9b6ca --- /dev/null +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCo= reEntryPointNull.c @@ -0,0 +1,51 @@ +/** @file + Entry point to the Standalone Mm Core. + +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) Microsoft Corporation. +SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + + +#include +#include + +/** + The entry point of PE/COFF Image for the STANDALONE MM Core. + + This function is the entry point for the STANDALONE MM Core. This functi= on is required to call + ProcessModuleEntryPointList() and ProcessModuleEntryPointList() is never= expected to return. + The STANDALONE MM Core is responsible for calling ProcessLibraryConstruc= torList() as soon as the EFI + System Table and the image handle for the STANDALONE MM Core itself have= been established. + If ProcessModuleEntryPointList() returns, then ASSERT() and halt the sys= tem. + + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase. + +**/ +VOID +EFIAPI +_ModuleEntryPoint ( + IN VOID *HobStart + ) +{ + // Do nothing. This is a NULL implementation. +} + + +/** + Required by the EBC compiler and identical in functionality to _ModuleEn= tryPoint(). + + This function is required to call _ModuleEntryPoint() passing in HobStar= t. + + @param HobStart Pointer to the beginning of the HOB List passed in fro= m the PEI Phase. + +**/ +VOID +EFIAPI +EfiMain ( + IN VOID *HobStart + ) +{ + _ModuleEntryPoint (HobStart); +} diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/Standal= oneMmCoreEntryPointNull.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf new file mode 100644 index 000000000000..4fd80a5c0841 --- /dev/null +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCo= reEntryPointNull.inf @@ -0,0 +1,32 @@ +## @file +# Module entry point library for DXE core. +# +# Copyright (c) 2017 - 2021, Arm Ltd. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# +## + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D StandaloneMmCoreEntryPointNull + FILE_GUID =3D 5E28E9FA-67DC-4408-A177-05F72CD7E248 + MODULE_TYPE =3D MM_CORE_STANDALONE + VERSION_STRING =3D 1.0 + PI_SPECIFICATION_VERSION =3D 0x00010032 + LIBRARY_CLASS =3D StandaloneMmCoreEntryPoint|MM_CORE_ST= ANDALONE + +# +# VALID_ARCHITECTURES =3D IA32 X64 IPF EBC (EBC is for build on= ly) +# + +[Sources] + StandaloneMmCoreEntryPointNull.c + +[Packages] + MdePkg/MdePkg.dec + +[LibraryClasses] + BaseLib + DebugLib diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc index a7b42d9c2882..d72019d0cce2 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc @@ -56,11 +56,14 @@ [LibraryClasses] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 +[LibraryClasses.X64] + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + [LibraryClasses.AARCH64, LibraryClasses.ARM] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf @@ -111,13 +114,16 @@ [Components.common] # StandaloneMmPkg/Core/StandaloneMmCore.inf StandaloneMmPkg/Library/FvLib/FvLib.inf - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf =20 [Components.AARCH64, Components.ARM] StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/Standalo= neMmPkg.dsc.orig similarity index 92% copy from StandaloneMmPkg/StandaloneMmPkg.dsc copy to StandaloneMmPkg/StandaloneMmPkg.dsc.orig index a7b42d9c2882..875b128a8045 100644 --- a/StandaloneMmPkg/StandaloneMmPkg.dsc +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc.orig @@ -56,11 +56,17 @@ [LibraryClasses] PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf +<<<<<<< HEAD + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= PointNull/StandaloneMmCoreEntryPointNull.inf +=3D=3D=3D=3D=3D=3D=3D +>>>>>>> f71ccd340de8 (ArmPkg: Create an Arm-specific version of Standalone= MmCoreEntryPoint) StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint= /StandaloneMmDriverEntryPoint.inf VariableMmDependency|StandaloneMmPkg/Library/VariableMmDependency/Variab= leMmDependency.inf MmuLib|MdePkg/Library/BaseMmuLibNull/BaseMmuLibNull.inf =20 +[LibraryClasses.X64] + StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntry= Point/StandaloneMmCoreEntryPoint.inf + [LibraryClasses.AARCH64, LibraryClasses.ARM] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf StandaloneMmMmuLib|ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmL= ib.inf @@ -111,13 +117,19 @@ [Components.common] # StandaloneMmPkg/Core/StandaloneMmCore.inf StandaloneMmPkg/Library/FvLib/FvLib.inf - StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMm= CoreMemoryAllocationLib.inf StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemo= ryAllocationLib.inf StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf + StandaloneMmPkg/Library/StandaloneMmCoreEntryPointNull/StandaloneMmCoreE= ntryPointNull.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf + +[Components.X64] + StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntry= Point.inf =20 [Components.AARCH64, Components.ARM] StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeC= offExtraActionLib.inf --=20 2.31.1.windows.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 (#83625): https://edk2.groups.io/g/devel/message/83625 Mute This Topic: https://groups.io/mt/86971573/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 Sat May 11 20:03:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83626+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83626+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1636590362; cv=none; d=zohomail.com; s=zohoarc; b=B5c3/N/R5smpBBIPcCpwjb/RGJAy2V++gAKZlQsGvoiPQgpV5D6tX7Wao+PUFzR9d+TJamRhjw1Ov4jsjTiu9Ea0OToeOXBGnmeyRBxbIehBuzvozjYGb11fHZdQSGczirMSuWCoFwKjwUq3JkMnpK5OE+qkkq8/TChRiJasmP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636590362; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=p86fvnWKSQQVPNw6wo1Xnvtg9Iy/xg80Q+4mRbH4wD0=; b=StNctd3wqCVrvlz9CkZfd2yYo92XOORIeyPMuRzVGJ1QtttG1Y8LK8bqvDD7i0wMwwxOMNNdNrkHkauAPsLZVe4h1iOsTBSakZmP6irxWwJq7rXENpY/WlhVF9WpWpZEHwT1Jea/y9eWqEQobKGV3zDu8T2fH/6H8fsAMIZgDWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83626+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1636590362077232.804614834223; Wed, 10 Nov 2021 16:26:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id vzGGYY1788612x2r7LM9MiFc; Wed, 10 Nov 2021 16:26:01 -0800 X-Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web12.3955.1636590355488743678 for ; Wed, 10 Nov 2021 16:25:55 -0800 X-Received: by mail-pj1-f51.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso3216350pji.0 for ; Wed, 10 Nov 2021 16:25:55 -0800 (PST) X-Gm-Message-State: VPFmoPpDjUHkJpYsXSAoQNplx1787277AA= X-Google-Smtp-Source: ABdhPJyZnvplFLpzk33T6bSCiWVX6pUYkoxvEdvwl9wZ+AHkYqHFZDkUIwxoK2C2iyOngXpGNi/6BQ== X-Received: by 2002:a17:90b:1b03:: with SMTP id nu3mr3572323pjb.47.1636590354837; Wed, 10 Nov 2021 16:25:54 -0800 (PST) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id e14sm838890pfv.18.2021.11.10.16.25.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 16:25:54 -0800 (PST) From: "Bret Barkelew" X-Google-Original-From: "brbarkel@microsoft.com" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Jiewen Yao , Supreeth Venkatesh , Sean Brogan Subject: [edk2-devel] [PATCH v3 14/14] ArmPkg: Create an Arm-specific version of StandaloneMmCoreEntryPoint Date: Wed, 10 Nov 2021 16:24:16 -0800 Message-Id: <20211111002416.1770-15-brbarkel@microsoft.com> In-Reply-To: <20211111002416.1770-1-brbarkel@microsoft.com> References: <20211111002416.1770-1-brbarkel@microsoft.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,bret@corthon.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1636590361; bh=HwUPYG8cTYVC1sFviRuaVfrCbaFJ+Kwv5bjuZez+ejs=; h=Cc:Date:From:Reply-To:Subject:To; b=WBzLqYy/zcUnc3GMXtaMeCdSwob8UhezpK4Oygtv5/enDl/W6lKb5t50F6Vp2NQn4Mn DVkz0Hv8B8Hnk2X2USXQglUdBUwRKLBn+8pI9Qg3QA9hLhLvuUrC9GpNY0ggUp62maaFO FhxqNV/55FPxowvIC+oz1QMfsqc0IlnsRpA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1636590363392100026 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/Creat= eHobList.c | 0 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/SetPe= rmissions.c | 0 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Arm/Stand= aloneMmCoreEntryPoint.c | 0 ArmPkg/ArmPkg.ci.yaml = | 3 ++- ArmPkg/ArmPkg.dsc = | 3 +++ {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Standalon= eMmCoreEntryPoint.inf | 6 ++--- StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPo= int.inf | 25 -------------------- 7 files changed, 7 insertions(+), 30 deletions(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateH= obList.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHo= bList.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/CreateHobList.c diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPerm= issions.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermi= ssions.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/SetPermissions.c diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standal= oneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Stand= aloneMmCoreEntryPoint.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/Arm/Standalo= neMmCoreEntryPoint.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/Arm/StandaloneMmCoreEnt= ryPoint.c diff --git a/ArmPkg/ArmPkg.ci.yaml b/ArmPkg/ArmPkg.ci.yaml index a0d6a75fe881..de6926c82e67 100644 --- a/ArmPkg/ArmPkg.ci.yaml +++ b/ArmPkg/ArmPkg.ci.yaml @@ -46,7 +46,8 @@ "EmbeddedPkg/EmbeddedPkg.dec", "MdeModulePkg/MdeModulePkg.dec", "MdePkg/MdePkg.dec", - "ShellPkg/ShellPkg.dec" + "ShellPkg/ShellPkg.dec", + "StandaloneMmPkg/StandaloneMmPkg.dec" ], # For host based unit tests "AcceptableDependencies-HOST_APPLICATION":[ diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 04462c355922..4cd6a5879713 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -166,6 +166,9 @@ [Components.common] ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLibNull.inf =20 + ArmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf + ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf + [Components.AARCH64] ArmPkg/Drivers/MmCommunicationDxe/MmCommunication.inf ArmPkg/Library/ArmMmuLib/ArmMmuPeiLib.inf diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf similarity index 85% copy from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCo= reEntryPoint.inf copy to ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoin= t.inf index a0629cbc1a6f..c6b283653882 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEn= tryPoint.inf +++ b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.= inf @@ -10,8 +10,8 @@ =20 [Defines] INF_VERSION =3D 0x0001001A - BASE_NAME =3D StandaloneMmCoreEntryPoint - FILE_GUID =3D C97AC593-109A-4C63-905C-675FDE2689E8 + BASE_NAME =3D ArmStandaloneMmCoreEntryPoint + FILE_GUID =3D 0D7C6883-E1A8-4A7A-A35C-E0C200775B43 MODULE_TYPE =3D MM_CORE_STANDALONE VERSION_STRING =3D 1.0 PI_SPECIFICATION_VERSION =3D 0x00010032 @@ -26,8 +26,6 @@ [Sources.AARCH64, Sources.ARM] Arm/SetPermissions.c Arm/CreateHobList.c =20 -[Sources.X64] - X64/StandaloneMmCoreEntryPoint.c =20 [Packages] MdePkg/MdePkg.dec diff --git a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneM= mCoreEntryPoint.inf b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/St= andaloneMmCoreEntryPoint.inf index a0629cbc1a6f..1c6af4d7a4a8 100644 --- a/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEn= tryPoint.inf +++ b/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEn= tryPoint.inf @@ -21,11 +21,6 @@ [Defines] # VALID_ARCHITECTURES =3D IA32 X64 IPF EBC (EBC is for build on= ly) # =20 -[Sources.AARCH64, Sources.ARM] - Arm/StandaloneMmCoreEntryPoint.c - Arm/SetPermissions.c - Arm/CreateHobList.c - [Sources.X64] X64/StandaloneMmCoreEntryPoint.c =20 @@ -34,32 +29,12 @@ [Packages] MdeModulePkg/MdeModulePkg.dec StandaloneMmPkg/StandaloneMmPkg.dec =20 -[Packages.ARM, Packages.AARCH64] - ArmPkg/ArmPkg.dec - [LibraryClasses] BaseLib DebugLib =20 -[LibraryClasses.ARM, LibraryClasses.AARCH64] - ArmMmuLib - ArmSvcLib - [Guids] gMpInformationHobGuid gEfiMmPeiMmramMemoryReserveGuid gEfiStandaloneMmNonSecureBufferGuid gEfiArmTfCpuDriverEpDescriptorGuid - -[FeaturePcd.ARM, FeaturePcd.AARCH64] - gArmTokenSpaceGuid.PcdFfaEnable - -# -# This configuration fails for CLANGPDB, which does not support PIE in the= GCC -# sense. Such however is required for ARM family StandaloneMmCore -# self-relocation, and thus the CLANGPDB toolchain is unsupported for ARM = and -# AARCH64 for this module. -# -[BuildOptions] - GCC:*_*_ARM_CC_FLAGS =3D -fpie - GCC:*_*_AARCH64_CC_FLAGS =3D -fpie --=20 2.31.1.windows.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 (#83626): https://edk2.groups.io/g/devel/message/83626 Mute This Topic: https://groups.io/mt/86971575/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-