From nobody Sat May 4 18:51:49 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+83031+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+83031+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796649; cv=none; d=zohomail.com; s=zohoarc; b=cYIDxdXcJ4KYOTc/7BjMOGlnpNliVmYSQq1Q3TntEkb32KV40P8pcvmh1CSsJdC5Cwv/1t2vhRbQfu6DtXFxlrdDVLTQLVMcnqEiEOAKUDsDWEMqWoZpedr14o2ViSMBPT91PrUqYTh9X4zaUOQ0/yDs/09G/q+FOyy8Of0YmrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796649; 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=PeXFouKVF4XZhPenUKYUjYmX5OWwUA89Ln/nMRGsaG8=; b=kl5awP5bmCqahhoInjA/JljPd0jn4XQw1wswvALCDidOaxbl22V/n1Ek2WnXH+zm3HeR1GZMPF1G0th0AWtyOUt/qhez/Rmm1gLiw6qheQAelFdLf1gxLf/YlQaOylS89c5nBBoSN5DgKscQla3Bws9fNP45mt/HaeOlIGYd7xI= 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+83031+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796649036645.4870906869834; Mon, 1 Nov 2021 12:57:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 12RNYY1788612xugarnEN1zF; Mon, 01 Nov 2021 12:57:28 -0700 X-Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.1536.1635796648072866623 for ; Mon, 01 Nov 2021 12:57:28 -0700 X-Received: by mail-pl1-f178.google.com with SMTP id k4so2565601plx.8 for ; Mon, 01 Nov 2021 12:57:28 -0700 (PDT) X-Gm-Message-State: xnttd9LCsUe6cSHANCuKfqy3x1787277AA= X-Google-Smtp-Source: ABdhPJwSjMZ8be8KDYARFn27l28FDj/b5bYiWRc3BK+GYLpRdEvdHaNNV6l0cUOBIFkbucA3WIZnPw== X-Received: by 2002:a17:90b:1c02:: with SMTP id oc2mr1144743pjb.65.1635796647435; Mon, 01 Nov 2021 12:57:27 -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 t2sm13759796pgf.35.2021.11.01.12.57.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:27 -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 v1 01/16] ArmPkg/ArmMmuBaseLib: Disallow STANDALONE_MM Date: Mon, 1 Nov 2021 12:56:33 -0700 Message-Id: <20211101195648.6420-2-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796648; bh=xjg/ZoclTfV8qks1qFl8pn+wvx54M1oheX0FY3nP0Ik=; h=Cc:Date:From:Reply-To:Subject:To; b=omWG2ZpZDPLduy4nI80Y5rjMkx73Sce/k+kS1Uq1BjsL9aLwFDgbpCXMqCLGqviaRqr E3/1yIEO7V8XTMm5n4/yJ4fgAU12Y609VrUyAgtvTkNzMCGjIaGT4IkPqXZopS+Qq/BIs ll+vNcoDV4BHRx2oUk5mJxE6susJn5TDptI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796649548100002 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 (#83031): https://edk2.groups.io/g/devel/message/83031 Mute This Topic: https://groups.io/mt/86750623/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83032+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+83032+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796654; cv=none; d=zohomail.com; s=zohoarc; b=jlOGJP/CUAv3HIrIzC9rIMn/krPllVRRoILEyxTt85M1p5DiAvCWTVeEaF+8YJzgBUCz1j7fAVWNJLslQKuRuJuq15/X7kV1XssXZ50w0Ad07jZzxf7huiF/1WSGR4GKgMvwUmhJRuWFNseXiH4e6nQSiH48rVJ62vLnpfPe634= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796654; 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=uqPdyd81I9Frd7UmB0W0c0XXP93Dh8PoVrcjCOx0vCQ=; b=d++lYchfa86sfuNpmMm7hcm3KKMBvVjAj5zy5iKMASYuTOaFLDu6aHCOvs8PyqkVUMEWnR1VAX0da6Zlwyi2BEe3tW/igSeEaipE3H/eBh++9TBoQYAxHQTkGRIERJIuq7A4+woRFtVq/xDW7DQJkGcXIHi2ujoR8TSBHExEE1U= 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+83032+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796654943553.6451913069827; Mon, 1 Nov 2021 12:57:34 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZkSUYY1788612xyUta19ODER; Mon, 01 Nov 2021 12:57:34 -0700 X-Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web08.1599.1635796653773273946 for ; Mon, 01 Nov 2021 12:57:34 -0700 X-Received: by mail-pg1-f173.google.com with SMTP id r28so18205673pga.0 for ; Mon, 01 Nov 2021 12:57:33 -0700 (PDT) X-Gm-Message-State: UAtOI94VLx5QA2c98pF5JOXtx1787277AA= X-Google-Smtp-Source: ABdhPJxUvKSDjikommywUXfeW35GydNJmIaBIzh9APKQxsRfbzD9h4EaMCxWsH9wXOQgZELhQ7PoNQ== X-Received: by 2002:a62:e719:0:b0:480:a0ab:c6bc with SMTP id s25-20020a62e719000000b00480a0abc6bcmr15826189pfh.79.1635796653108; Mon, 01 Nov 2021 12:57: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 t2sm13759796pgf.35.2021.11.01.12.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:32 -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 v1 02/16] ArmPkg/ArmMmuStandaloneMmLib: Update to match ArmMmuLib Date: Mon, 1 Nov 2021 12:56:34 -0700 Message-Id: <20211101195648.6420-3-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796654; bh=lgg+ygoiW0/nhCt3buD51jxZgVqDR3d5A48oGXj7yLY=; h=Cc:Date:From:Reply-To:Subject:To; b=BjbmcXWtwt67sehc6iKaTOETm8R/BFHSeaeNcTMo1HALbjW7f3KYkcXGuRD0/+6yh9N 9FMSHHKptIUSyZKjfdw0+H0TGrWnEkS9qzr7BTLYolmYcq2xtZALwbLTqhM5oV9ZaWwrm bWhPBpC+3HiNTts/LnYnG0jlg2SD2CKRZ9M= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796656210100002 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3647 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Sean Brogan Signed-off-by: Bret Barkelew --- 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 (#83032): https://edk2.groups.io/g/devel/message/83032 Mute This Topic: https://groups.io/mt/86750626/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83033+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+83033+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796658; cv=none; d=zohomail.com; s=zohoarc; b=FHiZqYXFWreIjN2Rql8iLSddc+XmbqYSmnHxWUWPB154JxnVHQS5rnkgKtEMJaolffqxsntxN9waN0s4+hPXpfbcEkRND0J/Yxr8KEiM2emqQgzCaJLtZ2cCyL3SsweDDTKP+zQT1CEJYgN+T7IdNEYxrnTYpSLtsEr1qjGYGdI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796658; 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=2OsjZ5211ipKGsAYkCsBmpFZy5+n5i3avMHuKkqziDc=; b=j5je5QjKdzn1E9sxfm3qr+eGeLRu4OeriTqd0Q5yWgFa5WfZI4ba3/tVWvPu8z8J2321sWz64JL8yGla5DE0eyF+t4dlqX8Jrhj4eKBLwolakQRzV6UgiQZD4SC7y0yHrBX8SCIRsy5+rJlKcZfUS/HCy+jbhRVGiZfpqTbqr74= 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+83033+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796658851404.17507704761226; Mon, 1 Nov 2021 12:57:38 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aKKAYY1788612xJGiWm7UByt; Mon, 01 Nov 2021 12:57:38 -0700 X-Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web12.1575.1635796657693938052 for ; Mon, 01 Nov 2021 12:57:37 -0700 X-Received: by mail-pf1-f175.google.com with SMTP id 127so17417311pfu.1 for ; Mon, 01 Nov 2021 12:57:37 -0700 (PDT) X-Gm-Message-State: 4CUvK6abit10tEiFZQiQx61Qx1787277AA= X-Google-Smtp-Source: ABdhPJw9meNBRc9qPNOql1plIRPIJo5HuqnhthLM9/RTd5lodsvDlUVnjZyqjomgHbtdzfOUkc84Sg== X-Received: by 2002:a05:6a00:10d1:b0:47b:aa9b:1e7a with SMTP id d17-20020a056a0010d100b0047baa9b1e7amr30681125pfu.57.1635796657000; Mon, 01 Nov 2021 12:57:37 -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 t2sm13759796pgf.35.2021.11.01.12.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:36 -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 v1 03/16] ArmPkg/StandaloneMmCoreEntryPoint: Swap to ArmMmuLib Date: Mon, 1 Nov 2021 12:56:35 -0700 Message-Id: <20211101195648.6420-4-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796658; bh=FteFV1Z7QeLo4hgIOc6LJixNPyPbOytpKAeddYCJZmQ=; h=Cc:Date:From:Reply-To:Subject:To; b=vMUJWA/i2VlEcub0Qkb4bee18WaGm67KehKFamaq4J9TlZV19OyQGFMLY6YLVm+4P7S UQpbEYag0und5kYnqN0ODq1Rm2ngNKQ/0OX6F7ghyLzkgAccYwGud3A/jsMxQjczewNxD gTlXPTaDjtWJo6EkX4WhondAxaAubtBswbc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796660764100001 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew StandaloneMmMmuLib has been turned into an implementation of the ArmMmuLib class. 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 (#83033): https://edk2.groups.io/g/devel/message/83033 Mute This Topic: https://groups.io/mt/86750627/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83034+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+83034+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796662; cv=none; d=zohomail.com; s=zohoarc; b=TgcRd97kFH9lbrOP+pJGkOcm/oI0xGwErUcrZTwd2x8OSlxfu+CLZ81cIUNYP5ZSpGt3c5iu374Q/7Yn0Eikc3h5WSRA6UDITvR//e5CRb+qcCJe05MlpdQ+N/kfzw883R1uEN6E2M0F8yqHY63THwDwN+pIc9ws1arI6SqTlHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796662; 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=AtJWZQq59uiY7yHTIKrXhIEwYDsJyvWUInKB7iy/r9g=; b=WUkcR4JYXT7rkfZzzerhNLBMoKdFmtNmr2YKD9DTC8DWQXBLZ/e+Ygph6XG39oURvwYsW64/fsACBWlbLtv0j+7wvF6v6Em1fxj9c1MvAQGrVUWs7n7um+oE+4OjngB5G1hkzdlSqtqVrHWfEGrR1aIDybsjf0+CxRXr26Z5kZQ= 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+83034+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796662185736.7793324099241; Mon, 1 Nov 2021 12:57:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Le6fYY1788612x99CF13JEmk; Mon, 01 Nov 2021 12:57:41 -0700 X-Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.1631.1635796660606448192 for ; Mon, 01 Nov 2021 12:57:40 -0700 X-Received: by mail-pg1-f174.google.com with SMTP id f5so18096425pgc.12 for ; Mon, 01 Nov 2021 12:57:40 -0700 (PDT) X-Gm-Message-State: S1VpOrpvr39QjBb4cWFmk0OXx1787277AA= X-Google-Smtp-Source: ABdhPJzcbD8MM8UfzG4END0/XZXVpW9wOizgoiV5y+vk81Xk41E9w71JL9/bxskQM2tDscoa56Mrvw== X-Received: by 2002:a63:6bc2:: with SMTP id g185mr23429238pgc.356.1635796659812; Mon, 01 Nov 2021 12:57:39 -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 t2sm13759796pgf.35.2021.11.01.12.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:39 -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 v1 04/16] ArmPkg: Disavow StandaloneMmMmuLib. It's just ArmMmuLib Date: Mon, 1 Nov 2021 12:56:36 -0700 Message-Id: <20211101195648.6420-5-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796661; bh=uTvsM0yoxkgxxSN8ThbfPfqc9orofagDSdKyeNLFhIQ=; h=Cc:Date:From:Reply-To:Subject:To; b=kkHH2EcIZO9MBQ7yAxCOtzZnpCgPqMeslobWdy1qcVC9Zf+B6slrq3q5Swoq/Mv2/Qx P4dlV/hceF1o6+OzJTaOsPMSVEcq5/U22K7nVbLviLgWBAZvjeHhr12fbo14w1ERhdK8n zHg1V1aijtzhDrepaB5hg9rpJwPW49Dbx40= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796663203100003 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 (#83034): https://edk2.groups.io/g/devel/message/83034 Mute This Topic: https://groups.io/mt/86750629/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83035+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+83035+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796664; cv=none; d=zohomail.com; s=zohoarc; b=lcZO47gQsh1+NBEIbFtV51JLcLxto/4IBnRC4CKnK5h6XuawIOQ309A7cwHHkS87Xo5WaYx0LAJryuO6N9vTr8kA6wB/QeKOpHqhD4VOQ1PS7c5cJ8A/t0+kDZX/01n/SNY+8xrdLshw5cZatzWeeSBhwHoDC48RYK0k+cXWrWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796664; 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=zVhaidxEnbZiYrYf3PcOhdsM6FDjk0dpENudE7yNug0=; b=GvcfJZn/pbfW0Kg7lw0oMRZlcB9v3W3lwjsH4HeKSGYPaHjGGi6UE6ueFM8UqIHoUQ00kfASS97W6sx/fKZ2tcFcfeYnplYzTK08THdsNqcjfLJh2G5d1UWpNxKkRJ0xWMnVAwtcxE7x+auSKEbubAULZ6GjVLKplKmDNLk4sDg= 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+83035+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796664013966.8758288435478; Mon, 1 Nov 2021 12:57:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HIzcYY1788612xOOCon1HlpP; Mon, 01 Nov 2021 12:57:43 -0700 X-Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web11.1634.1635796662916138555 for ; Mon, 01 Nov 2021 12:57:43 -0700 X-Received: by mail-pg1-f182.google.com with SMTP id f5so18096512pgc.12 for ; Mon, 01 Nov 2021 12:57:42 -0700 (PDT) X-Gm-Message-State: JtybBTH73dYK2V93vktI59gqx1787277AA= X-Google-Smtp-Source: ABdhPJxiYD8J2f/KXzPJ7UVJWFIruP5p26HMw2L9o8Gti1Fsfts/WENv6KLRfOs5MRWAhG11vww4fw== X-Received: by 2002:a63:e114:: with SMTP id z20mr13848014pgh.327.1635796662144; Mon, 01 Nov 2021 12:57:42 -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 t2sm13759796pgf.35.2021.11.01.12.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:41 -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 v1 05/16] ArmPkg and MdePkg: Move the Arm CompilerIntrinsicsLib to MdePkg Date: Mon, 1 Nov 2021 12:56:37 -0700 Message-Id: <20211101195648.6420-6-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796663; bh=pBEwSHvhohHlrAAGkx+YULFItS3kDNnascPhGKrWDgE=; h=Cc:Date:From:Reply-To:Subject:To; b=IlwiLOvQwq4RE1KQ4/rlxbxjDy4iQQCnra5A5KNGjqkW/ht/RY1bZ579k/FD4bymTvr 9iLodXLo5CE0GOSk3THIpJdEGY+NlWTcxxSqKO1FxbLu2U1eDoIX7EfxwqSKG/QyK/K+d Jmdj3grpnO7J44jBosKXT7jaCDgAJGQmmtU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796665450100008 Content-Type: text/plain; charset="utf-8" From: Bret Barkelew This aligns better with Mu's philosophy around dependency structuring and is one of the steps to enable Basecore to have zero CI dependencies on other Mu repos. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3649 Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Michael D Kinney Cc: Liming Gao Cc: Zhiguang Liu Cc: Sami Mujawar Cc: Jiewen Yao Cc: Supreeth Venkatesh Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Ray Ni Cc: Zhichao Gao Cc: Sean Brogan Signed-off-by: Bret Barkelew --- {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 (#83035): https://edk2.groups.io/g/devel/message/83035 Mute This Topic: https://groups.io/mt/86750631/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83036+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+83036+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796665; cv=none; d=zohomail.com; s=zohoarc; b=Akf9BtsR+X6VQqv29oa6GLmkUoalubkRRnbeNpCjsp4y0XEEdhKPe8XpiFPdSx5MMxKfqzRmukVV3FwcYDmj+yHAQZzRGu6HpgSj+mWKB+P/ATECSjdc+jxGfE8jzzfTEIHbvG+/OSXv6PUlgwSWzg1uMBo8QmmQOKpwqAeTjLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796665; 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=8gf6y4Ibd0oWrT0Ctl5VGyCTnFmX8tvLEM2z0U8afvE=; b=ct6Jhc7dJXwVGNsvXgRzP6VDP5nA9m44a9J7Rqk8LUJ9Cl2Hu88/4lgnQ/6MVfKkm6G9X5+IkacVDnoJvvMiZIkANT+n/t296IvGHxnbLJiKjUGU+Ufj1WLDQMhcqaFpw3w4P7/tsJn+rsLX0xuwXwTZhiZ+rn91w6kesL18jHg= 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+83036+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163579666563996.26557090193592; Mon, 1 Nov 2021 12:57:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id PV4LYY1788612xw9a3ooMxpj; Mon, 01 Nov 2021 12:57:45 -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.web12.1582.1635796664790948786 for ; Mon, 01 Nov 2021 12:57:44 -0700 X-Received: by mail-pf1-f174.google.com with SMTP id s5so5831201pfg.2 for ; Mon, 01 Nov 2021 12:57:44 -0700 (PDT) X-Gm-Message-State: teQkicveZXPMn3to9GgR65F8x1787277AA= X-Google-Smtp-Source: ABdhPJx7XG/UydUUuZ1r1vdNz2zpbMUM6tEQB+Z+gcuxKxUVnrGrywwcqqpYKlT3Dt06P5pWHbIrTw== X-Received: by 2002:a05:6a00:1147:b029:3e0:8c37:938e with SMTP id b7-20020a056a001147b02903e08c37938emr31070666pfm.65.1635796664089; Mon, 01 Nov 2021 12:57: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 t2sm13759796pgf.35.2021.11.01.12.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:57:43 -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 v1 06/16] ArmPkg and BaseTools: Move the GccLto binaries from ArmPkg to BaseTools Date: Mon, 1 Nov 2021 12:56:38 -0700 Message-Id: <20211101195648.6420-7-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796665; bh=iwmXnu4l2HNeDYt8mq9VsoUlpNb1RPH33REk6mSSlW8=; h=Cc:Date:From:Reply-To:Subject:To; b=wIExY56/ENsJ5RrtklGN7TS50RkLoK3oI0iGNce77OV1Mk956iAKYoXpIG8ZedKSl6n V0GaUd8LJMFTtJO31qujwGz0GfzSdaSF1gsNc8Uy+tUQ8XUZvlGyA8btxNTUSM/hOKh1D c9xsbSnJJ6xjLQIIEFHFan+/sQN72+bKKlA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796667573100001 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 (#83036): https://edk2.groups.io/g/devel/message/83036 Mute This Topic: https://groups.io/mt/86750632/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83037+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+83037+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796721; cv=none; d=zohomail.com; s=zohoarc; b=OFoqvJy1KALjFw85mzfZC/QobVI1TT7R1eIJTKAL03ph/WtvLUtFs0PoDsnOj/pxk5VOxMbuuZc+5fbt/NdGyxHyBzpag4L/q1tM84OCLf42bSnkr/rRVbt9wNXMTmpA3uHLyfzgmFH/TCRRtP42EcTE6/I0P4P0x/VnjKW2Vbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796721; 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=XZKIphrSJFBd8jZPmUMdqTiOHyuQng5UpYkMeTgd0Yg=; b=fCeS6NEEK2IDwiKYbCMGgxsrUaKt8zEZmrZ50eaMNIEOIiC5t+idpmJ47h3MF1zs5Gv7SF7h1+0pEDbTjlU8D+Ux80oOPoZPQKmAOzsn4IUIos69je1jnavsTTmdXWnN5Ejbz/7tu+5mIo7dB0Wg6ye+Et2Fvpgjj6dVuldEGMA= 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+83037+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796721632331.2445032077617; Mon, 1 Nov 2021 12:58:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Wwu5YY1788612xCqf83t8XLZ; Mon, 01 Nov 2021 12:58:41 -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.web10.1555.1635796720672876882 for ; Mon, 01 Nov 2021 12:58:40 -0700 X-Received: by mail-pl1-f171.google.com with SMTP id s24so12417145plp.0 for ; Mon, 01 Nov 2021 12:58:40 -0700 (PDT) X-Gm-Message-State: BxUsesDx9zDzcRGqLpnEj8qyx1787277AA= X-Google-Smtp-Source: ABdhPJxw+/LoCjtVCjjm5rACic5MssHE/BSBXqNbrQdLebY/LzgGpUzhZmbw2PTgdn3/cigYBFZ7Xw== X-Received: by 2002:a17:90b:4f84:: with SMTP id qe4mr1170588pjb.7.1635796719812; Mon, 01 Nov 2021 12:58:39 -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 t2sm13759796pgf.35.2021.11.01.12.58.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:39 -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 v1 07/16] ArmPkg and MdePkg: Move the AsmMacroIoLib from ArmPkg to MdePkg Date: Mon, 1 Nov 2021 12:56:39 -0700 Message-Id: <20211101195648.6420-8-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796721; bh=00J9CnHko7+kFY+D8tHP6/Hz2itT900z7IFXb4zn5ww=; h=Cc:Date:From:Reply-To:Subject:To; b=RS3Mb2Yvkworj2t8IeeM8epPQmw0Wjdh5UVLYCIjthw6xMoa/292q/a4Jt3SiDM1qOD /sCpHWS8NAW3EIrjJoVHQBRqGTsyV2jYo4VJbXdAd1UX/LQZYw1hvViam2jBgwZg1CNF6 GyKDOwLltF0GS0FDFCh/3WSCkk0t1r7GI0s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796722347100001 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 --- {ArmPkg =3D> MdePkg}/Include/AsmMacroIoLib.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ArmPkg/Include/AsmMacroIoLib.h b/MdePkg/Include/AsmMacroIoLib.h similarity index 100% rename from ArmPkg/Include/AsmMacroIoLib.h rename to MdePkg/Include/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 (#83037): https://edk2.groups.io/g/devel/message/83037 Mute This Topic: https://groups.io/mt/86750652/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83038+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+83038+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796722; cv=none; d=zohomail.com; s=zohoarc; b=bBwPrTLXWx85crxwaWLKa7MMYsE0pObC/z/cXCHsjfv8zziOFEzM/saJcx+YLQr1NepCT+ylR/t1JvaxzIVYbbBJc6uGyTmxwbhgXM+cmXQwhBYobgD9oxK6iT0/1pubCQbT+JrFY+2Qf17W12FHXJAtGkRfvkYZpOv/O+tpbxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796722; 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=SnF+1O9wogaA0lk50Mz+qe0rsuXIGbg2BcpMkTxHEoI=; b=YhcxSoXdyfDeHEJh722erQ+qVavjQQn7sWrvs1h/jOz3IMCYLKnfCVgtGM2DUJrW/Yv6YTsB0KnrY+xc5AijfR066m0qF5FWNGeKraGxYuxmKC8bzNkvOsINUM3mTQoD4zMlgJEq7Yo4f7N1ZYWTgDF57RD/X2/t1hbE8k7w7yw= 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+83038+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796722666262.1511113175443; Mon, 1 Nov 2021 12:58:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id IKMlYY1788612xhyMDLGVeHb; Mon, 01 Nov 2021 12:58:42 -0700 X-Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web12.1596.1635796721822573420 for ; Mon, 01 Nov 2021 12:58:41 -0700 X-Received: by mail-pl1-f172.google.com with SMTP id s24so12417211plp.0 for ; Mon, 01 Nov 2021 12:58:41 -0700 (PDT) X-Gm-Message-State: WMh9dDN1tPDAsJfHIW2vDW6px1787277AA= X-Google-Smtp-Source: ABdhPJzedCaMFAlcfYuYJjDh8MbY/vTL+gXI0afpZikhW/fqO3X4qAWmNjlNotuHYLi2HxcJDu7AGQ== X-Received: by 2002:a17:90a:9906:: with SMTP id b6mr1167574pjp.180.1635796721191; Mon, 01 Nov 2021 12:58:41 -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 t2sm13759796pgf.35.2021.11.01.12.58.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:40 -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 v1 08/16] MdePkg: Create the MMU access lib to abstract memory protection settings Date: Mon, 1 Nov 2021 12:56:40 -0700 Message-Id: <20211101195648.6420-9-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796722; bh=7AECEk5zbF8UkEcUzjZTeMxOC/deITj8jw76bB5q1zM=; h=Cc:Date:From:Reply-To:Subject:To; b=hkR+prP+OPXeW1AZqYMa7tWBAftEZ2PsMNUjAOcaATHUcgBJrID9fG6ZqZ1epbEbX89 Mo2dnRBa816OmT7cNQIcn9h273gwy91/AeHqYcWe/dLZwXAi5nayFb7/m4c/9pRvZ4Rs5 DOX4mq4UxkAEm4wVhMyiSrb9xX0j3rCjIIA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796724323100006 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 (#83038): https://edk2.groups.io/g/devel/message/83038 Mute This Topic: https://groups.io/mt/86750654/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83039+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+83039+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796724; cv=none; d=zohomail.com; s=zohoarc; b=TpwTFF4YmMNgj+gcwHQhdM68KtaEZ3oikWp01otLEkaW/IcNJ6h9s5Pf/MI25j7ggDUnop/vpDFnNd+X8W7UMHSTsNqss+lL936S6mITzNMh0bzQyMMEbuPXg+hKa2grH5/p77b/rcn/3u8X4ERF8Oq0roE+msHPaycXTYdvtsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796724; 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=dpfuS96CKsEOHgpLsMF5tArmxgpV1QWyt7P/T/w2SPE=; b=Of/xA7lDmFkDOgdjrmp0dOtsNawnejYaFxkSefbEGjQ6+cAliBKj1xgzkwEFFurUoed2vLiIAH1cqlZOuIh/CyYe12xDw6KqzV/1jXwilrzR41G9nfRL3WJhM5Fcw+x/2gzf9tWMArzVRXmwZndODhbInjxGrXSKiqaOya3fuKo= 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+83039+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796724216778.0248929466838; Mon, 1 Nov 2021 12:58:44 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 13CLYY1788612xxbKZN37gT0; Mon, 01 Nov 2021 12:58:43 -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.web12.1598.1635796723193529370 for ; Mon, 01 Nov 2021 12:58:43 -0700 X-Received: by mail-pl1-f176.google.com with SMTP id t21so12378007plr.6 for ; Mon, 01 Nov 2021 12:58:43 -0700 (PDT) X-Gm-Message-State: 0HUY7chMcKqCCBNcrUBlmCGdx1787277AA= X-Google-Smtp-Source: ABdhPJzojqkfSTeyJuT3OKwx/TJW07lctWvGCJdOuTI2T0wY4qHmSqBNDNYbioz3CVKqNrEQuiJzow== X-Received: by 2002:a17:90a:7a81:: with SMTP id q1mr1176003pjf.1.1635796722516; Mon, 01 Nov 2021 12:58:42 -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 t2sm13759796pgf.35.2021.11.01.12.58.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:42 -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 v1 09/16] MdeModulePkg: Swap to MmuLib instead of Arm-specific lib Date: Mon, 1 Nov 2021 12:56:41 -0700 Message-Id: <20211101195648.6420-10-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796723; bh=Fiez32Ldpb8p/8eiXBDpFWJv2viTfjYaIUx6QeW9G+o=; h=Cc:Date:From:Reply-To:Subject:To; b=BIRAncsFx1o36oHhXcetjCBk2PBSOmceCIiF29dfkefwg+qJdCZGvKh9XtB7bWaJWyQ 0I1sFTuiHEcaqQJloxhSMQ40FpmasZ5y5qUhIuSOgovg2zEw9ypCgGyww3/sy5K6KwePy +d35+DlJGf33yHv5eIZILDy8cVYXLHiB5M4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796726527100009 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 (#83039): https://edk2.groups.io/g/devel/message/83039 Mute This Topic: https://groups.io/mt/86750656/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83040+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+83040+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796725; cv=none; d=zohomail.com; s=zohoarc; b=eZNxMPcJj2Ckslpi+iSF51UadX9gYadVQod7EoFoHvfEuOFrJMWcFV/FaVduQiUKQLZS3oO2ZjyNZNtOkdNetbN7Vy4Yeq5V0Btw9ItRVowFxyUlL348GzPnHOHJayzYktxrSdVgNqRtSYzmnC8Rd6CAESgcJ+kl+SMvPRWqtGg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796725; 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=z/Vaz1tQEd7lRYWKZggBRm8ntLnwsvXysQkxVa9WO88=; b=mV6GZgQbR+3GbEyuGmvjsOVYZpy7pR8puGFsS0jFG9RkcB5ELLYuZfgnWjeoPYR2EM5s74qjimI5cbSmukiFxbKEV6jTUDhEiepQPyHZKBRp1/Y1c/ES4E/YDFKHs7t+4Q2DKJWmhIj/P7K6XfspCFtIO4iIlAXrFQ9LVAjRXag= 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+83040+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796725266831.5499717742599; Mon, 1 Nov 2021 12:58:45 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XDCoYY1788612xVk4uWbCc0J; Mon, 01 Nov 2021 12:58:44 -0700 X-Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web08.1613.1635796724422025541 for ; Mon, 01 Nov 2021 12:58:44 -0700 X-Received: by mail-pl1-f173.google.com with SMTP id t11so12364929plq.11 for ; Mon, 01 Nov 2021 12:58:44 -0700 (PDT) X-Gm-Message-State: S76w60O6hDHRep4CLYpihidUx1787277AA= X-Google-Smtp-Source: ABdhPJyj9ssBaaG8BcB7qNx0w41t9zhLSZCm+YvuN46dO0e31vuzzvvSGwrQyoL6Vva2n7TRixt+IA== X-Received: by 2002:a17:90b:1c02:: with SMTP id oc2mr1150892pjb.65.1635796723770; Mon, 01 Nov 2021 12:58:43 -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 t2sm13759796pgf.35.2021.11.01.12.58.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:43 -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 v1 10/16] StandaloneMmPkg: Switch to the MmuLib abstraction Date: Mon, 1 Nov 2021 12:56:42 -0700 Message-Id: <20211101195648.6420-11-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796724; bh=Gk3MxpeD7eg5FQF1iVA4vzHh9L4Q2SrGMPDMuUHf2A0=; h=Cc:Date:From:Reply-To:Subject:To; b=bsJ8kYrIRy6Aquq73TSLzr7YiXyzISzK1NVEO26uXTY1PyoI3b1z1Czt6RDe27AHX+A hMDtNrVXlowLZ16ZIZ5IbRuw1n0rzuOIdvefjOxYaiwnr1qbqrsqMxcgbhLHraWGKJ7Kv jVb4UEia61Y7S7mqdleYYyd2N4trywJ8zt0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796726613100011 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 Acked-by: Jiewen Yao --- 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 (#83040): https://edk2.groups.io/g/devel/message/83040 Mute This Topic: https://groups.io/mt/86750657/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83041+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+83041+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796726; cv=none; d=zohomail.com; s=zohoarc; b=Q2ASzTwHkAast4B1zYCLg6qwWqResuu1oJN/pUQ7i4KvzkqOmHL5moEMV/XYne7jIoDDysh9T4AI5IauQDx5ZYF1CgX8gCImUc122J5e0Y+OwOneX2hmKEHSR3e7mXH13HZiaUqPFYQgvDmz7p2XsTaGcIXpjAnqAyCaYZkkWU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796726; 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=Vjd/y7ytCTyAksn80PF1yXVZttx+WIjyOdPPL+YCP8Y=; b=Pv+1TO+TcaHslXCx5rKt+/G2H9NY22lZUlsOonmTRqFZn4MGPJXjNlhgezI14jbunPbhugBBocro7pGuSx7V/3JLR7bbGEN8p5zlne8+SGjF/QJDBMm1ENLV8iGyAU3d8gkcNWVRK8KMAdeD//Sc0lMQoqIdVhB+cM04wyvOs2w= 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+83041+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796726455795.775725622964; Mon, 1 Nov 2021 12:58:46 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id cuo8YY1788612xrmP3OiND3s; Mon, 01 Nov 2021 12:58:46 -0700 X-Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web12.1599.1635796725670660431 for ; Mon, 01 Nov 2021 12:58:45 -0700 X-Received: by mail-pf1-f172.google.com with SMTP id u33so5360645pfg.8 for ; Mon, 01 Nov 2021 12:58:45 -0700 (PDT) X-Gm-Message-State: Bj0azz242HdWhK9rf6rs1Y4mx1787277AA= X-Google-Smtp-Source: ABdhPJxF1/KDD3qLjAeLQyKQHMAxKK3+35vyXB3kC3e4o09WGMEsZHsKcKtNrCK45/zxUVodLdFYOg== X-Received: by 2002:a63:788d:: with SMTP id t135mr23436334pgc.2.1635796724962; Mon, 01 Nov 2021 12:58: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 t2sm13759796pgf.35.2021.11.01.12.58.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:44 -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 v1 11/16] ArmPkg: Add Basic MMU Lib for Arm silicon Date: Mon, 1 Nov 2021 12:56:43 -0700 Message-Id: <20211101195648.6420-12-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796726; bh=62pMluTZvVzOYRiOms1O/x9U6XoafL/adKIt4ugG2xo=; h=Cc:Date:From:Reply-To:Subject:To; b=Te6EKDb0QMYpBBbWFHuNjy3EmW0R9ntqnki6BFEXxY0gjnwk6HHv+htF1inF/OqQ0ud 8Aib3PrQsxZYpcFnsZX65RxF0K5dgJ+IVGtFbV7/n5O6kd9TSwoRrQ5wceD1ztpL+0qe3 nWwmnhtjYpXwY4EIaThX9ehVPQcfs4DGPvM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796726753100016 Content-Type: text/plain; charset="utf-8" From: Sean Brogan 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..7a6ba1f81819 --- /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 (#83041): https://edk2.groups.io/g/devel/message/83041 Mute This Topic: https://groups.io/mt/86750658/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83042+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+83042+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796727; cv=none; d=zohomail.com; s=zohoarc; b=V5hNxr7o/qZspPWpbgKQ0khRm9QjirQ1hJxWr1zFQhACqy1wXtEYvZXhwynu15eev7fljtCw0hqKETj2EHPhX7LhzUcBS9OLc0cgW03VARcEN4zaK7bONIeF4Nd1soEB+jtLxCoIPLwH533AyD37lAjzBwrTHHXOIHFLcqLcEkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796727; 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=GF6j8JCc4JrEFQ5sajDxlwLxLbTokAkrNLVtrr9NISo=; b=Eue43PxnD25Lb/gPi7AbGJKPhynpI0H3cCV7F7VLImeMMQoAavBtrl1fsd0WgQeCL8SIKRXELm1sWs5boBC/ZRWzZNqg/4B2XmVQNHb1910ud8DCKt+nSyN+GVm7wh1BWyAy11LskJxEtftsF/dJ1OlssrI5VoOBjV3vOGvik4c= 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+83042+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16357967276711017.6921163140197; Mon, 1 Nov 2021 12:58:47 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Xvj6YY1788612xVzUV09i0cg; Mon, 01 Nov 2021 12:58:47 -0700 X-Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web08.1615.1635796726836433757 for ; Mon, 01 Nov 2021 12:58:46 -0700 X-Received: by mail-pl1-f169.google.com with SMTP id k4so2570545plx.8 for ; Mon, 01 Nov 2021 12:58:46 -0700 (PDT) X-Gm-Message-State: SqjEugBS4W7Hc7qbxBpqhk4sx1787277AA= X-Google-Smtp-Source: ABdhPJwHm4GENmUiWJdc1V3hiX2pV+aOjeDjvYbFCtVnF3iI9twPLXJho2gNs+i874PmpSO86z6s+g== X-Received: by 2002:a17:902:b616:b0:13f:7983:21b6 with SMTP id b22-20020a170902b61600b0013f798321b6mr27428208pls.42.1635796726201; Mon, 01 Nov 2021 12:58:46 -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 t2sm13759796pgf.35.2021.11.01.12.58.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 12:58:45 -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 v1 12/16] ArmPkg: Move the StandaloneMmCpu driver to ArmPkg Date: Mon, 1 Nov 2021 12:56:44 -0700 Message-Id: <20211101195648.6420-13-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796727; bh=/nHucXA+PKg+MaRkc8C7xpVKm/d9QZ8AvFTFfRtiWOg=; h=Cc:Date:From:Reply-To:Subject:To; b=rl9UOD9LebTXbbPEDczVEJ3rrzVEBAl0+MW+uZ6x8fnJ8ciMBRJy08cpiBwwsDl09tq DuZIF5qd2WY5r55SG42OfO3t9+8PyQivbJkFBiHblq2ngMofY+r73ANyqaO5eAWbZ4yU8 jYqZh0U5xkzGqlC3dpCKHnV2tj6N6N7CO1U= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796728874100024 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 (#83042): https://edk2.groups.io/g/devel/message/83042 Mute This Topic: https://groups.io/mt/86750659/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83043+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+83043+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796811; cv=none; d=zohomail.com; s=zohoarc; b=R5Vh8Tble2ZDpQ6hHk9JG+A46vF78UgMcFZAet3fcA0PPmNpObDdyiAKGK6tg86tEmxw8KbcOJ4OKVKhznx585ju2/LIwyL1ZH8NNtzRPtf9IMSR05V4lAyMFvjWakhvPWiuWfUV4eCzGtEp9dDqY1aq2XPtwXxK0MzLoVEYnhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796811; 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=Rx11ecnhqZW25KwL4D5+JQB0EaAGeqxx9gAfTziTqZw=; b=GRMgZ3lYuLU4Wl7YMUkuHvhril3TudrTPEIxAMh6ivKcx6BvRdG/MBI7o6/0FU+IkOuU5AChIvK4wkDMtWGbm7A9mki6NoB6BTRoiHxEsqSTEw5qbMRxRjosNvgQYFFHMHxcC6b/LfXyeS7LPrYQ7uUiPBoI88xHbMZrCTSw1kY= 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+83043+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796811371263.9594467242406; Mon, 1 Nov 2021 13:00:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZYgTYY1788612xGvx3q4GKSh; Mon, 01 Nov 2021 13:00:11 -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.1657.1635796810437093226 for ; Mon, 01 Nov 2021 13:00:10 -0700 X-Received: by mail-pl1-f176.google.com with SMTP id t11so12371018plq.11 for ; Mon, 01 Nov 2021 13:00:10 -0700 (PDT) X-Gm-Message-State: r0sNjo6cCNV5e1P3OYfmYtqox1787277AA= X-Google-Smtp-Source: ABdhPJzVdiPMKAKYFGTc7kjrVajxHit+whEpb6ZTbDHfEKHwxbfz+FRFarrNmyRIMiBEIRNmZQGOyg== X-Received: by 2002:a17:902:e849:b0:140:200a:a9e9 with SMTP id t9-20020a170902e84900b00140200aa9e9mr26707907plg.77.1635796809728; Mon, 01 Nov 2021 13:00:09 -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 t2sm13759796pgf.35.2021.11.01.13.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 13:00:09 -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 v1 13/16] ArmPkg: Move the StandaloneMmCoreEntryPoint lib to ArmPkg Date: Mon, 1 Nov 2021 12:56:45 -0700 Message-Id: <20211101195648.6420-14-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796811; bh=gbs4V7Kqg1t7grRQTG7IQzPDTcjE3rx7EBY5qrudc+U=; h=Cc:Date:From:Reply-To:Subject:To; b=kgr8QndcIdyMr0kPAqPh9oqy4fwOVTiCTjz8NVQ09edcbA/IGmjY4zXOOw/ytqN9Qfp rMVgFLxILTADb7vi41kiN8lnLi860/4Vj6QTA9GYNUWSKMvuDnlR4b9IP8MCesR8gCPPh tPf9IWmldxiC+6J0sWvia9IHsYbHoopznzs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796812194100001 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 (#83043): https://edk2.groups.io/g/devel/message/83043 Mute This Topic: https://groups.io/mt/86750698/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83044+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+83044+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796812; cv=none; d=zohomail.com; s=zohoarc; b=BgHNc0YYeR0q7DnN48AZs9Qvlc815DpGgzwXktDSTMvWDY6Guu1UU3xP27xXrgvynMZamOqNhD4Ncv3krlzYeJHyBaEWaj5hR/MNdjFxaJ0g6N5sOmKVGe1vonuhWS16I2ynqVoxl3VyG2hr3PmX/Bkz5+7dv8klPkpEs/vjGI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796812; 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=olNwD1NhAQMHcWJY81eE6EMEmCDNHV9eB9vpEQs/05s=; b=c2oFRHV1UM+eP91Oi2S5kD2fw0oQ/qZfHhhL157qFf0dH1Y90hRqkdMeW3JPIfuPxGsfxDiopuVXKcoNTjieKgoKr2ah+aqmOI+9UXwOCqNGMICLa4kJi+itvLAcTewtb3t1EWr6kq8TI93W92GW7ryNUi6W3rUm5Rk0n+Es4BU= 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+83044+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796812922404.2695463907039; Mon, 1 Nov 2021 13:00:12 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id HNZxYY1788612x4aMAk6m0xJ; Mon, 01 Nov 2021 13:00:12 -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.web12.1628.1635796812059256325 for ; Mon, 01 Nov 2021 13:00:12 -0700 X-Received: by mail-pl1-f176.google.com with SMTP id b13so985479plg.2 for ; Mon, 01 Nov 2021 13:00:12 -0700 (PDT) X-Gm-Message-State: o6hxccKGVthhiboFQEQWLaKLx1787277AA= X-Google-Smtp-Source: ABdhPJyxPBE3YwQCQoM72G0d3jy3HX0gIoBi5q4zP7Fzc2DbJ27K5bl0vl5vktSU1LZb91pjJs8ydw== X-Received: by 2002:a17:902:c643:b0:141:cf6b:6999 with SMTP id s3-20020a170902c64300b00141cf6b6999mr13299512pls.80.1635796811395; Mon, 01 Nov 2021 13:00:11 -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 t2sm13759796pgf.35.2021.11.01.13.00.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 13:00:10 -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 v1 14/16] ArmPkg/Library: Convert StandaloneMmCoreEntryPoint to Arm-only Date: Mon, 1 Nov 2021 12:56:46 -0700 Message-Id: <20211101195648.6420-15-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796812; bh=eGoFtW6fK/44NB8AUiOvadrR57wai83cwPYjdqLe2R8=; h=Cc:Date:From:Reply-To:Subject:To; b=ale/C22ukmYiRv6/4V67GsppKRojbcFPQBrk+D4gT48Qsznf5eI7sALK9M8TghiKJNA 3EWyKnu+GG9J/XGSpGWxBhP+GemLEVBFdaxkaL6ACaTIbYV8Gtv3hEwHY+/S8IZQQnmkm UNBay2uOXUL3On9jQXpCC6yx+f2ZIr58SIs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796814536100002 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: 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 (#83044): https://edk2.groups.io/g/devel/message/83044 Mute This Topic: https://groups.io/mt/86750699/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83045+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+83045+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796814; cv=none; d=zohomail.com; s=zohoarc; b=RLpFt9tc/oWnhvgnZ889QYi08ptV/u4/6iPGEaEWwBlMjC3dtA0KWaJA5+xmDmW+12KQDW7WmMuaUndb1eUO4UF1Y8SmKCoPtD7Mh059HWVtXRx6lUT6qaa8bxynm9olpNzCuG6YQuz41d33apl6YRPeAN7hRpu4hdckgWRbimo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796814; 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=ovZqQNAcZcHKXJ5jY3aDtmvawxYmnK42Qw7h2iVvNBA=; b=KWl3tBlGYYvQXWG9JPohCZA4N6Upo/6xwLRDtfBmXLz6Vxfq5YtatPEpnsFJDxg8EDZdSeArS6cSyhPaAdwN7KhYvtDH2/mP+y/qQYvDdE8zjSDdW9ntY+DF0m+jcU9fNVSMDDBhW6m0Am+jBYss9d/s16zxiRuxH5KYUTLdWnk= 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+83045+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796814531872.883326343217; Mon, 1 Nov 2021 13:00:14 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ACuWYY1788612xpMDioUDtuR; Mon, 01 Nov 2021 13:00:13 -0700 X-Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.1675.1635796813366732143 for ; Mon, 01 Nov 2021 13:00:13 -0700 X-Received: by mail-pl1-f172.google.com with SMTP id s24so12423728plp.0 for ; Mon, 01 Nov 2021 13:00:13 -0700 (PDT) X-Gm-Message-State: 9tAOREnt7fkR63iIsO4hMANcx1787277AA= X-Google-Smtp-Source: ABdhPJwGnm0+Z8Hyo74gkhsgssVhijuTJARLOjg9FMW3RR7zHUZrbKQ4iP7uBNj5hnBgjvmFlO0awQ== X-Received: by 2002:a17:902:b209:b0:141:a755:79de with SMTP id t9-20020a170902b20900b00141a75579demr21734823plr.7.1635796812729; Mon, 01 Nov 2021 13:00:12 -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 t2sm13759796pgf.35.2021.11.01.13.00.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 13:00:12 -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 v1 15/16] ArmPkg/ArmPkg.dsc: Resolve build errors resulting from package moves Date: Mon, 1 Nov 2021 12:56:47 -0700 Message-Id: <20211101195648.6420-16-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796813; bh=Ov9z4fyRlNHJ1ZXJqiZN1GBz2nYYwclrR4e9y2FtdSg=; h=Cc:Date:From:Reply-To:Subject:To; b=m4jxiSEEBvNkxoFGiwqQRMol20gwWWYMLFL933CE/yU2Gi4KeZHzRlYnHZ0BzpzGhR4 LgEl4hPbVL9n0UAkcBRsFiKYXHdf4lfSLx/hTeysN1AWLXD6GPl6zZhJHvaBAcbYhbvZa +mRhGc91ZVW0o50HWW/Sy7K40AbQM36zz1o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796815534100006 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 (#83045): https://edk2.groups.io/g/devel/message/83045 Mute This Topic: https://groups.io/mt/86750701/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 18:51:49 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+83046+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+83046+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1635796815; cv=none; d=zohomail.com; s=zohoarc; b=HgQmsjA5mM4L1y72exv45eo4NFzY2bC1b/Pq+x9Olhj5JcsDouNSrEEAv2qgV5rRdiBEZOh5xqq50R09lQbfVYPHAq5cTO/+3/eetO3xDaHRBzNtaoGRZ5ye6l42zj7zmqa2mX7t9NAXXe7xE3hpNRjo6OoW7PHzjgIPJLPPs5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635796815; 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=oEkW/UPsqa/2e6RLJk7XhpnMIoKloi35IFz68I0zFAA=; b=THXF5450G9n0FnbvZKY0PYCDvZyMbvKT+v1ebc0EdlRTSn1iqMZViQ4AmKodVqmlL7+ycc3G9NjUZiYRpLR2AcTEl28culYe3chbYs+4iKZlgXvrKmLGJfn3dVfspyK4zv5zcVyWPdNLwk7mnPGejS5tF8lm838sjfXQGmSBJbI= 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+83046+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635796815359346.6239726699257; Mon, 1 Nov 2021 13:00:15 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lz3QYY1788612xuz5cdjwhxb; Mon, 01 Nov 2021 13:00:15 -0700 X-Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web12.1629.1635796814539294578 for ; Mon, 01 Nov 2021 13:00:14 -0700 X-Received: by mail-pl1-f170.google.com with SMTP id b13so985678plg.2 for ; Mon, 01 Nov 2021 13:00:14 -0700 (PDT) X-Gm-Message-State: iLFU0wLQQIvZxPFBDR1Ol7bux1787277AA= X-Google-Smtp-Source: ABdhPJwnOL4BcOjbeLW0oZgzc1PuFUnaMlGDMas5QOmUO/dSiPgLztu2ptrrhpqAE98uxlQKdpXGWg== X-Received: by 2002:a17:90b:3910:: with SMTP id ob16mr1183711pjb.234.1635796813888; Mon, 01 Nov 2021 13:00:13 -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 t2sm13759796pgf.35.2021.11.01.13.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Nov 2021 13:00:13 -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 v1 16/16] ArmPlatformPkg/ArmPlatformPkg.dsc: Resolve build errors resulting from package moves Date: Mon, 1 Nov 2021 12:56:48 -0700 Message-Id: <20211101195648.6420-17-brbarkel@microsoft.com> In-Reply-To: <20211101195648.6420-1-brbarkel@microsoft.com> References: <20211101195648.6420-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=1635796815; bh=YEv2kUF8VRvkzCAOJ0jKeLWOtBCeWKj7XUTuIpd00H8=; h=Cc:Date:From:Reply-To:Subject:To; b=dxktydrfBlLbrhoTFiZAFxYHtiBa1j7NIOoAozwhG6f1sjYBZnyVkCdtiGEQNZ/hRRp 4vVL9W35we7EYO9BvC3IpCbAkNxR6HdRjLSfo/wVDFfqxepIKJYiKFBYhWUdrBQJsIuEj FkFPx5j+bjlqJeS5TirBQIzn9a5gGf6VACw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635796816370100009 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 (#83046): https://edk2.groups.io/g/devel/message/83046 Mute This Topic: https://groups.io/mt/86750702/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-