From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (NAM02-SN1-obe.outbound.protection.outlook.com [40.107.77.40]) by mx.groups.io with SMTP id smtpd.web11.16081.1620419958521088408 for ; Fri, 07 May 2021 13:39:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=4uqSRZVr; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.77.40, mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RabQEdwkSQKdxCPIMLjhWT9mu2PrkbsqvfBeONUozSWsysDCZYSmul01yPXVmx/GDEk6X4ajTT5RU9Unq1iEaD2sXswRuhvB+pes+O0d9yU9uUk/haoRoii1ZtEvbUmmy5jZsZX+0+DKLE/ZSbpPJqxnIttZfGk1Pyjx4M1OhC2Xe0KxqqBWx/bt+zgA1EC8m6cQu/BbOxenm3/AsWuf6V8DMT9VZlBIJuiSH3EkM1G2bjurxWzSmDNblLQwocLO+mfUKykfYQvo3njWX36UfW3pWFYl9EgUbwArn7Jht119Taj4Zx63L0mmOF+M3xX7cY6Ef89o8bubqdDxWHHzmA== 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=GtW3RedXPeCtA5WSSk77MwXTbXKsRInOMdsQarUg2bI=; b=DNHvbzrqdt9fOqi/x6GCUTKPvkYIpLN8ggvDCfwdm0gDcbB3hYAtlqbxohsQjtcSgbknIHyfnl/abM/CusLBcqVlGmNe3474a9lewpSqcO+uFM3SZ8OoJtDQXpCAsiJ2Dxjn+kbEoPXpZU/kSx9qrNxIFU+YFFzuPrrICI4navFfzcZVonYnweglxdnP0H0JSuYBXieVAyC3d2FCTH1pscAbuaU+N0LeEZC5jEFNJPofYjsG6a3FejgNZACaWT3TdaVaFzR3fcVY+o8z5id7SfjPQoPsmRsS3NViy8LMAeMqRMOVUH9SjOpAh1CSS75xHqJ5oWUhZE9V9qB+dr/PFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GtW3RedXPeCtA5WSSk77MwXTbXKsRInOMdsQarUg2bI=; b=4uqSRZVrACx7HbXoLonWmYmnDX7ceJ0ud+U/blNdwpw6xGXKRjBWQL8JlnR1JpsQiuJP6TU8RKQ2jqIIx6KwvN0E3ehstUc9kPA+FOTm9BgJA8d4nF48lBNONFdoEXguotX+fWkAVBm/iAptlMNMrLsexuYMKm5aKisQ8vD9yUk= Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SN1PR12MB2367.namprd12.prod.outlook.com (2603:10b6:802:26::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Fri, 7 May 2021 20:39:16 +0000 Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::9898:5b48:a062:db94%6]) with mapi id 15.20.4108.029; Fri, 7 May 2021 20:39:16 +0000 From: "Brijesh Singh" To: devel@edk2.groups.io CC: Brijesh Singh , James Bottomley , Min Xu , Jiewen Yao , Tom Lendacky , Jordan Justen , Ard Biesheuvel , Laszlo Ersek , Erdem Aktas Subject: [PATCH 12/13] OvmfPkg/TpmMmioSevDecryptPei: use MemEncryptSevClearMmioPageEncMask() Date: Fri, 7 May 2021 15:38:37 -0500 Message-ID: <20210507203838.23706-13-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210507203838.23706-1-brijesh.singh@amd.com> References: <20210507203838.23706-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0020.namprd04.prod.outlook.com (2603:10b6:806:f2::25) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) Return-Path: brijesh.singh@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN7PR04CA0020.namprd04.prod.outlook.com (2603:10b6:806:f2::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Fri, 7 May 2021 20:39:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9782a28e-7a93-4dda-28fa-08d911982e83 X-MS-TrafficTypeDiagnostic: SN1PR12MB2367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NH/aEIGR/F/Bva++eaoeSjQwFvt4SBRzUZIxMyp82IeYY5nUFbL2xUUxOWeFCs4HW+Iiyrg70JJhkXkw08Futd9hyts75wRbZjeKK7TUGa4MXAbdeSs78kDE7tOLvQsv1FNr1yg7/rqHE9aN6dB6k88yhsFGpY/WZP7QCHFqtEkeYvwsTxbL+KIPRumNvn+Nc8BChRUqz5fHGboH/awhBP2hqRcaavbfEKdHcr4v45xaZ+b5nGdp87me/ENkKCRsStvUfCxtCsakMIWq8rQKPgu2arNS5WQBTCyaoRArkfnQYBvgAMzTNHIaSPoLKPVudZwpnM/n/yaWI6sTgbblqikWHTRKApRiDQk5JmKWO+Gj5E4ZsDRw8+zcTrK932c/LiB0mMfbhLlXQiAfzNQ70JS8M1+AanJIvt4rvRSYb7/Ep5b6W1ablez2VZhniAbSe0vzu/lfGn8vGskhEoR/69qqj2Us4eJp+WD+TnqxogtOQd3ykxscYvAHi1ffN3yuR6qxvv1nQ6O7gThuVB5itu9AdTy+g+Zba/6fU9pVSzw98ILQLpeCw8h5KNoHaDqGKDokxJFhS5Iz0zcRaKjwtP4IdfilSzOqG4jV2W+l04wYxkBpQjLhKN+SiBJaD9T9GLbOzMk2Wr8JVL12QfIOW7Nin+gNMprcjLJNxo9GC6Yx1ukBtcv2J7PC2uBooFFjEndZ3NteF2RoZ6E/kVj+vrmtb3l7ttSjQh064RXDQf4f+P7cjfRypjSYjVxF73tX X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2718.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(366004)(346002)(136003)(396003)(39860400002)(2906002)(316002)(1076003)(6486002)(8936002)(4326008)(54906003)(186003)(7696005)(5660300002)(83380400001)(86362001)(6666004)(966005)(6916009)(956004)(66946007)(52116002)(38350700002)(16526019)(44832011)(2616005)(478600001)(38100700002)(66476007)(8676002)(66556008)(26005)(36756003)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?xTQ0gipjlRZs1fydW0k/6/PQCHaGaN7/xt9hm9KGeo2w/epgeU2QtrMXCH1Q?= =?us-ascii?Q?12pJKGzEpnPyiXp+JoOt1rSQhBuBvO8r4buqugsTR/ogxhxnM3tMhOQCdeq8?= =?us-ascii?Q?kN4ZkziGcZ194QXU5P7gtUn4BShauQc0m0AvEPFnDfwz3l627W2UMk8kGJWo?= =?us-ascii?Q?Oc0kEJAozGKs45yagxiyZlCz2w53+XL6Ort3DSTxnGy/KVmppr/diLKjzjU9?= =?us-ascii?Q?IqJuehOZZ0qW1JMY089HYLhbxp4hWDtcOhGiMLqSPcahiSVeo/cjeKfZI3nQ?= =?us-ascii?Q?RM9w+Rq7oR3Q4u8LafYQKwJUCqvWqji5R5sye9b+iKd5ZQgobrN67Bqgx7Qm?= =?us-ascii?Q?9SKKDtbQHU1VD5b4RQ4CurR5UXHl5o1ur9eZQl2I2wP8TygiOTegZhvYD2Mv?= =?us-ascii?Q?7ee6dznkUxw2EzH5OAYD0xgOwicO0kYfXBqnzUG993fUFBGdL3Zl3O5DQZM8?= =?us-ascii?Q?F7qwuR9JwzS5rK3IWoHrKlwCgtuipopLi1qXM7CsTYldlxYwys9703YRSCr3?= =?us-ascii?Q?KyPpKwOwcZ9qQZST+7Oml+SoTx8eQnZGD0CKHj79T1clTjyyc2OmhMtmSN3C?= =?us-ascii?Q?rl75uddcOrUY1jJ7ceQf73+wS4lKMB6VVZyabnE2NkrwaCDEAXyC2cuZq5JG?= =?us-ascii?Q?MesZo5ntdmhmDFwIUnaTblTXEIGcuySAqs1BNx5psrMGlj0YtQqFSPFFf3S5?= =?us-ascii?Q?SqgTEnxtAQukgIchIiuxFanXS29PGy39uCK6LKJ7aRPL7PD9J+xrBSd+h9Z2?= =?us-ascii?Q?4SlciHRW31FbI5X72uE3jgGACVUeYeabQUFogEEDJpXvZCxrni1LZqkxrSb8?= =?us-ascii?Q?ZOnsZhuImEdJDQzxXW05WSkbkC/TIJcxI4Ms2wWjejgqqh0GquAqstwJvaQg?= =?us-ascii?Q?eKo9W784+02nuWnwp5h6EAIW3++cYE9sLGKUtvwnbnJU6I+hXhmMtKo5t31+?= =?us-ascii?Q?Zg91SYhRZnmpKcUWv4iz3kRSYza+jbYYZV7cj5sR0aeZoYfCZy2/VRsShd2C?= =?us-ascii?Q?jCHjharEEQ1DyHHRshlut8SXLADrZctm7PsCqlQC2MMc41BAFGgmPLfbwmTF?= =?us-ascii?Q?ngHU4QtC/A7ERJ4BuqZFCutxAI5iFfa7S4CRdOpD/ajwXrkzU+/rRaYLJA5D?= =?us-ascii?Q?luv7df+OZ52NesA4q/KmcT5EOoL4TzSuokdNWhoZMZugMNpI4hIt7U/hDkQd?= =?us-ascii?Q?jNjE/w7NRwGbPf6NeE9MHvj0XZRWXfloURAZp4Rq7sbBZnth7Bo9VOu2mJtd?= =?us-ascii?Q?ztBIQxv0htVUmO1W6e5UrrEgy+QGRL/c/Hnuww5rQEGXBGCFJZvE//3tUljk?= =?us-ascii?Q?V6cgs+vJvHF0mrR3LuV5YhMl?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9782a28e-7a93-4dda-28fa-08d911982e83 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 20:39:16.4243 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xgMXZB6J6PdWxUV0VNW9MSzLEfjsW5QoKV7QZENt0M8JqqQJ7g3j6OmKI4UvuKgAfl2uEHoc5a8XnsFkHsZtJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2367 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Use the MemEncryptSevClearMmioPageEncMask() to clear memory encryption mask for the Mmio address range. Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Cc: Erdem Aktas Signed-off-by: Brijesh Singh --- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c b/Ovm= fPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c index df2ad623308d..570c8467a673 100644 --- a/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c +++ b/OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPeim.c @@ -62,11 +62,10 @@ TpmMmioSevDecryptPeimEntryPoint ( "%a: mapping TPM MMIO address range unencrypted\n", __FUNCTION__)); =20 - DecryptStatus =3D MemEncryptSevClearPageEncMask ( + DecryptStatus =3D MemEncryptSevClearMmioPageEncMask ( 0, FixedPcdGet64 (PcdTpmBaseAddress), - EFI_SIZE_TO_PAGES ((UINTN) 0x5000), - FALSE + EFI_SIZE_TO_PAGES ((UINTN) 0x5000) ); =20 if (RETURN_ERROR (DecryptStatus)) { --=20 2.17.1