From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (NAM04-DM6-obe.outbound.protection.outlook.com []) by mx.groups.io with SMTP id smtpd.web10.6186.1620863210873702199 for ; Wed, 12 May 2021 16:46:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=kt5IUQch; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: , mailfrom: brijesh.singh@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y1ofjcDf3hk0UOS+9mBxxlq0eH47aT6le2ufAgm+5XA1KDvfV1UNTeRjcJ1dKUuXGWMco0QKsUVDCz5hropOic652tMLvAuNQ6Deh/U7JIt66j0knlMbraC/WYVQuVDTc/VyilAia3MGgr4P4KJcaB9aZe1RWpyYJv9wGriuZDvng72rhdS4EuZbAIManYbOM9cLIayEo2Jb7ysFMINVetyGLOh4K2CGAAO+XFy9LDSt2ubzXGP7NqDbSw1bn0NmSwl0hNnfyUTqkKwmnEmWgQ0duFX3X2m8+ErVpbkhV1gyuElMomXwzmme6JDUC9KBVS/Jmcu9FZDdSTikl79NSA== 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=F8Rm49ET0mDGF9wp7X4cXNbdvH36yAyJzBfsZludOwo=; b=Q1pzbmSFx7zMHwcsStLDUvQ33ZJCa1OaGsFVeXYqfiUFK1/yi4EKFpC/BJlLp8zUgK08Ynbhj7O4rp7LsgtQ69o+s3u/5YbS9AHYmuTu4xmauoXwtRSJFa/evcK2jCwbBr5DYbJqu5bpoNVQmqzavP+AMbPZB3O6UsHqx7N7jW1igmCa40HFcaar1PErJXHUqnkMrn/qav60a4x/pJNqEI0+7V6xr+e0NidLaZJPZt+Lk12tZ4RaUiVqjKBKjnszJ9qto+mW1LHsTSQE3nKxix7ayuIoWD706+7fsLoeEU1trWueyLcF2t7/MiCWXoPhPlmq7itaobm7ra9ePLJaNQ== 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=F8Rm49ET0mDGF9wp7X4cXNbdvH36yAyJzBfsZludOwo=; b=kt5IUQchj/d5sB2C39z9PwKoDizCzSmb1FaY0jrIo6WTHeV4G1aIaLmMaJSntTJXcJciOIiZgIH1gZYsSGfH0RdGjdCx/pBJvdLP/FYlD3a+Xjes9xHQzOMSm8mNsw7jKkZC1aRUDGhZbU0jKeuVbiraBld+Zch0t6BAfVxvYIQ= 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 SN6PR12MB2781.namprd12.prod.outlook.com (2603:10b6:805:67::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Wed, 12 May 2021 23:46:48 +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.4129.025; Wed, 12 May 2021 23:46:48 +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 v2 12/13] OvmfPkg/TpmMmioSevDecryptPei: use MemEncryptSevClearMmioPageEncMask() Date: Wed, 12 May 2021 18:46:14 -0500 Message-ID: <20210512234615.1726-13-brijesh.singh@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210512234615.1726-1-brijesh.singh@amd.com> References: <20210512234615.1726-1-brijesh.singh@amd.com> X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR13CA0003.namprd13.prod.outlook.com (2603:10b6:806:130::8) 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 SA0PR13CA0003.namprd13.prod.outlook.com (2603:10b6:806:130::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4150.11 via Frontend Transport; Wed, 12 May 2021 23:46:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d2a3dfe-9dd1-4f20-4c78-08d915a0348e X-MS-TrafficTypeDiagnostic: SN6PR12MB2781: 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: of1TXkXfgqLdfTs9XEbNxRddZYduuq1FU12j5vrR1TegH6HzeHF5JLhzUWAG/x6FGNIKDpsHFSk0P5yonYpIwnrVMA1rqn5nGywIfdynRkHivmAHj2hv1fDh/dAenFMuWh/tL7ceLMVKRzRfdhwS/X1dQsXgUyfYK7hCeqc83UpGnPuu/4K3EMRXmO/CJ47ETxj+niE3fAldl8C0dpkOMVsxpn74BzPPC9/FGd6D9YDU0QEZ3ndxhHkgX6/0cgBUZgSHOgolMv5qUqO5U7nj7uu3OHItGjNFfqCbItbgup8Mi6rlLEfp//mRGAj8JA0MuQ0pzfyUcQ9cZuzUwy32r8F5Zokl64nEELDYSodUtIKu2bRDAF8xd6o0oGleRO/2DtjnAziRQ2PKex798NEIIldYuXgm09Vm/RC+vOY5S8tOC+ROBZIx/wJJaTIbhpEodYlASX1paaFeEWABW2lyjz5PGC/iHabKTpPYvkP0QWNqJA9VjsY80uBuRPtnfLX46RRXUo8zOZpUV6LGgLX1UVRQL/2BqgmtBcDbrJLjtdnyx04zNSWw3Fo50ge3XzyvihxFwUE4nuVFKiCyOrzNlI4q7pGlTbo1puS9mx9rLMDxt2KdKq3gVJ+qzFUwjwuwaY4qvPu4nO8aR/w0o5kmCrBHxy8tMoPPr989jzZm4fcxgDp8ty37Z8l9rM5/qxi5iCCwu3FsWruEx2mrxUfzMmgizZLqpr7F/qKi83zkX7XUFMZarL3IOJRjxWe7ThB7RUpYT1s+mQuJ9h5s2NNjew== 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)(136003)(39850400004)(366004)(376002)(396003)(346002)(66946007)(36756003)(66556008)(8676002)(956004)(8936002)(6486002)(6916009)(44832011)(7696005)(316002)(5660300002)(1076003)(52116002)(66476007)(6666004)(38350700002)(38100700002)(4326008)(2906002)(186003)(16526019)(26005)(83380400001)(478600001)(966005)(2616005)(86362001)(54906003)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?wY8Nr6XRiNHl5iol5GjKZD5PGEvmp9tDQ6/r/WNg6rAlecsD/sPO12BSSw8P?= =?us-ascii?Q?0J0o80betUzn6O2E35c9LoCR2ih0tm7ZlvsCTbsxRpZVNSNsXWVoHfMkAy/Z?= =?us-ascii?Q?wTY2myD5ZatqV3OnSJSDK4bx5p8tLLesJE4YRDG495SjNQ11+7Hv9F0jkUY+?= =?us-ascii?Q?1GsHJ32Qe77v+a4jUhf87OFLdTJUUs3EDc6tMKCApJYh9TrJ9uOLgyfyng0a?= =?us-ascii?Q?QvuEfODV7HCR7xqguvubFcAN+dwPylUa9OZwT/mZ4YiJjUsFVzCAEe7l9hCO?= =?us-ascii?Q?10Zj9ColEdoU3Bfgjo0LxeN+dm70zY9MIr2mU6cY6DePms09EzH3ELnASONe?= =?us-ascii?Q?U8FlB5FZHml71OIAkeSsm0I208Jfs1RKZ+q0O7Wsi5PfyFWgp7IeMjog5anZ?= =?us-ascii?Q?QTW/rsed2ticaBEvDMPfS0dqExOpGIkkBKYngUo8mP4j4+InbBvNKXopUaEQ?= =?us-ascii?Q?dAcWGF0A3XLYwRRp1bFIX0xcsuXxevHCyeaZQRDkng/VUKMp5Aap/DNzYlGH?= =?us-ascii?Q?yM2PGN8Q1Bt+LBuQAdgrerQha1NRbBdZJ67Kz9doS+LJ1KBbVea12GqNsRd9?= =?us-ascii?Q?h8pv2U8uNcUKvZestSgSxk3HITtLRCs0aAPA8nueZPk07WTlIwYRvFJEgA2U?= =?us-ascii?Q?GJWOgVOHdBrmVp4arFfDnlsTszrVQ6+X2ap4zH8LdTXotE3p2R+brWvZnj21?= =?us-ascii?Q?XI37yV/wtOUvocvT1D9E8vb0dTq2MbBm/kHAf5ZWHnskvrYoShZ8DVk1OahW?= =?us-ascii?Q?7ua7VrhZebvc+f4EGsgDfJhAKdHt1hRgbzO80Xjp1MHqBx76UbraaHVPNiMY?= =?us-ascii?Q?PYiAyJ1wM0cM965bmsTCWVhw4NKfXTRRPaUipWz4ar0e0lXo+oNt1C43re6n?= =?us-ascii?Q?VQlF8CEVj3OP0f8lnMeixBcWIJCNsriaskEM2+tC8tBY6LrPNL4QJDNkKaE6?= =?us-ascii?Q?nUSQa+PosZU7lR4uHex93EUiiFGIGwWCTdhtvrecajWfYRCtqHDUqp5sDydk?= =?us-ascii?Q?6c7m1KtCteQ9A/KMyZdhI5iJjTCGJvKhYH+Obhcel9ZXlkdvBlBYrvev6n25?= =?us-ascii?Q?Ow27mKGDq4uzuEF7L8aYfxHl74+qOp/XStlntmwG/hPa6uEUvpt9z7DDrav0?= =?us-ascii?Q?i8rFHHm+P3SyPXWE4k/XxYmEKLHvyk1/4DOy68mOQsz1VxAkFOfR7o8LKj95?= =?us-ascii?Q?woW+UyLmq7oM/e7p6vj6appotDcQZk6ZgItk5G+7/XRuzlFZVDsxcscJPXbL?= =?us-ascii?Q?kF6OsyFJREVwEm8kjezwVdEMiON6w8Z3Sj2YT+CtCFxgD1HU+rztWYO19H2d?= =?us-ascii?Q?PTijVuaTns0sLjeu5WXYFiL5?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d2a3dfe-9dd1-4f20-4c78-08d915a0348e X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2021 23:46:47.2656 (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: 36E+AuI7a5KtJe941dnCSDSYn7HrnayVcF1bY4pCiTwmbDfJDWhR8aRH3p+3lQuBPnKBVRb/qVfZHGvGlcPFAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2781 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 Reviewed-by: Laszlo Ersek 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