From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.92.22.47]) by mx.groups.io with SMTP id smtpd.web12.7712.1614917673741244217 for ; Thu, 04 Mar 2021 20:14:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=gyXppMQm; spf=pass (domain: outlook.com, ip: 40.92.22.47, mailfrom: kun.q@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpCIXVRNgqYLQoPVSxSPgmuGgeRutoe1Q/MgDo8fAtSIpfeBZoeFSnypg7OHjJmksuCNlSu2tHrA/Nq/MpNt7xC2rm40xiiR9L5Vj4+fOXcg3vLIz1IbfwT25j0X1oLq/i9+k19yO3dRKen4ni73yqxui1kUvjHQ1T141+X8d9G/4GXsEVXw28bR+gcTxhW4XG9RTLErEgXwfCeIRV7aPAE3PHZ29Y9o6p2575mpiRSdArKpBt2JGvrb8qOFoVgWnb3C4YpXpMPtAF6snyx5XLXfiUeGkU26UiCjDVWefMQmbrEKAerAvB3IvNStxcw+lYsDUbUmNktNj/JQkvs5aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZGS7GC94e8756j/4Oxt2ykes6dWng6j1PcABub/Cvos=; b=cYrLIYzwjI5lSBTkyidPuLqF6kOZqJ18olYYfJ4JW2u3AwlulvWUErugcrOnz0jXvLDAZO2Bk7UyVfaDdw3dHu1qcVmmLIWXNZZNQjDkbmBZ9I9WJ3/JwwKyRFWJaywRtKJv07BYnT3mJQGpS5PLEJo3FkMIrchlgkim1B8NltiANG0liRgNZsNfwh/ad9AYEWCkueQwATsE/1YyGmRbxZnkuJPQvvgM9GP6tyXLSP3kdKHYjhA5wAK91bXhVa7cLeXYxEWKqPLoWAvmUBPPmvzpnKouE5Zsv0/QQsj1099D5pTEi1T3w63bg3ZygPcQZ3XnIZoi65uislkXwcReaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZGS7GC94e8756j/4Oxt2ykes6dWng6j1PcABub/Cvos=; b=gyXppMQmRK6KR/Pw2Guvv/OuqblsSkayCQBaOoRTHi1DASaEcOEwpgZdMJedTHNEMLER0zcB11qJa0RrScx5K4RN0e+dusWq1sJ7xgLQNup2OiF9oomHJ0SpcZqeOA5af2Y+N81ytbtZm1Gv1o5UkaAVtOMbV5y3qU58b6K9eLIhoe4+AAcBtRHQblkHODUkmt4RQKTiZ6bmrN1ZODiUKTSKF4+0GFWY4P6AdJ+Ok7kTntpWRlUJbxuPiDamvglGcjTTioHGDO2eQMJuBfjykoWBpaRnB9FtxgMBR6BPjGCkz5bCK6Zt1ruzduwjMT8Sr9IP+k4XX4CP2PMsBBrOhg== Received: from DM6NAM12FT067.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::44) by DM6NAM12HT151.eop-nam12.prod.protection.outlook.com (2a01:111:e400:fc64::318) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.9; Fri, 5 Mar 2021 04:14:32 +0000 Received: from MWHPR06MB3102.namprd06.prod.outlook.com (2a01:111:e400:fc64::40) by DM6NAM12FT067.mail.protection.outlook.com (2a01:111:e400:fc64::397) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.9 via Frontend Transport; Fri, 5 Mar 2021 04:14:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:4441A50695001F1A38E07184A6F0E252181DBE079C0C47CB35012BCC769CAC68;UpperCasedChecksum:6B813D04EEA557142C07AEDC4C56FAA596BC2A6C30D7695DB19B150CC1B72C58;SizeAsReceived:7550;Count:47 Received: from MWHPR06MB3102.namprd06.prod.outlook.com ([fe80::d4ee:1260:6f53:3f7b]) by MWHPR06MB3102.namprd06.prod.outlook.com ([fe80::d4ee:1260:6f53:3f7b%7]) with mapi id 15.20.3890.028; Fri, 5 Mar 2021 04:14:32 +0000 From: "Kun Qin" To: devel@edk2.groups.io CC: Jiewen Yao , Jian J Wang , Qi Zhang , Rahul Kumar , Jiewen Yao Subject: [PATCH v6 7/7] SecurityPkg: Tcg2Acpi: Added unblock memory interface for NVS region Date: Thu, 4 Mar 2021 20:14:15 -0800 Message-ID: X-Mailer: git-send-email 2.30.0.windows.1 In-Reply-To: <20210305041415.1733-1-kun.q@outlook.com> References: <20210305041415.1733-1-kun.q@outlook.com> X-TMN: [ziNBYZZ/xZ0MCZlN8jPpcSUJmBa3bTQP] X-ClientProxiedBy: MWHPR04CA0046.namprd04.prod.outlook.com (2603:10b6:300:ee::32) To MWHPR06MB3102.namprd06.prod.outlook.com (2603:10b6:301:3e::35) Return-Path: kun.q@outlook.com X-Microsoft-Original-Message-ID: <20210305041415.1733-5-kun.q@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (50.35.88.161) by MWHPR04CA0046.namprd04.prod.outlook.com (2603:10b6:300:ee::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Fri, 5 Mar 2021 04:14:32 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 393e4b3e-77fc-4963-af90-08d8df8d2d92 X-MS-TrafficTypeDiagnostic: DM6NAM12HT151: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hK135PsVz1aLMLAGoxTihQJWSruzpv/uvmnfdzdAlrX97R2eD+d0I4Bnnusxqow+wLW0f9hE8FLbnXVP0TADQL6XuyYn0hSEuPFJdDTTSHrdPFxLOT+L5bavXZ97YyK2ixlx2G7+sTEGq+KJLjcMuP2kIJxlqrq51+kQLVSHJBsO3ohzKlPROiFCRvtvAjGmCDxljtm58Ye6kpJXi/7WP7p7LuLI5j7UyauVEyx1aBoxcIVgC4mOvxhhtYL2QCd6WqjtOSqIJFuWxWOqA7cV6sRAp+lvy3fxe+OYIRVSUuQFqFwPD7FPAw/Ydd6eZVeXqYHU5lrlj7QNxvt7pNj8WAXxoF0ahiCgiBxfsMCvixLiSnDRzpEahQJPdc0IyDMRqpujLJrx/36yrPztD+pIvg== X-MS-Exchange-AntiSpam-MessageData: DfkcRbk4Zr4Q71Kd84WCyiBbCqvecl8bxRLtZTaplpdXPqEdv/Yap+oP6eo8OgN1nApzN7zy49izCKvAsCk41MbrKbPueX+KIa47x47L13qqoccQ8yGexgcqUTJysZ2s/Pg/SBwrHycBXA46lGAwtA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 393e4b3e-77fc-4963-af90-08d8df8d2d92 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2021 04:14:32.2994 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT067.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM12HT151 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain This changes added usage of MmUnblockMemoryLib to explicitly request allocated NVS region to be accessible from MM environment. It will bring in compatibility with architectures that supports full memory blockage inside MM. Cc: Jiewen Yao Cc: Jian J Wang Cc: Qi Zhang Cc: Rahul Kumar Signed-off-by: Kun Qin Reviewed-by: Jiewen Yao --- Notes: v6: - Previously reviewed, no change. =20 v5: - Previously reviewed, no change. =20 v4: - Previously reviewed, no change. =20 v3: - Added review-by tag. [Jiewen] - Remove Dxe prefix to match interface update. [Jiewen] =20 v2: - Newly added in v2. SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c | 6 ++++++ SecurityPkg/SecurityPkg.dsc | 1 + SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf | 1 + 3 files changed, 8 insertions(+) diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c b/SecurityPkg/Tcg/Tcg2Acpi= /Tcg2Acpi.c index 924c3b4edda6..e8844e474a9b 100644 --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.c @@ -38,6 +38,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include #include +#include =20 // // Physical Presence Interface Version supported by Platform @@ -147,6 +148,11 @@ AssignOpRegion ( ZeroMem ((VOID *)(UINTN)MemoryAddress, Size); OpRegion->RegionOffset =3D (UINT32) (UINTN) MemoryAddress; OpRegion->RegionLen =3D (UINT8) Size; + // Request to unblock this region from MM core + Status =3D MmUnblockMemoryRequest (MemoryAddress, EFI_SIZE_TO_PAGES = (Size)); + if (Status !=3D EFI_UNSUPPORTED && EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + } break; } } diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc index 74ec42966273..a77665518bdd 100644 --- a/SecurityPkg/SecurityPkg.dsc +++ b/SecurityPkg/SecurityPkg.dsc @@ -67,6 +67,7 @@ [LibraryClasses] VariableKeyLib|SecurityPkg/Library/VariableKeyLibNull/VariableKeyLibNull= .inf RpmcLib|SecurityPkg/Library/RpmcLibNull/RpmcLibNull.inf TcgEventLogRecordLib|SecurityPkg/Library/TcgEventLogRecordLib/TcgEventLo= gRecordLib.inf + MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf =20 [LibraryClasses.ARM] # diff --git a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf b/SecurityPkg/Tcg/Tcg2Ac= pi/Tcg2Acpi.inf index 42ddb4bd1f39..f1c6ae5b1cb4 100644 --- a/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf +++ b/SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf @@ -57,6 +57,7 @@ [LibraryClasses] Tpm2CommandLib Tcg2PhysicalPresenceLib PcdLib + MmUnblockMemoryLib =20 [Guids] gEfiTpmDeviceInstanceTpm20DtpmGuid ## PRODUCE= S ## GUID # TPM device identifier --=20 2.30.0.windows.1