From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.92.40.48]) by mx.groups.io with SMTP id smtpd.web10.1439.1614715500001467646 for ; Tue, 02 Mar 2021 12:05:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@outlook.com header.s=selector1 header.b=ZhlyAe48; spf=pass (domain: outlook.com, ip: 40.92.40.48, mailfrom: kun.q@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PcOTkxc6WX5PYdbNequpAFQR1ZpvH3RHAoDyU01yFDJmpmb1/+OUYjnhSm5a6uwhXypIj3+Z2q84ofSgglaNxoHO0E8M3v28bdSoIFKqZs3OWTrPv378/cmUgnrLO2/sYiAXCcsX3Yl9CJ0so4I4chLps2Ap1DBWSvJGSt2iC8YxhwhuOPEAZqxndE6ni6B/O6s2MHQLvYNP28/vi+OUzWGLWnjD2rGVbwHas7r+v7zts/XbTnPhhvyj6EebKPJe4Xjhq2vI/IXjRBFvxqOFpJJYUhjeYYLenMn7W4q9kOeMcgCuOmQm/T5bgz6UhXZm4I2onFNPq8bWfD9oI1i3zA== 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=yat6gS9Gb6jpJp8htLLGR0wY1ZTHtAhg7lpwO0afVkM=; b=MmhCZHZaha5ZBfRFvXRz+q6GQygo7iezBzVpL+HKwXZjChIwq8CR8togYx+CMMP48t/TnKj9LS64FD5v9PhLw+k0xu/+ZmOqjXiG41hm4W6gPUqukOhiElZwUcGgHHVNo6VsPYNJBuu0vkPwXRtSdXkHFVqYqcib19Ob4JA12Luu0y24lpZMm7pY73MR9aAILdLzSm+lwewshJRIHOGNa0FThx4Ecmi0a5kfOmDQBdsmTDm3MDnBkmR4Ud/mA2CHmz3zjDIEAEvUKuK2V67O9OXzZ+FujjiMcJiM2rWzMTuFE0bkVFpM7WEADCdeixXRmfSBrDvW9qMlC6S/Ggj/6A== 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=yat6gS9Gb6jpJp8htLLGR0wY1ZTHtAhg7lpwO0afVkM=; b=ZhlyAe48iCD9qzYpIzkrnr5fWCPIQQcpalJC48msabdhhufCY68hrx71Avit8lqFdPu0IEtQ0AsdOSzSCLRrOlUMCjKTyV2WsKRS2gnxdMURD3L0Z3xDLIUPcah5v5wt/KO4glGHw4Dx2Wgh3ReVDgklTiUermnKSJrikIXNwmJmXPcq80E1bgFLR48BkzEGTP3Rweu5R64B2t2gtkQfIp7fuK5EHFnpsZbHYMfcujZmDYVuZTea4rUor+ekWAGb5swFkV2qI00dxCfmmOgrm9r6ZU+eXP1ZBm73usPouQA/SUFr2YzgqJ2A8Ia/ZLz90YtigITflrldRurC/fr4Ww== Received: from BN7NAM10FT040.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e8f::51) by BN7NAM10HT235.eop-nam10.prod.protection.outlook.com (2a01:111:e400:7e8f::341) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Tue, 2 Mar 2021 20:04:58 +0000 Received: from MWHPR06MB3102.namprd06.prod.outlook.com (2a01:111:e400:7e8f::49) by BN7NAM10FT040.mail.protection.outlook.com (2a01:111:e400:7e8f::238) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Tue, 2 Mar 2021 20:04:58 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:8C11927316467CAC33E1FA1EF785AABCC9B4E37EBAAD4542EEF6FD10CA6B5D99;UpperCasedChecksum:126ED9011B707942A51C2B019CA72D35B7A54A6A8D4B1C728938A78E86D06466;SizeAsReceived:7471;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; Tue, 2 Mar 2021 20:04:58 +0000 From: "Kun Qin" To: devel@edk2.groups.io CC: Laszlo Ersek , Ard Biesheuvel , Jordan Justen Subject: [PATCH v4 2/7] OvmfPkg: resolve MmUnblockMemoryLib (mainly for VariableSmmRuntimeDxe) Date: Tue, 2 Mar 2021 12:04:33 -0800 Message-ID: X-Mailer: git-send-email 2.30.0.windows.1 In-Reply-To: <20210302200438.1901-1-kun.q@outlook.com> References: <20210302200438.1901-1-kun.q@outlook.com> X-TMN: [ThYBPyUKn72KwVe6VCIzTMU+pPDUUrvb] X-ClientProxiedBy: MWHPR19CA0063.namprd19.prod.outlook.com (2603:10b6:300:94::25) To MWHPR06MB3102.namprd06.prod.outlook.com (2603:10b6:301:3e::35) Return-Path: kun.q@outlook.com X-Microsoft-Original-Message-ID: <20210302200438.1901-3-kun.q@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (50.35.88.161) by MWHPR19CA0063.namprd19.prod.outlook.com (2603:10b6:300:94::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Tue, 2 Mar 2021 20:04:56 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 47 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 7adead27-04cc-44c7-503c-08d8ddb6739b X-MS-TrafficTypeDiagnostic: BN7NAM10HT235: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /sAsDxC7Aj+f0G7HojZm/Ge47KimduptAP2PCCB1TfV0SYIjm3z26mUgcSPJThRq+/IutVzpKmBoJlkLAYAwRVQigPhGhw0c4FkznWmp2dWFHbV01Rtk8rPrEK33c9lS2m5Hyelelf9A+snA6fGiHb26Ieftaupah0wETH6+oj44fjpsviRIHuv38C8yGtwA1kVhH8rSimf82U6QxGzBua2yBNH3vfKrJlTIZNCW7iH7jKBt9aGS6i7Ru/EW4xSfam41n/79F2LL1T11+sHRiTaHn6Yoslu4O/muLgvd+TuJhoKmtu6il7GdguFw05frOFSaTMfuXgEvizlnRz2AkoRGriJMqdLDDYkcQbna0WOdWPBUaVlS9X9uGmBBCouz6XMgFZii+AE2ln9SMoY1qA== X-MS-Exchange-AntiSpam-MessageData: ulNnomedgws/2ueT+QHCsfDYcDZXHOGZJLIXaixfyVE9r2+/9TaBBCfMU8IFxS/vr0/UK6kICsoX5yrkZalmdSohnTWTwbLgKBdjxY9MvSLBgl/8xN0va29QD1TkN1wH/2Seu6hZ3cvoL2+J/RSAsg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7adead27-04cc-44c7-503c-08d8ddb6739b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2021 20:04:56.8698 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: BN7NAM10FT040.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: BN7NAM10HT235 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: 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