From nobody Mon Apr 29 06:27:56 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+83160+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+83160+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884303; cv=none; d=zohomail.com; s=zohoarc; b=MimpuKIL5V4yEEbPn0EN0PUgEwNuV4tq1DEPxB7ZLhuPQqmXvAzIX0+kbE+OqQoJwZ+4lpnZc0sYuKb/w11LDd+tG9Q7Z+sHth7bs3n9x0ny9YitcJDYsSkWyBoUcB3d7CWRbEDSGfy2qS9AeJgMbBUAevwHn9SrhpvyePwg4dE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884303; 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=mc84n1cFgnLYA6IJ3OFpvaEtkcNMms7Q4m6u1v7ISLE=; b=LAS0liztZP0F3GXsgrl2eLaoRSOHMZ39qsftTfhxMT02l/f68XYn7TVQpGk4zL9JyAfbu0n6pp2IHUH68HndyW2tBPdCsKxozwDGUocglWof7ihSroTrG8jHcdlMQki4KLK99BKfwOGL0ySKw5jzc55kABP3dI8P5ALkw0D0iiY= 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+83160+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884303574754.3485465002727; Tue, 2 Nov 2021 13:18:23 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Tz80YY1788612xGa2dzzarBr; Tue, 02 Nov 2021 13:18:23 -0700 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.web10.847.1635884302646610548 for ; Tue, 02 Nov 2021 13:18:22 -0700 X-Received: by mail-pf1-f171.google.com with SMTP id t38so74210pfg.12 for ; Tue, 02 Nov 2021 13:18:22 -0700 (PDT) X-Gm-Message-State: qsbFBffJufjL6tyDZlFuCsOxx1787277AA= X-Google-Smtp-Source: ABdhPJw/zGPzMzg6kIFNvq3ZXlsCZlaJd0IXUuyNfk7UNPuKJcxKPE+Zom1eMIqSYg1ES57PFJjPMw== X-Received: by 2002:a63:b603:: with SMTP id j3mr29093091pgf.427.1635884301825; Tue, 02 Nov 2021 13:18:21 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:21 -0700 (PDT) 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 v2 01/16] ArmPkg/ArmMmuBaseLib: Disallow STANDALONE_MM Date: Tue, 2 Nov 2021 13:17:33 -0700 Message-Id: <20211102201748.1963-2-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884303; bh=Csz1PDdfURyloX/ktVXY4kKqPMN1f1OI5D6BCXyIwmw=; h=Cc:Date:From:Reply-To:Subject:To; b=Z/SV+2IC7S1RueZaa2mDT0xTEcAyRlM4UZfNx5QxwpKvC9ZqhkHjdUBZJ48lge89dJB /u5YbwYpb3Yo6NaN504VqIZ0CUIR9cxJFC1qlohWV6oAQoJrs6VsHCfy8ByS5kMT3vPg+ ltXdtxZESR6DwLRSCKueBPCQXQgxyFENzJM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884304047100001 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 (#83160): https://edk2.groups.io/g/devel/message/83160 Mute This Topic: https://groups.io/mt/86775982/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 Mon Apr 29 06:27:56 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+83161+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+83161+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884310; cv=none; d=zohomail.com; s=zohoarc; b=TQ3Rw8Dm9IPS1gl1prUZ9GV8oGQsvuQkr/zXomm4cVW63EwR+K2uVr9QGv4UqM67H2iIL5Exk5fY+mk8UbG8wnHl6ppJpuL84F0OIkvtjzsOBDqwH2ztWqXdcT+ehcnMIGP11CdEnhAlUaems0uhlM/kjlHnc0YNHBgivWRPbRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884310; 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=DCRkLkbMd+m2G2BuhQ0wlc4fXp89tB/bg7AyKygR1WQ=; b=hgAo+UzYff+g8Cp7WDQBEstNH/DVIniURZbdQGL6BK5z7Sv8eOwIUDgcrXecSnXG1Yca2l7Q2d6o2f9AJBPhhbTYiFL1z4KdoGUp3kz7PwSUxta4EwPm3bC3CZwebsHW8vUajB+jVOWU2eNRbeu75OKni74nfL7xwxtM9sbGk+c= 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+83161+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884310724516.4489519604139; Tue, 2 Nov 2021 13:18:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZlIzYY1788612xFgiGR4CoOl; Tue, 02 Nov 2021 13:18:30 -0700 X-Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.852.1635884309624733175 for ; Tue, 02 Nov 2021 13:18:29 -0700 X-Received: by mail-pf1-f174.google.com with SMTP id h74so145353pfe.0 for ; Tue, 02 Nov 2021 13:18:29 -0700 (PDT) X-Gm-Message-State: q4ZgGVnxbKLDLg9Uw6zkXySlx1787277AA= X-Google-Smtp-Source: ABdhPJy8fA+CBvv5+1aLHtuuQUJqR09U2obbgMqcuCIvDl2QVzS9rCVTOJLUk5eSv+VUZ2MUud0ZfA== X-Received: by 2002:a05:6a00:1787:b0:481:1503:e631 with SMTP id s7-20020a056a00178700b004811503e631mr13858325pfg.6.1635884308914; Tue, 02 Nov 2021 13:18:28 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:28 -0700 (PDT) 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 v2 02/16] ArmPkg/ArmMmuStandaloneMmLib: Update to match ArmMmuLib Date: Tue, 2 Nov 2021 13:17:34 -0700 Message-Id: <20211102201748.1963-3-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884310; bh=n1V76HYiRJsq0ucwBDjVt4dcOloq9A5eEJWPC/Rap5Q=; h=Cc:Date:From:Reply-To:Subject:To; b=j4mI96cwdPyMgLictvCtLdzQG9QYDfDlH/asjt5Xf9JO/5re/0PN5AUmtUtkfRcfecr x06W9ScW2TOUyQnKwUUKe/MIL5pLxAZCMXffOaTrXxSmMe8xtajUmulDSWoGw1ZpdodXs SQvZfRSRdf7NGM6q0VB+TTIRUkW7BAxPy2w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884312588100002 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 | 37 +++++++++= +++++++++++ ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c b/Ar= mPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c index 20f873e6802c..42216bf40ac7 100644 --- a/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c +++ b/ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.c @@ -325,3 +325,40 @@ ArmClearMemoryRegionReadOnly ( } return Status; } + +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; +} + +VOID +EFIAPI +ArmReplaceLiveTranslationEntry ( + IN UINT64 *Entry, + IN UINT64 Value, + IN UINT64 RegionStart + ) +{ + DEBUG ((DEBUG_ERROR, "%a() interface not implemented!\n", __FUNCTION__)); + ASSERT (FALSE); +} + +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 (#83161): https://edk2.groups.io/g/devel/message/83161 Mute This Topic: https://groups.io/mt/86775988/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 Mon Apr 29 06:27:56 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+83162+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+83162+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884313; cv=none; d=zohomail.com; s=zohoarc; b=RTgDoglKhZ4I/E4kS1t48liWkX0MmhMNVuuZ8BP8Y9ogAmTSi5wk4rf7KCXpWwby/q7KQWsuRMyW2CzjFVwmVmwoFDaU1tamnD9YY2XmEzqMHj8xPWH3TnbPZoTddVnDydgXYw6SJYKF0vh5o6GIJO8TL01s5Tk6En/Rblosd3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884313; 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=07fFNahPSwiL47MnHYl6/tpB9voBTjZQXTfImf7Iir0=; b=O50zHPeJ6y0heXJXaV1ztpGyUcWPlrNxPRtOu7Av7IHjH5QeAatBXT8LUuNLvVY4AqDrn1JtfNKoXfnedoblSaOvdD36jomC0zapL8iB6tcR/cz1mcoGoEeJyPcGPgT0fkD4IZ4sl+v9Yh8Km4r51ozNFRXBD22KeC7nzrJXaYM= 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+83162+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884313316832.3353623406684; Tue, 2 Nov 2021 13:18:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XspXYY1788612xq6JnUcQoOU; Tue, 02 Nov 2021 13:18:33 -0700 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.web10.855.1635884312222781739 for ; Tue, 02 Nov 2021 13:18:32 -0700 X-Received: by mail-pl1-f175.google.com with SMTP id v20so605383plo.7 for ; Tue, 02 Nov 2021 13:18:32 -0700 (PDT) X-Gm-Message-State: l7VzjUYbquiG1lJKE6MDSp3Ax1787277AA= X-Google-Smtp-Source: ABdhPJzo/7xpe2Q7ElY3TuCgrOx3dfSEazqLWxhiewOL/2ms0MNnXZAspejwKK4T2nzZSkRcBtyoUA== X-Received: by 2002:a17:90b:4f86:: with SMTP id qe6mr9510324pjb.209.1635884311443; Tue, 02 Nov 2021 13:18:31 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:31 -0700 (PDT) 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 v2 03/16] ArmPkg/StandaloneMmCoreEntryPoint: Swap to ArmMmuLib Date: Tue, 2 Nov 2021 13:17:35 -0700 Message-Id: <20211102201748.1963-4-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884313; bh=1lFcg1JZE8P6coMAV/fDIqFB7cPGH88xEB/rC3cy000=; h=Cc:Date:From:Reply-To:Subject:To; b=CRnyDv/FXLXwff6FwQs2u8xTfwPbiXSCgQKxbH2V69TRHP2jvIZj/uWJbMgLY0yfFmF RLMXMKko4km2KcfQX+9IBYEisypW52FUFo3vWXuelgJ3jGhM9Qq2CO8h4KYzUwXy2h34Z +WLSnsccWX0muPu3xyP+DS8mgjx3OV9sXZM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884315717100001 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 (#83162): https://edk2.groups.io/g/devel/message/83162 Mute This Topic: https://groups.io/mt/86775990/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 Mon Apr 29 06:27:56 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+83163+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+83163+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884315; cv=none; d=zohomail.com; s=zohoarc; b=VDXs+cLj2vAKpiZvO+bHQeYc0PuP4NXNm46vojaK/Uy2ZU5v9K6bVLTKqzB9eWAKukD2EZH7xLfC9hsAHnsEj4uOT0QnL/eZtGLYUlpOQkcZILtnR4Ly5Ko/a9XGVGw9RkV0I8J1Eq35metF/0QhvH0N6jTlN8vvrE0UFzokHVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884315; 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=Fd07L3WJXITmvItggy+VYMUCxW7xnlGzeS0balAidqM=; b=HpVw16ftIg01e4CePCXf1WlR/y+uDZJ5l1xdSrOZzy3KHW8tAHAd5MODFBEXnmWtQYooCh/OeWbW6AmhEiML/rpDNnuKFf6JYPCqsWHQrSQi8+twGdd44f3QJncvAOjkG0kGN/ekgSSDooKHYfq4532PaHDQxguXbFXXIxndPYU= 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+83163+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163588431519427.997690006255766; Tue, 2 Nov 2021 13:18:35 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id pqkCYY1788612xWa2dsElca7; Tue, 02 Nov 2021 13:18:34 -0700 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.web12.837.1635884314216834507 for ; Tue, 02 Nov 2021 13:18:34 -0700 X-Received: by mail-pl1-f175.google.com with SMTP id f8so558746plo.12 for ; Tue, 02 Nov 2021 13:18:34 -0700 (PDT) X-Gm-Message-State: ktd8E8DaILNxXDnsqg1kj9Jrx1787277AA= X-Google-Smtp-Source: ABdhPJwcO9EhHUpYFNn08CZ2tlJVDednXxQMOTSdPe4ZZtuMfNo6atQfbVvZNF2N2Y3DVlq+SSp2+A== X-Received: by 2002:a17:90a:4e02:: with SMTP id n2mr5813580pjh.170.1635884313544; Tue, 02 Nov 2021 13:18:33 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:33 -0700 (PDT) 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 v2 04/16] ArmPkg: Disavow StandaloneMmMmuLib. It's just ArmMmuLib Date: Tue, 2 Nov 2021 13:17:36 -0700 Message-Id: <20211102201748.1963-5-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884314; bh=oN2NrMGS7kHy8kt0M25msJQ9EUqEf0NdlKWuVvuqa1I=; h=Cc:Date:From:Reply-To:Subject:To; b=XeW7R8qg4arGqSF+hY3Ny99zkvA2nH/A1kn6YMmBawkc9EBvMmGoTdxwNKG5NaLw2Ca xsqvsvggu2OFvW6oURXQs5jPOVswMKlnXlPb0poyq8nUjGShMMCKRcAzzzAVBSmcPPZs7 syjPL1FqnuMnTa0iH+YpEYQXcXfHpf8E9yo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884316031100003 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 (#83163): https://edk2.groups.io/g/devel/message/83163 Mute This Topic: https://groups.io/mt/86775991/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 Mon Apr 29 06:27:56 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+83164+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+83164+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884325; cv=none; d=zohomail.com; s=zohoarc; b=FYRHIcuxruFbB/81+OS2TqpLePS0z/i2xZ/lKBuiNPsnIGDpQj6Mpvr8l7fjDLCaJtuebrD+GLM9jB1dnPDxNr4s12isn9yA+h6UWE1gE1H/CqjPtvuM395HfYwuejiYNJiupHIk3FkCgm2DFEqolQnakfMtoL3Fd0H+26KrZJ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884325; 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=Yvo+ON6FYJ6L4q5Le+ecEae6ThCq+akSkcCwaIByWwM=; b=ltSM3nLCrlxpVa/Hft9qSdAlLo8WLTAiUC1cdaLUazatTEiSdbA3x7nAI1My4ZiIbXVyGjnHONeN8ckbX1sEy3Y8mL3JqtUJyyLcZewFzV45b99nFbUTsUpR3wZBSfgl/PXYoRVISQmdh5zoeEuE1w4x8zfJwQH5nuCAWo3yRZQ= 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+83164+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884325896974.1521553178527; Tue, 2 Nov 2021 13:18:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id mGwnYY1788612xseNyty4Qcp; Tue, 02 Nov 2021 13:18:45 -0700 X-Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web09.863.1635884324884271835 for ; Tue, 02 Nov 2021 13:18:44 -0700 X-Received: by mail-pl1-f176.google.com with SMTP id b13so647384plg.2 for ; Tue, 02 Nov 2021 13:18:44 -0700 (PDT) X-Gm-Message-State: 9tF1EiMk1dCuXZDFZE8mCLGlx1787277AA= X-Google-Smtp-Source: ABdhPJwicegRDOSoE/64v56pqNEwbluhW+LuiCheS/wBqwRkn5SGONu/B0nXRFlDZaAuzuLTRaP8dA== X-Received: by 2002:a17:90b:4b4c:: with SMTP id mi12mr9510036pjb.57.1635884324133; Tue, 02 Nov 2021 13:18:44 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:43 -0700 (PDT) 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 v2 05/16] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg Date: Tue, 2 Nov 2021 13:17:37 -0700 Message-Id: <20211102201748.1963-6-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884325; bh=I3KkbHbpnEfvawKm8o0BQYFOO2CmzD6gXtq/33wVf4Q=; h=Cc:Date:From:Reply-To:Subject:To; b=DJ0hLSO8WZdskkyr1cEuAlEiq6I1vIlh8QXPH8uciMhefJrgURY65sZMr6CfdthlGeh Sh83WXXqQxGbbPTWIiT659qqxRW53WTDlynMtRCDt64ORVmYNcNDXakZa631CumvwO7YA wfEgMoNrzz6RMaEu4X1IVjrijiZiCXStmOI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884326948100001 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew TODO: Might keep the name of the .inf. Pending discussion. 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 +-- CryptoPkg/CryptoPkg.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/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =3D> MdePkg= /Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf | 3 +-- MdePkg/MdePkg.dsc = | 1 + NetworkPkg/NetworkPkg.dsc = | 2 +- ShellPkg/ShellPkg.dsc = | 2 +- StandaloneMmPkg/StandaloneMmPkg.dsc = | 2 +- UnitTestFrameworkPkg/UnitTestFrameworkPkgTarget.dsc.inc = | 2 +- 58 files changed, 9 insertions(+), 10 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..06ede068f99d 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/ArmCompilerIntrinsicsLib.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/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 0aa72ed87846..eab46e4b4fbc 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/ArmCompilerIntrinsicsLib.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..ab505f5bb2c6 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/ArmCompilerIntrinsicsLib.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/ArmCompilerIntrinsicsLib.inf similarity index 93% rename from ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf rename to MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf index fcf48c678119..46224f79ea85 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/MdePkg/Library/CompilerIntrinsicsLib/ArmCompilerIntrinsicsLib.inf @@ -11,7 +11,7 @@ =20 [Defines] INF_VERSION =3D 0x00010005 - BASE_NAME =3D CompilerIntrinsicsLib + BASE_NAME =3D ArmCompilerIntrinsicsLib FILE_GUID =3D 855274FA-3575-4C20-9709-C031DC5589FA MODULE_TYPE =3D BASE VERSION_STRING =3D 1.0 @@ -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..cb3907c88b4e 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/ArmCompilerIntrinsicsLib.inf =20 [BuildOptions] diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc index cf2164aefe25..1c727a9a4bf1 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/ArmCompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf =20 diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc index 6f0d0929319d..25e8831bf36e 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/ArmCompilerIntrinsicsLib.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..2c0c9396d633 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/ArmCompilerIntrinsicsLib.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..2bbf2398b7e9 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/ArmCompilerIntrinsicsLib.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 (#83164): https://edk2.groups.io/g/devel/message/83164 Mute This Topic: https://groups.io/mt/86776000/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 Mon Apr 29 06:27:56 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+83165+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+83165+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884329; cv=none; d=zohomail.com; s=zohoarc; b=SfhpiUxkuY2ldG8/IhE66ecPsZ0gdwRaNeEzlerw/HhVLgWs+V5m5+H6lQD7Aos3wdZ3h3nNcg3EZXm+nheQdYWJgyvwagShVZ3vsxdFu62XKvNpm3qXY3bO2G4LL5lVVu1lgJlH8rbAg8AD/lHkf5b7fsGcZFSPgFGaJ283yaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884329; 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=qhU3wNfNBO4wpt93vVdAR0DDti49j1AA0Tyxd7MqlBE=; b=j3R3Thg90d3++3MFwkH6Xc6WOC5y0rzDUc12ivxOPIdR1K5VtNVff7fmx7PMrOC4qaWytou9qReOTaPmovanbZ6ghIX5cwPh4Lj6/4GhcIJc1FpkPAhTCUW0ADWCtwfO5NXyByQJiwGLLJTVx7Jd76DcAoaozEhPh9lzGeISHWI= 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+83165+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884329926786.5403675956138; Tue, 2 Nov 2021 13:18:49 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bPhSYY1788612xy8P2h4d8Xu; Tue, 02 Nov 2021 13:18:49 -0700 X-Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.861.1635884328990591970 for ; Tue, 02 Nov 2021 13:18:49 -0700 X-Received: by mail-pl1-f179.google.com with SMTP id u11so642315plf.3 for ; Tue, 02 Nov 2021 13:18:48 -0700 (PDT) X-Gm-Message-State: jD3Gnw2YrHKSSe4l7Szu6okdx1787277AA= X-Google-Smtp-Source: ABdhPJwpyLK46jsEtxUPpj0myxgN6zR04gdGRh+AsIdYgaDtHDZmqcDup6dtFT0ZWPtkAo/ujPyn3Q== X-Received: by 2002:a17:90b:1c8e:: with SMTP id oo14mr9548727pjb.224.1635884328330; Tue, 02 Nov 2021 13:18:48 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:47 -0700 (PDT) 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 v2 06/16] ArmPkg and BaseTools: Move the GccLto binaries from ArmPkg to BaseTools Date: Tue, 2 Nov 2021 13:17:38 -0700 Message-Id: <20211102201748.1963-7-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884329; bh=Ku9nKQ5bkF3Y+Eljj4nQLpp0dXSSwb7b5MrXZKXnMCA=; h=Cc:Date:From:Reply-To:Subject:To; b=nW1cnnjjOVOYpmeKegRneF5WOc291aas+HNfXp3yfJtx556qdFKVGdJRADd8fVR58L6 VCuxzBpAWG4vM9a1vf0LmlWEuwhCYdY7/gAkvsvsNg4OHtQIP8RsUNQjESTvU/yo/GecK JAOIPB9pWsWayQGtANgWjLAEuyEEI9q/Dl4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884331362100002 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 (#83165): https://edk2.groups.io/g/devel/message/83165 Mute This Topic: https://groups.io/mt/86776002/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 Mon Apr 29 06:27:56 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+83166+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+83166+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884331; cv=none; d=zohomail.com; s=zohoarc; b=fWXtzXt3I/MMtKL0jlylNt6H2dL9fs8oFTvWp+JTFhxeBwcUnVgsBFnD4I3peb3OoZnI7L3xoh+ZkGzwLgWUl0WATSxHPfOpC5aHgANcikko6R4v3W3D0X1ThK/+5tVLSUknKz8Ido8G8EstS0Z7VDcy4sqWXJcTJxqLCNKLrtc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884331; 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=Rpz3eHXJekBNGqSQC0fRFXL7/jRCk2QTSUs9+PHYtHo=; b=asatAuJawbTnGW7THlV9MpcSHTShjU1c7BBi8X6xh+DyvEb/W4lwalL5P3+1/LgPxxjYgkzVaK5CyZRPWiV2g3QzmdF0j2KOgXVfEVIQVi+SFXvTpO8ZuJZeBtcWJGQ7O1ddCwK59Up/V3Z9deA5ks2zg3EhxUCL/j2hZTNLbR0= 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+83166+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884331825150.35761460911488; Tue, 2 Nov 2021 13:18:51 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WTjaYY1788612xlxTa8BjZ9L; Tue, 02 Nov 2021 13:18:51 -0700 X-Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.861.1635884330999566920 for ; Tue, 02 Nov 2021 13:18:51 -0700 X-Received: by mail-pl1-f182.google.com with SMTP id f8so559898plo.12 for ; Tue, 02 Nov 2021 13:18:50 -0700 (PDT) X-Gm-Message-State: HA9Hx0t8CFsHtvULLvYeUekCx1787277AA= X-Google-Smtp-Source: ABdhPJz6tjEBvGfW0eOovJbynzRQhJjxeX+88cjxsLd39oJn1IOfXhnKTHu+8QQ2qNpxIjl3q+lzNQ== X-Received: by 2002:a17:902:934c:b0:13d:c685:229b with SMTP id g12-20020a170902934c00b0013dc685229bmr33534705plp.25.1635884330353; Tue, 02 Nov 2021 13:18:50 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:50 -0700 (PDT) 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 v2 07/16] ArmPkg and MdePkg: Move the AsmMacroIoLib from ArmPkg to MdePkg Date: Tue, 2 Nov 2021 13:17:39 -0700 Message-Id: <20211102201748.1963-8-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884331; bh=K9eQyOvRcMSqi9zyaBg5vbLjsYW7Qt7uH/uAq+ZzBKg=; h=Cc:Date:From:Reply-To:Subject:To; b=fOmIRoAbYYz/0oTZ/EqrNZV06q1K4btdkfBw4GDgVsQ5zqeyLBC+rkGW+CkHuF1gl6b qyFb/L5Dk1DppNnZOYnPx1a+EXLCwC6y0lGQNy65pNRcp248lYrLElfAL1XJjya+gMDZ7 DJWfa454uyPSbKRqCR8HlyWG+ZPdZU9lxLk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884333474100005 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 Reviewed-by: Liming Gao --- {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 (#83166): https://edk2.groups.io/g/devel/message/83166 Mute This Topic: https://groups.io/mt/86776003/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 Mon Apr 29 06:27:56 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+83167+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+83167+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884333; cv=none; d=zohomail.com; s=zohoarc; b=HRqWEs/LcKWco1sh0npUnm1YwXfO+qWb06bK+YEl1AJK9QI0+88AYtb+zN4in3RTPexbkxW30qVvlizI/j7nqJHm+YvUK+DifIU+Ys2tHBk9x5/QD5mEp+0yBYTzhBMPz7npJLGdtdwxZpeiWOv0uixXcFWWy3T4oXDlzz4pHgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884333; 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=0QHU1s5UplilkMzh70Ru+44pdsut50/7Lumjcr7UDk4=; b=KAjz0unLUgnPmaaSRjDvcTLgcTiMi1Aql2v3eLlRM9FtD0Ik2sC8J44XHKoZK6hxBk/1R76gf0GTHXEZoooSQkFJ5ou52vR1rGO86zuh4VrcQUIVcF29ymKHDR/8IzmxA29QrP9ZgIkm4rCNVK0NIh7bNQI30xiWsc7VO8XoIeI= 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+83167+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884333471552.7097728776455; Tue, 2 Nov 2021 13:18:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3V6AYY1788612xHD3AX5tGtP; Tue, 02 Nov 2021 13:18:53 -0700 X-Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web12.843.1635884332573810374 for ; Tue, 02 Nov 2021 13:18:52 -0700 X-Received: by mail-pl1-f171.google.com with SMTP id s24so708031plp.0 for ; Tue, 02 Nov 2021 13:18:52 -0700 (PDT) X-Gm-Message-State: r6ugRNMw6L40A16y4Qo8N8Bex1787277AA= X-Google-Smtp-Source: ABdhPJyy1UUaKVXeQT7vH1ZYSQrGzr5FFZv2iEBdIsskb+ACqvfpSY0bEw0wvbBUV0YpZ8UeqRkX5Q== X-Received: by 2002:a17:903:120c:b0:13f:d043:3477 with SMTP id l12-20020a170903120c00b0013fd0433477mr33575021plh.89.1635884331908; Tue, 02 Nov 2021 13:18:51 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:18:51 -0700 (PDT) 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 v2 08/16] MdePkg: Create the MMU access lib to abstract memory protection settings Date: Tue, 2 Nov 2021 13:17:40 -0700 Message-Id: <20211102201748.1963-9-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884333; bh=YLM0kbqtBFkzKjcTdK5xvOe5g/E+xzi6lMV9lj9SVns=; h=Cc:Date:From:Reply-To:Subject:To; b=teqpMkhKkVv7QnQtq3LkJ2ZtpQ639Z4tZgg1n/GWkl0PXKveayrUm5EL4mDwVk/ZiCM RmBUW7uIbNU69l/syADTU3E+anm0duCFcJMjnM7F51M/B3MnaBxcufWzETOYw87gX2Cfy yNJhCO2m4520I/+cFkAfxFl/6o45oijmIyc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884335781100002 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..170670f7d52a --- /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 // _MMU_LIB_H_ 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 cb3907c88b4e..a9c67b72e4e0 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 (#83167): https://edk2.groups.io/g/devel/message/83167 Mute This Topic: https://groups.io/mt/86776009/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 Mon Apr 29 06:27:56 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+83168+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+83168+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884456; cv=none; d=zohomail.com; s=zohoarc; b=jf64BbN5vMi3KRe0yR88S5PufgQRgF+0BE6TSaJ0OrriPeXDCVwnUtnEG+VGrWTaZtP6MXYuQKlT2Ab5Fmha2SfDSxHCzW9/YwpbFQ8oDTx9QVQS4GmNNNDdzxMCyBTyu3EA1jFq9iu+uWEpnRRU1MngnArL33j78Zkouuu8lSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884456; 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=7H0RgYmtBgOFawh/WhE+6oyMUgFg8YJ3LV7wIBWH+Bw=; b=R+hkCO0S4W2J2X/z2LuJCc1sQw29VeAx6qyg5u2Q+D7FcYKOePUpcYAi4xwsg6FueywiIOaL/eDH68heEEcyIB9u0IwThB46b+6cnZZgnMMDfV/tSnBVXUaU4DTwXY3u6vf3SzDmVPOSxtCBTSdva+7pArLEuS0JTzEX/pNAkR0= 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+83168+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884456830751.4854597009628; Tue, 2 Nov 2021 13:20:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6d5wYY1788612xzjkayHb3j6; Tue, 02 Nov 2021 13:20:56 -0700 X-Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mx.groups.io with SMTP id smtpd.web12.877.1635884455964406898 for ; Tue, 02 Nov 2021 13:20:56 -0700 X-Received: by mail-pg1-f177.google.com with SMTP id p17so427101pgj.2 for ; Tue, 02 Nov 2021 13:20:55 -0700 (PDT) X-Gm-Message-State: Xq0Ee0x3SUq7d5OsHluS4vEzx1787277AA= X-Google-Smtp-Source: ABdhPJzQNtwfgMeIpyFj/lO9dAZ0phGnjvlwRPuoa8vTX5VG2FzZ2Qira1Gy9AgMBg1Zze08vbd/FQ== X-Received: by 2002:a05:6a00:10d2:b0:44d:f03e:46c7 with SMTP id d18-20020a056a0010d200b0044df03e46c7mr38972588pfu.0.1635884455226; Tue, 02 Nov 2021 13:20:55 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:20:54 -0700 (PDT) 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 v2 09/16] MdeModulePkg: Swap to MmuLib instead of Arm-specific lib Date: Tue, 2 Nov 2021 13:17:41 -0700 Message-Id: <20211102201748.1963-10-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884456; bh=93kDQvfPGAC2Lyp5ttzTsGvGaJV0DNo1p5cqQyi2+TI=; h=Cc:Date:From:Reply-To:Subject:To; b=b3TiPRkAPRT3yng5pz3SURLbjPlBtPScRO8yBYY559n7/6dWXY4nqiTMigGA+Kk6az2 5gl+g3RyjQxalSDff56BzL3BEOgnEUUSv6KPoYeO9/dqPOgV0lOZNjumeGFW+9SCbIu8g 33nfwlDpBGJa4kDqUAFeFCMc7ggY4j8IBGk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884457142100001 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 ab505f5bb2c6..20790145d5bf 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 (#83168): https://edk2.groups.io/g/devel/message/83168 Mute This Topic: https://groups.io/mt/86776051/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 Mon Apr 29 06:27:56 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+83169+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+83169+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884458; cv=none; d=zohomail.com; s=zohoarc; b=VmftOKj57z1V9dpNfB2aBMAp9LqRDbAAQ370XK2dFGf4wevKb1GA6mfznKGocU/c+uH9IH/14ewigJ3Rtt0O0GTskK3QBl8rhFO5F6jlnvWF+tjOr8ptjoiMfAS7Ir2xDKA29sEpcXs1SSey6Up5XFklVYr3BPPHZPBs/Q1BNDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884458; 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=QfQ5G/2MI9SQESGxZl7KJwrN2C/9TYc7V1EbmMRS6eA=; b=Fg0dWboJC5j1uKhKGthqMeYV+w5+NKwqQi5IPnjucErfPs6G8JUvFDCZrl9RGoQoWz+tz/dbkaW0ZqCyUg176uyWxQHEgiX7JKw8LEENR5RRfTB1bzNGeDrAxVYSTlFnScni7WvByutzGnmwdkdUsCIozRRCCnDZLUl7vjm401w= 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+83169+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884458000776.4878214870851; Tue, 2 Nov 2021 13:20:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id vcnbYY1788612xHr64PlYPig; Tue, 02 Nov 2021 13:20:57 -0700 X-Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web12.878.1635884457195838503 for ; Tue, 02 Nov 2021 13:20:57 -0700 X-Received: by mail-pl1-f179.google.com with SMTP id p18so561555plf.13 for ; Tue, 02 Nov 2021 13:20:57 -0700 (PDT) X-Gm-Message-State: ZgOdWqLYgpUNntKIu2DztGsmx1787277AA= X-Google-Smtp-Source: ABdhPJybqEclx+z52tlqPqT41hBJEVLuSmEgQt9O+PAYiRoeSEYVNnD6kRTfQtAADWKO4KioXVdWCA== X-Received: by 2002:a17:902:9a91:b0:138:efd5:7302 with SMTP id w17-20020a1709029a9100b00138efd57302mr33770396plp.35.1635884456514; Tue, 02 Nov 2021 13:20:56 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:20:56 -0700 (PDT) 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 v2 10/16] StandaloneMmPkg: Switch to the MmuLib abstraction Date: Tue, 2 Nov 2021 13:17:42 -0700 Message-Id: <20211102201748.1963-11-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884457; bh=ayQ9E1Q/zya4WLmkfiN98KqjDxRahk/Q6axZrBjL0+U=; h=Cc:Date:From:Reply-To:Subject:To; b=P8ycYsB/YEa81h12hh4R6FPx4akVO9UFP3ffv61qwzczuJQx8CWDbzBmN/BTSwB5tVs 4tPk3CU7r3OpwYewt2CtLo7YNMmVmRdJIZGQo9Y7/mmqw7CvoWk93/VEwPjxexjUjUHch rvOXzc7nNVXTMeOlpdLlOZkLhVJVrKiKad8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884459166100006 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 | 50 ++++++++++++++++++-- StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/StandaloneMmPeCof= fExtraActionLib.inf | 3 +- StandaloneMmPkg/StandaloneMmPkg.dsc = | 1 + 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/StandaloneMmPkg/Library/StandaloneMmPeCoffExtraActionLib/AArch= 64/StandaloneMmPeCoffExtraActionLib.c b/StandaloneMmPkg/Library/StandaloneM= mPeCoffExtraActionLib/AArch64/StandaloneMmPeCoffExtraActionLib.c index ca8b1244a313..ca3b9de26a6f 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,46 @@ UpdatePeCoffPermissions ( return RETURN_SUCCESS; } =20 +STATIC +EFI_STATUS +ArmPeSetMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuSetAttributes (BaseAddress, Length, EFI_MEMORY_XP); +} + +STATIC +EFI_STATUS +ArmPeClearMemoryRegionNoExec ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuClearAttributes (BaseAddress, Length, EFI_MEMORY_XP); +} + +STATIC +EFI_STATUS +ArmPeSetMemoryRegionReadOnly ( + IN EFI_PHYSICAL_ADDRESS BaseAddress, + IN UINT64 Length + ) +{ + return MmuSetAttributes (BaseAddress, Length, EFI_MEMORY_RO); +} + +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 +220,8 @@ PeCoffLoaderRelocateImageExtraAction ( { UpdatePeCoffPermissions ( ImageContext, - ArmClearMemoryRegionNoExec, - ArmSetMemoryRegionReadOnly + ArmPeClearMemoryRegionNoExec, + ArmPeSetMemoryRegionReadOnly ); } =20 @@ -205,7 +245,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 2c0c9396d633..d3e8d250d972 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 (#83169): https://edk2.groups.io/g/devel/message/83169 Mute This Topic: https://groups.io/mt/86776052/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 Mon Apr 29 06:27:56 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+83170+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+83170+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884459; cv=none; d=zohomail.com; s=zohoarc; b=KbiTNsknkdfNdvTDRckoPCdRyMG10mbnzkvAM4RnNE79PllbKYtBuPUJqhPX7yeKRKax/LAEknksKGzBGHdkz4iNW+iM/fBc2Kut7BTM4ChRwotdCCMW946Twx7QsJPjSOiWM3pkYbdC5sEr4MFmg7o2FebTex9aguesKKh2q3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884459; 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=8RG+6tdMiwSNeDOo0/sBcOBcGAjMoFY1BL7llc5M0+M=; b=ddihYtIxEctHAHrkDXpRsB1zGflO67MJIIJPPrIQ8kEBBjWrKL6lwjVZW9MUCGz7KUiJUTdXhrbU6WtjuPz6g8+sMDu1PFEF5KMkJ605gpl4mCmlB9VJG0l4vf+N8YJmIO8844XWqI4EOruPMhzzB7oEGuJlmnayu9CM1rkld84= 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+83170+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884459214169.36374783492624; Tue, 2 Nov 2021 13:20:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SlNZYY1788612xb1cWLj4zcb; Tue, 02 Nov 2021 13:20:58 -0700 X-Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web08.908.1635884458454902462 for ; Tue, 02 Nov 2021 13:20:58 -0700 X-Received: by mail-pg1-f170.google.com with SMTP id r28so454971pga.0 for ; Tue, 02 Nov 2021 13:20:58 -0700 (PDT) X-Gm-Message-State: XWVHdO20mjvCI5SqRwvIgaTtx1787277AA= X-Google-Smtp-Source: ABdhPJxhl+PB21aPtyEXekF2RMBLbnmLZ8td4sQnHghn+aJtcO+ZsW5SSYQu1XMVyAYnCM0HgNNWcA== X-Received: by 2002:a05:6a00:850:b0:47c:2c90:df44 with SMTP id q16-20020a056a00085000b0047c2c90df44mr38618871pfk.70.1635884457727; Tue, 02 Nov 2021 13:20:57 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:20:57 -0700 (PDT) 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 v2 11/16] ArmPkg: Add Basic MMU Lib for Arm silicon Date: Tue, 2 Nov 2021 13:17:43 -0700 Message-Id: <20211102201748.1963-12-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884458; bh=DObAPo8pT8rUhc2sG54l7yrWguQT+/eUr2iML9E2dYg=; h=Cc:Date:From:Reply-To:Subject:To; b=WLz1oXWuIbipn8RfWk/02vfN9qTzElvJAetHGdzmXrND7BjcjOjkACuXz7R2SqBXsED d5xse7PvtJsm1fQSa2Qz508ICC2UjoGS2eb84Dc+jtlbU8nFHlZw/4MxfXdJtZ9G/Naod WJnbwagMey7j/C3ZzBbj015pmiseD9vVwwk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884461182100012 Content-Type: text/plain; charset="utf-8" From: Sean Brogan The previously Arm-specific "ArmMmuLib" has been generalized as "MmuLib". The Arm implementation of this lib can still use the existing library logic to back it. As such, 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..70840c26f489 --- /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) { + 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) { + 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) { + 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 06ede068f99d..cbc67daa7696 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 (#83170): https://edk2.groups.io/g/devel/message/83170 Mute This Topic: https://groups.io/mt/86776053/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 Mon Apr 29 06:27:56 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+83171+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+83171+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884460; cv=none; d=zohomail.com; s=zohoarc; b=IBfFIO/bgmOKwcAOt0mru+ZW6Z7sU9aQ1oKNh8GYq4x0ZODzWs3Nad3vJvVHZjy4SlyoXcwbMZ1Y94TGnsVYlZQ8eY9LVBY+Aj1YkTu2dFyCR+fbHRdnVss3jirJLc6DH9y/VrtNbI4S9SqrfNIBtYBkM8nH58gSGOgSCCjZCiQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884460; 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=jTVhhR6jA107xuUUx0GbwQQI/XCZkVHXosm+tEJkFFc=; b=ZusntEmlGRI4AQB/jttMMA09+o5jjHkXNCTZXB77TWpjzlnsrEcfPWBSJC5EW4nxNjI38f77id1G5jOswvHgKxNNOCXgeYrVCS/oReHmnP80+tTE9kxruagsMURZdvTU6VkL2HnhNsBkBOr6oOrwriUchfYjwwWE0F4keUzGojg= 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+83171+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884460443802.8024144522518; Tue, 2 Nov 2021 13:21:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id q5RrYY1788612x56rqCSYFTi; Tue, 02 Nov 2021 13:21:00 -0700 X-Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web08.909.1635884459584647539 for ; Tue, 02 Nov 2021 13:20:59 -0700 X-Received: by mail-pl1-f181.google.com with SMTP id s24so716827plp.0 for ; Tue, 02 Nov 2021 13:20:59 -0700 (PDT) X-Gm-Message-State: 8tPnXeSsK4DMkIeVnX5UTtLwx1787277AA= X-Google-Smtp-Source: ABdhPJz5i+DgxSsjQtlKRwTx/UBFdoEEr41QBoPkDtY/zsKLkk4ecFR0y5fPCxzo3zXQsxfpC5xJDg== X-Received: by 2002:a17:902:d4c2:b0:142:76f:3200 with SMTP id o2-20020a170902d4c200b00142076f3200mr7182718plg.53.1635884458909; Tue, 02 Nov 2021 13:20:58 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:20:58 -0700 (PDT) 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 v2 12/16] ArmPkg: Move the StandaloneMmCpu driver to ArmPkg Date: Tue, 2 Nov 2021 13:17:44 -0700 Message-Id: <20211102201748.1963-13-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884460; bh=+zTxMsMXLlc3YRd3lEgbFd1vC5pjzQRXc/7s391j02w=; h=Cc:Date:From:Reply-To:Subject:To; b=ZVTN73KdqjVPyrkkHWMYsBaO+cYSXndZT2eA79UT90WVknNu+QfNA8RmQLQ75pp1Glb zx1l9i+1euI/K50iG+41KYX+ge2Yw4wEwjRWBcpxNjmlSy94EZxVqpYY/5YQJldk5Nuus tNij5gw8pii2fJIKvZ4JXyc062v2u5b2N7A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884461331100015 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 {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/StandaloneMmCpu.h = | 0 {StandaloneMmPkg =3D> ArmPkg}/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf = | 0 4 files changed, 0 insertions(+), 0 deletions(-) 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/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 --=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 (#83171): https://edk2.groups.io/g/devel/message/83171 Mute This Topic: https://groups.io/mt/86776054/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 Mon Apr 29 06:27:56 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+83172+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+83172+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884514; cv=none; d=zohomail.com; s=zohoarc; b=bCTVss+fUPddjKfDhtpqXkandyANmWRlV7shhEqB+KBUArJ2RPUwn3L0pe6aVLXNQEaxxIqfHlk0+qdPVxKleJHzaXf6VTsChFZtleF1AGM/Yxlofjesta6Dc1m05ampxu9PXqbj7W8DISZ4P8H6B6r/Fgs/byt45+NJm8SkVhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884514; 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=Fg4kKXd+9MVzyTrbhEMZ34nB/20TPQWF8/jVN9RWTH4=; b=WD0taJfyU5vdcN8GwOO4wzJ/q7Kl4uXt9DX1HAbkrptbMJ1WyJdrJg3RWSleArdMGjTt28+fiQOzBN+M+4eVj5ZCDC6z3hmiZclMSq8bNeyKJ1f+iX+tg0ncNTD/or4X+DblYOGGDX5rQNJh2H0E/Aha8FNgv60MWrKYfzSSFno= 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+83172+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884514104283.3074979486645; Tue, 2 Nov 2021 13:21:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id M97GYY1788612xurdqZHz8Ye; Tue, 02 Nov 2021 13:21:53 -0700 X-Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web08.919.1635884513254379289 for ; Tue, 02 Nov 2021 13:21:53 -0700 X-Received: by mail-pf1-f178.google.com with SMTP id y20so117094pfi.4 for ; Tue, 02 Nov 2021 13:21:53 -0700 (PDT) X-Gm-Message-State: ljOSNbUTqlV3EwjRRIXCUHb5x1787277AA= X-Google-Smtp-Source: ABdhPJycDmVqhfjRFw3wkxZ/xsmule5ebbBgPg80NvfU4Hn8amc6jW+Htkqi73d2HPuyTjFAT9xZ5w== X-Received: by 2002:a05:6a00:b4c:b0:481:2a:f374 with SMTP id p12-20020a056a000b4c00b00481002af374mr19207327pfo.60.1635884512491; Tue, 02 Nov 2021 13:21:52 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.21.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:52 -0700 (PDT) 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 v2 13/16] ArmPkg: Move the StandaloneMmCoreEntryPoint lib to ArmPkg Date: Tue, 2 Nov 2021 13:17:45 -0700 Message-Id: <20211102201748.1963-14-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884513; bh=xGqUuM3qRS7Ny+di4pM6geuCt7MbSw40qNDQ9CzI86Q=; h=Cc:Date:From:Reply-To:Subject:To; b=IL3dX9L4hutCih/N5Ta+pFV277Fp4DJm5e0HncoROoUJO6b9HlkJd8yw552NT8bFq8i gD2EBS+rTqcfKk3hlHV/VtnKM89wRdOh3Kx/YFzl/FIAIUz8wzIBHO3fEwEbYypbEFhKc u8Bd2vGtZJB7FjzmdTFLFIAdF4T/6yHMDiI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884516424100001 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 {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/X64/Stand= aloneMmCoreEntryPoint.c | 0 ArmPkg/ArmPkg.ci.yaml = | 3 ++- ArmPkg/ArmPkg.dsc = | 3 +++ {StandaloneMmPkg =3D> ArmPkg}/Library/StandaloneMmCoreEntryPoint/Standalon= eMmCoreEntryPoint.inf | 0 7 files changed, 5 insertions(+), 1 deletion(-) 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/StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/X64/Standal= oneMmCoreEntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/Stand= aloneMmCoreEntryPoint.c similarity index 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/X64/Standalo= neMmCoreEntryPoint.c rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/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 cbc67daa7696..4741a93f609a 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -159,6 +159,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 100% rename from StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMm= CoreEntryPoint.inf rename to ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPo= int.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 (#83172): https://edk2.groups.io/g/devel/message/83172 Mute This Topic: https://groups.io/mt/86776063/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 Mon Apr 29 06:27:56 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+83173+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+83173+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884515; cv=none; d=zohomail.com; s=zohoarc; b=mF7m/uugnFajVWuGKY1lEQfyIRJ3rV/9MEexmQBslj3SvGG4giuilpDtpkVrKll//AiBHXEdajmUCXeUcnHrJgouTOGcxm1siD8lokmMy8nMHYSdMO7kaeQzIf1/Om9YkhwBgsm49Bbnaat9Ny9QWbGLTFjhyKktqM7NgLkb59s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884515; 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=k0JAMcT2S5NpUsoxdK//s+VnjoB1KTBC9OAVwBdBqqA=; b=KTART5+ewxZ+E1m8dEfu/5FmysduqysJO1xWoF1xoGjMhdVwfdeuCEdN1CMi0B7HCIRlnGv3yUEZ+YJvg/FNjKx7XDrmHRXZBbOoX73/Kyv74YDm+3BvDbgAVy2eOyDdrnXdflwL4ou4WmTUu4eDY01xyk1rDPcPskYusiG7f+0= 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+83173+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884515292101.8392276794566; Tue, 2 Nov 2021 13:21:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HYm4YY1788612x15sH5cfgqL; Tue, 02 Nov 2021 13:21:55 -0700 X-Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web08.921.1635884514413261824 for ; Tue, 02 Nov 2021 13:21:54 -0700 X-Received: by mail-pf1-f174.google.com with SMTP id u33so99361pfg.8 for ; Tue, 02 Nov 2021 13:21:54 -0700 (PDT) X-Gm-Message-State: S0Jut11YROTpX1tsS6p7k6uux1787277AA= X-Google-Smtp-Source: ABdhPJy8HmBCb+TtTFmyqFpM3M7ElbKOAhNYkO/wfytMXRbI0YitAH4jmXBkMRRdt2Ds2KbGfzh/Kw== X-Received: by 2002:a62:31c5:0:b0:447:b30c:9a79 with SMTP id x188-20020a6231c5000000b00447b30c9a79mr39598960pfx.67.1635884513741; Tue, 02 Nov 2021 13:21:53 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:53 -0700 (PDT) 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 v2 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only Date: Tue, 2 Nov 2021 13:17:46 -0700 Message-Id: <20211102201748.1963-15-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884515; bh=CUofROvxZUpepquUA+is7as2dGCx/46nWQFXE08O6SY=; h=Cc:Date:From:Reply-To:Subject:To; b=Njm9ZcUVVw7+G1zhILqNv7VtQC6NgMFlNbUH8jctpk8yPD+g0S7KYvVVZWbWqLTwiNb dBNHjldohmvzh6V6zSwQe8ZpqhfOwRgeRkAGiunZGRgwAtYP0M/7JzPdp7hBzqLDZ8cVY QwvE/WDUFYMXpg43WQiPp6NuT8sP8WVE88Y= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884516428100003 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew Drop X64 references. Update GUID. 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 --- ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPoint.c= | 71 -------------------- ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf = | 6 +- 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCore= EntryPoint.c b/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCo= reEntryPoint.c deleted file mode 100644 index dffa965b8425..000000000000 --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/X64/StandaloneMmCoreEntryPo= int.c +++ /dev/null @@ -1,71 +0,0 @@ -/** @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 -#include -#include - -// -// Cache copy of HobList pointer. -// -VOID *gHobList =3D NULL; - -/** - 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 - ) -{ - // - // Cache a pointer to the HobList - // - gHobList =3D HobStart; - - // - // Call the Standalone MM Core entry point - // - ProcessModuleEntryPointList (HobStart); - - // - // TODO: Set page table here?? AARCH64 has this step for some reason - // -} - - -/** - 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/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntr= yPoint.inf b/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntr= yPoint.inf index a0629cbc1a6f..c6b283653882 100644 --- a/ArmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.= 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 --=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 (#83173): https://edk2.groups.io/g/devel/message/83173 Mute This Topic: https://groups.io/mt/86776065/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 Mon Apr 29 06:27:56 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+83174+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+83174+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884517; cv=none; d=zohomail.com; s=zohoarc; b=dEwj8gJbn6U4rKhJl7biR29HAaLtEpTIJ0IKSxvUMGUsbjjI3e3RwXuPLKNpho0cUgD5+9HBYz+92kz7Z4wWkqJvIGss6SBQuy3Uz8nq5/5edGGAFWfV0xVIiWAVUUE4Qew1nrxGYbG2y/GPXwR0/5fYCLxmMed0iQuZKLe+CY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884517; 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=0e/rbBj6I5aS77o50pLR+OexD31LEAC633aKHpt1QH0=; b=CPULsqnYPmiUw5EpDjX7uXVKbfS87dlpXq4KLoPZujdymsayvSbEXBPlHWTfcXQqPmnOSOwkidew34mVYCTzJZ3IwIinem549JBbxkF3Q+OPOXmDkYSAPIdKmpw1x7RCkcd4gWFfYN6g3W+4MrMcNQTIAlS6i+OI4v9IqSxaLDs= 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+83174+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884517147124.10287692632232; Tue, 2 Nov 2021 13:21:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id bSfWYY1788612xYRTfm1QZAf; Tue, 02 Nov 2021 13:21:56 -0700 X-Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web12.889.1635884515538107605 for ; Tue, 02 Nov 2021 13:21:55 -0700 X-Received: by mail-pl1-f177.google.com with SMTP id b13so660449plg.2 for ; Tue, 02 Nov 2021 13:21:55 -0700 (PDT) X-Gm-Message-State: kkGVXhFJThgYtGFvvtRNFZ8Fx1787277AA= X-Google-Smtp-Source: ABdhPJzvUu2tXD1gibdeuE6aGugRO78MIXFdmexBk7dgoxqq0IJljsZLSOllDHilm1199sIcBtpWSA== X-Received: by 2002:a17:90a:bb0d:: with SMTP id u13mr9301207pjr.158.1635884514816; Tue, 02 Nov 2021 13:21:54 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.21.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:54 -0700 (PDT) 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 v2 15/16] ArmPkg/ArmPkg.dsc: Resolve build errors resulting from package moves Date: Tue, 2 Nov 2021 13:17:47 -0700 Message-Id: <20211102201748.1963-16-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884516; bh=B2tvve63dd1J/91hBYuR+ZTSTEDhCR+xi+5yrVF3vLI=; h=Cc:Date:From:Reply-To:Subject:To; b=Z39JSH7jH1gAypQVgs+o/eznN37eQqKoB9h48MSQ6ppHGI7DSBw3kulEzjuS/L2zT20 Nq125FOheKIR1h6O4qco+KHZUB0OxUQeBdgv0AkLMyIRqprotc/eDKCQsBUL0HIs375wP mY43XwIh1g8MXhE1+y930yxPH8G+T1qNYuo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884518526100009 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew --- ArmPkg/ArmPkg.dsc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index 4741a93f609a..add19f7db163 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,12 @@ [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 + MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocation= Lib/StandaloneMmMemoryAllocationLib.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 --=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 (#83174): https://edk2.groups.io/g/devel/message/83174 Mute This Topic: https://groups.io/mt/86776068/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 Mon Apr 29 06:27:56 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+83175+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+83175+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635884517; cv=none; d=zohomail.com; s=zohoarc; b=ct+Fq4ZU883PDzj8AO+8qNlN63jHTsqTT36RTLWi3N38h1htMepQm9eCNPRgr1cW3OHS42pg7iYCQ7jOaZs8Q914ir2ZDyL81W+xOHo5J7uNGpqhA26nruIZWskV3BICs2CXbx6hr/bZuCuxdi/B4jsFVE/Nf75db/girwDC4tA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635884517; 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=VLrhcnbhNz7LlPoW78ZgpdTN3YoapWYK6sCQHAvfPVs=; b=nToJFygxJCUrCUQqls/mSXVX0CxIU5CRuwDGEyL7G7mUF8Of2eIFQ0CKqZf9bptIZpAFY1LNqTakh/bPOgm2AwkBEFhgkoB5fRXV0X3asdkpARfghAdWoye/L6Mul6Mc1L2uQUIoDudnxCg0rwcWbXLq9PFpQKJ3lr0zY9rdsPQ= 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+83175+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635884517559404.42374561693657; Tue, 2 Nov 2021 13:21:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 8vncYY1788612xIdgGYgM9az; Tue, 02 Nov 2021 13:21:57 -0700 X-Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web08.922.1635884516567014366 for ; Tue, 02 Nov 2021 13:21:56 -0700 X-Received: by mail-pf1-f169.google.com with SMTP id x66so78177pfx.13 for ; Tue, 02 Nov 2021 13:21:56 -0700 (PDT) X-Gm-Message-State: IssNjho0uMqAHn61efzKEJyux1787277AA= X-Google-Smtp-Source: ABdhPJxmb1YAntR5TUgh9z21stXLo/KFkjBi+eLDn3sBvYqsqaLwZQWm4vTQFPb2bpNFZWIrlNwHeA== X-Received: by 2002:a05:6a00:a94:b0:44c:ecb2:6018 with SMTP id b20-20020a056a000a9400b0044cecb26018mr39187146pfl.57.1635884515894; Tue, 02 Nov 2021 13:21:55 -0700 (PDT) X-Received: from localhost.localdomain (174-21-94-94.tukw.qwest.net. [174.21.94.94]) by smtp.gmail.com with ESMTPSA id t24sm17652pfg.118.2021.11.02.13.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 13:21:55 -0700 (PDT) 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 v2 16/16] ArmPlatformPkg: Resolve build errors resulting from package moves Date: Tue, 2 Nov 2021 13:17:48 -0700 Message-Id: <20211102201748.1963-17-brbarkel@microsoft.com> In-Reply-To: <20211102201748.1963-1-brbarkel@microsoft.com> References: <20211102201748.1963-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=1635884517; bh=87pAL3gfHbkQapdBb+BOdS7pmvdr0WEEYRQtMIJSWrM=; h=Cc:Date:From:Reply-To:Subject:To; b=b/hPis/0iXBZ5Mn0thHZRQyGLSyBGWNKAuQMwDviDMUh6M6NS+wyAFu9YcN8sfyeezA WvZoj9qwO4O7UvCcteTnbb0XPEQ1lEWpe/r1RVHiYdwGwPj0GZo9xv2sMnJNXeqru4vsY xpdoUozX4DQMQbkKXjACbc88ZS2Tlc3nFwo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635884518563100011 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3652 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew --- ArmPlatformPkg/ArmPlatformPkg.dsc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatform= Pkg.dsc index 661a4cea220d..3ed0bae87c41 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dsc +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc @@ -79,6 +79,8 @@ [LibraryClasses.common] NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 + ArmSvcLib|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf + [LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf @@ -92,7 +94,7 @@ [LibraryClasses.common.SEC] MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMe= moryAllocationLib.inf PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/Pre= PiHobListPointerLib.inf =20 -[LibraryClasses.AARCH64.MM_STANDALONE] +[LibraryClasses.common.MM_STANDALONE] HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocation= Lib/StandaloneMmMemoryAllocationLib.inf MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Standalon= eMmServicesTableLib.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 (#83175): https://edk2.groups.io/g/devel/message/83175 Mute This Topic: https://groups.io/mt/86776069/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-