From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.92.42.52]) by mx.groups.io with SMTP id smtpd.web10.691.1614884401910180471 for ; Thu, 04 Mar 2021 11:00:02 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=Mk8judDj; spf=pass (domain: outlook.com, ip: 40.92.42.52, mailfrom: kun.q@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NANfhlkQgERFnwE1+idEbPnUKVBqZuHI+MaRb0ZNK8EJ5n8oZ1yu9ZiLGNdM+bYCyPX1T0YkDZrvj4usqXmoCvs8lptMS5GkZ6hiBKIM6M2Nh0tOci2Ulu+AQAs+USwYE7zp1S6mQkNfdbinaAsWVkxjB6nx1horwJYsWAHPD8ExFtMtq9ALIxMKQub1lKfmeUITeYsaM/IvKM0OhjasJQP5yr+ozAlZUpeyd5Oiso0K5kXPBE5cFdlU7OSJ9ZwGVZAyjuYafbRUu/8zuNQoFFloDM8QtmFGVyMcoBycvbctqdY723rHgdzP4GdEfo/dIoFk9eB9C2W+WtVN+5up0g== 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=DAqOD+oHZw/BUOlpdHlmT8fPSg9Y+suag11FXDJBFZQ=; b=OOKxA4c1cE6jzKcAxIPFBS9Iqjxn/L9aprcJFeHJvM0WTl4kQd0THJWBS9PYnCzsbzphKOw/S9pXE060ecHfRKb9I5Kev+QnNsBauisakPzMYXW/3vHTZMC+cX3Sc2hl78P8VN6E+P8d5++lfZjF3s1dJw3MJ+7uamGeoPWppryLF1YKlvRoSihXFwCjWnc3umwimUWodrPLljRX9v2SesWl49YIKQlr7to66irAa3SKJnPD5WqpaUd5p14FBtmhqVS+ybaJnoEY6m1Gf2pwgHcvlMksmVnMhifETz/EZfcY6eBvHDuZ1G1Tk8HokjHiCEFhTyhlNq2NN63ehthylA== 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=DAqOD+oHZw/BUOlpdHlmT8fPSg9Y+suag11FXDJBFZQ=; b=Mk8judDjSFKxOr1nEQdvcQ7Nu6WDom348ZY/NWuLgBt4e56VvCkqzlrKoYZVstmuv2/iH8a0S/SqYHP/wADBN2lkciILurIOPuAQhpe/NMjWWYtkdTSgOk6wfccG8aeGlWCOo2MYa6eu8SJ+ICM9XVa1pe1+K6NMpI21IWKreDqFWI/ZS92KITR31lTqV+Bdd+YfcWZAWha2LS7Ty2yyLnUnsxsVgb46AupDxj/ZruszsjujCAa8BTodIlp/jm/+7Yvi079dw2hdUBjqk5U0nZg4FBb1G/35XW6L8PJut62Gk3nTvgUREhQi7ZBnu/RJYPWUxg1/ZAqPJqO6hcY+lg== Received: from MW2NAM10FT057.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::49) by MW2NAM10HT112.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e87::210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Thu, 4 Mar 2021 18:59:59 +0000 Received: from MWHPR06MB3102.namprd06.prod.outlook.com (2a01:111:e400:7e87::4c) by MW2NAM10FT057.mail.protection.outlook.com (2a01:111:e400:7e87::229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Thu, 4 Mar 2021 18:59:59 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E69051A1DC8CFC593C7C09F7D8D478A1AE4CE24B455E75444BD5A82241033DF5;UpperCasedChecksum:962D5CBCCB72289927851CF1937A0024D847DDDB843A00B59E26F39B0E372D3B;SizeAsReceived:7355;Count:45 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; Thu, 4 Mar 2021 18:59:59 +0000 From: "Kun Qin" To: devel@edk2.groups.io CC: Laszlo Ersek , Ard Biesheuvel , Jordan Justen Subject: [PATCH v5 2/7] OvmfPkg: resolve MmUnblockMemoryLib (mainly for VariableSmmRuntimeDxe) Date: Thu, 4 Mar 2021 10:59:39 -0800 Message-ID: X-Mailer: git-send-email 2.30.0.windows.1 X-TMN: [0rIJRAqUvmBfbd6kmz/rtojYs9v+9F5f] X-ClientProxiedBy: CO2PR05CA0054.namprd05.prod.outlook.com (2603:10b6:102:2::22) To MWHPR06MB3102.namprd06.prod.outlook.com (2603:10b6:301:3e::35) Return-Path: kun.q@outlook.com X-Microsoft-Original-Message-ID: <20210304185944.1716-1-kun.q@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (50.35.88.161) by CO2PR05CA0054.namprd05.prod.outlook.com (2603:10b6:102:2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.16 via Frontend Transport; Thu, 4 Mar 2021 18:59:59 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: ab82dc41-66d2-4770-e231-08d8df3fb598 X-MS-TrafficTypeDiagnostic: MW2NAM10HT112: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sunCjEB5GOgAKjPnFiUITxW8s1b/ladUO9Ssazq0Vp+RPls6Mj5bpSgV4J0+ke0CFN87qbS6+9WdNjPeBFSwwfRA2hD4LolMj1CtJ0XgQUM8nIS5HjeGnRj20qk3JYGZsTLcCqxOD5L/ukEw4Sba2aO6cejM5WyUUap65fkk7hJuXRoqNXRhkxzVJ5w6hFyQQougryP2BoTEPKSkOmjJdeZGtIIpx9cG72xtzWgYuEVJPduME0XLKLcSLbVxaKud66zjjJBwjZifftSQxxhAoI+W9zEitceUbS0tu9+9ZetD+t4j/Rd+DOgLY1uywSwjml5s/2vqKB8I7xfalLjMcCAbHobW/2k63zSxazmKUTmIuJpB8lILjzHgdWEfpCLUOH/t9R4w760Qt2l3pq2MrA== X-MS-Exchange-AntiSpam-MessageData: HemDKajS1nB0B+dpBqOlGX4KMwxIxf54DPpTH2bJ4IMa34JgDMXGdIp30Ze0jjROTftJqbH34A0DSQU6k7mIePtsrJODzN2HaAZzKDRfy/+JHPEu6069OKm7ZSKAB8IT2pArgeo+7ktG48Xg/UQWmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab82dc41-66d2-4770-e231-08d8df3fb598 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 18:59:59.7583 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: MW2NAM10FT057.eop-nam10.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: MW2NAM10HT112 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain This change added NULL MmUnblockMemoryLib instance in dsc files of OvmfPkg to pass CI build. When SMM_REQUIRE flag is set, the library interface is consumed by VariableSmmRuntimeDxe to better support variable runtime cache feature. Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: Jordan Justen Signed-off-by: Kun Qin Reviewed-by: Laszlo Ersek --- Notes: v5: - Previously reviewed, no change. =20 v4: - Updated patch title. [Laszlo] - Moved this patch before the variable driver change. [Laszlo] - Added reviewed-by tag. [Laszlo] =20 v3: - Newly added in v3. [Hao] OvmfPkg/OvmfPkgIa32.dsc | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 3 +++ 3 files changed, 9 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 1b8d34052b01..1eaf3e99c6c5 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -347,6 +347,9 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf +!if $(SMM_REQUIRE) =3D=3D TRUE + MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf +!endif =20 [LibraryClasses.common.UEFI_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 9c1aee87e783..4a5a43014725 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -351,6 +351,9 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf +!if $(SMM_REQUIRE) =3D=3D TRUE + MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf +!endif =20 [LibraryClasses.common.UEFI_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index fabb8b2f29e4..d4d601b44476 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -353,6 +353,9 @@ [LibraryClasses.common.DXE_RUNTIME_DRIVER] PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyL= ibRuntimeDxe.inf +!if $(SMM_REQUIRE) =3D=3D TRUE + MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibN= ull.inf +!endif =20 [LibraryClasses.common.UEFI_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf --=20 2.30.0.windows.1