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:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=MGHv87mx; 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=WvDjThbfNSXRMd/icsn6p05Znp9N4mpV7BMjLJ4QUfRq1usIFsMHem5ww5rTFBUU9k9/z6SnNG2o+S0SGySK6tOSa3SfKuOMRHsdZpUJ2YkM6DoV2XqutzMMOL7wAPiRxz+gJbtiiSIg/Y7oAma3gJNPgpeIYjeYI8xrTiOAf1yc/Rm+Kjt+nQmDwYxWgMZ0o+d3WP7StcwHdb4lcEY5Gl2L494VRC7i4+O1Ql2XdfzC57wHtP3clBMqayWKwdpmSW4QVD/uhYsk+2cGbH6KRiEslnGQntAkioXmpLnS1FI9AzgjpwkV4vzIGZWeaTSBEBG+RudLsda0ixvBNTD8yw== 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=/okNaFz+eyRjDnmLx35Ha7Jiq/QW4TI6ieKg3CSwIAE=; b=E9dGhAOG7lqQhAFv8zIP8j504//+r8g1e0Z+qtENips3S7xcY5DydRVA5f45EzZrM24HUCxUWA5JlOKYlA+WpkYZ2KHfRZkBcvY92q/uMxkjEoYM5W8gFjEbplmAbMblMNn/rdwI5uMBZoO7KhWCaI/8/yWW8tBui9Ius21FCnjUeLYVw8xhqFiLX3Z0olyCsovR/cfdGbDBmwV2egq+CNEJcriF0EYIcQd4rcYwXMfRX4M45EFXRE4lOVpWglUBtG5iN9unOVV2XP4XLe+rjp1JbrAe1cpLwVVeSec09ty4b1FCvp9zfz8OlYtBKxjaoNe0ZTz6cMt+Xy2Hc3FgYQ== 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=/okNaFz+eyRjDnmLx35Ha7Jiq/QW4TI6ieKg3CSwIAE=; b=MGHv87mx+y8ABsaN23ioySmEr14eJPukUDpvl6Mfcr1TXHPUSNmRMH4gM6zsZPMdghjvZGNzNVpo6oN+oooKaug/8I9duagXmnUrJlxfPL9TyjO7oIMdUfqnXgwm2BQmDQdrqYykFkDxHWA+6vcHRgAFqxPrbIWHd0kWZcltSPc= 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:47 +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:47 +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 10/13] OvmfPkg/AmdSevDxe: use MemEncryptSevClearMmioPageEncMask() to clear EncMask Date: Wed, 12 May 2021 18:46:12 -0500 Message-ID: <20210512234615.1726-11-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:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0c8c9a1-48f6-4cf0-054a-08d915a033b1 X-MS-TrafficTypeDiagnostic: SN6PR12MB2781: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yrASFB1CsxEjC+KwHIYuatgxQ677AfUtpHjRnx6z5YqEYKQd0RgFgcc9lFf7zNBISHaGKedecorH+RfWkMAltN/EllDKFUld5Tfc1GgxXccZPGx93j3yjXnim1kbFYwdC9LKGCAOX8Rdg0Pp52m8XbSJmXevj56tABiu5di78LIDKvNUMXzWQS1qUQOQ4xB9a+e1NYWfrOIlM3obaQnrzZldVTo9Gaei+OnkBH3bF1IsBRSX1WiN74iCf6rSGA/jrJzkHJWvE2RDvO952/PfPstNflzvjVk0irdA2YSK8W255ahrk22Hvy3Dq88wjj21BZo4j7hO2r2LW67qSC0xq89gJMonR1zRORipQJIOw4CFY8T8lDKdXmwb5ePnycbkYA0pEgBz+p3sL45JOyfZGpoeulLfc61CM2LedlW0alu6M6jO653rsnZaSAiLdR5AG203CUYXGN+yzUUfSOrXbI3QBE6d4G58X8b1PWqfuCmYSQ729wSpxjuUfeqnjAV8MOhw8ghlolEeVB/7ftqGf6c4kuP2Eoqf0AGsSIPA/k2rtZcZxmqQxhXe4+CETA8WBeNhNJfT3vfCk3TBsz3bfwYg48+BBzrLjR7P+yjZGyLZ7QmPmUsPURvNcF+7d25njPUsUXTkuekoZCoYdu+utMuss3+mOGbKJrj0/eAioNpUDv0ZeaNoLK909LQ5KQ2oqWN2bxfz2aRzL/5hDCNPOZ/6q8cdQNmzNOt2SXQUhxb20T61TC5NHuCrJ5zOLtSK2dM389pFLZWxjqNRyIBpsw== 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?gt80ZcgOINg2Vimb29hmxYhKs9iYrWyn/Opa63oaNQWEXa6taF8SXaznXnX6?= =?us-ascii?Q?GDGYpvzU8EI0QbY0Li2F1Tb2Wui24eij+hDpcgZLSGdTmDX5x9RiowPVcBQM?= =?us-ascii?Q?ckSkc6TtFO6g1vAgFRTsM6dxww2rxEeU/zlmrGSO7vWxoCvfCk6b5kTIFiS0?= =?us-ascii?Q?EPGv2qQnH7MO1lGOllX9+B8AVTTr/qb6zEFyulfNLzDPb0mjijjSQm8JDBZT?= =?us-ascii?Q?5WdCqVtTXx7iAfvjAr7OF4TH0GPfMKyMqaaOMd+wz9+WENYnvqd5VnCGtU0C?= =?us-ascii?Q?C2Dvmg48gdGe6Y4ufz6Vply+VLVSWXuwTA/UdalntfYgR12/DEDrI34w0kcB?= =?us-ascii?Q?LG/ovH49k46QX8mISPzoszG43cKRr0iWi73JmgSB0gMJQ6padUBX9M9XjkxW?= =?us-ascii?Q?dOsq9hpCs6hZBhP9V6FRlMCbjXNKUgkb0vmZZ77V2iBFWSKuKpwQ4Z3Q4Kk+?= =?us-ascii?Q?HUdknqNTyeFEcs1in8lnXqc6h+jPTwemMvDTX4fJadB33p0RMfVe46eFR2uY?= =?us-ascii?Q?Ed9DeMrI8lUOxVjUOdaKOrI1ZPTWnEKEvhPCvUs5sFDseh2S0F0Wv+Xcax1Q?= =?us-ascii?Q?xbPfZqfuz8biv4n6KZaISdkf46B9hg5Cb+9GW8zgtDQyZtsaPcUsyKSRd/Yw?= =?us-ascii?Q?MsWKPiHnM4rnvpmjp1cgshWg3OKmKlv1ztxvSdwP2IGWJVq0RblJaliVT5fy?= =?us-ascii?Q?lsKkaJGZg3N5bIr+cMmgOx2FTufaS9UZ/4yuR2qpXnF/5w+dIB5V9pDNBuwI?= =?us-ascii?Q?vS5QwZLu1m++9SqDo2/40RAZcK54vyIzbAmFXn+WWxFfGnrnudjXygRZZnMH?= =?us-ascii?Q?pTRCf/Q30pzxN6QZYhkTHcUgC+yYG5Xa0aB2H0ZWzMSFFuvx9S4GTy2gK3rn?= =?us-ascii?Q?/fu1PyBCyERVFJzPkOITduMdCFmRw06xZYPxun2tONnfaEo07LfV9nnP9JzX?= =?us-ascii?Q?jpzX89z9GiqYOgMJ8pNTbgpA0K8Z793V9NLgWWBRNA+xqtHmzz/PnksB63La?= =?us-ascii?Q?wEHb8eFZ3r/u+pDhoVw7SoSQu8rpJbsbMqFJ6PHVTPkUdgP4hg1JXu/UM1b5?= =?us-ascii?Q?hbmmdoqRJERyhjePh5hczc6UfyRlhrR74zmB/uiW7uhMI8bEZAsvJ3zLDzZt?= =?us-ascii?Q?Q1f+ACgLpelvqSFDjShKb2sCHPABH32BZYSFpLL9tMm/LVd1H4BUIycLVziB?= =?us-ascii?Q?eywbVI4qa9nRJgexrwLfnYZzXJCO/ilpsO7acZFiyRh0bl1OIfy9Gqq834Mj?= =?us-ascii?Q?Ykq1vN/1ufWnhqp5EtFfKCDAUAjxtz9FcJyg1l7vj0hLZiIvvFo57xK98t7u?= =?us-ascii?Q?8I7OnGkgnzSN9DTutUdzPbpO?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0c8c9a1-48f6-4cf0-054a-08d915a033b1 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:45.7764 (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: 334v/19aveZZasF46S8GznHLN7AhMeWH2+0z2M/BKgI38TbFaE2oqau7NTThvLyU5wDv+CvF3uey/eVIyMX6Rw== 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 and NonExistent 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/AmdSevDxe/AmdSevDxe.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 689bfb376d03..80831b81facf 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -53,11 +53,10 @@ AmdSevDxeEntryPoint ( Desc =3D &AllDescMap[Index]; if (Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeMemoryMappedIo || Desc->GcdMemoryType =3D=3D EfiGcdMemoryTypeNonExistent) { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, Desc->BaseAddress, - EFI_SIZE_TO_PAGES (Desc->Length), - FALSE + EFI_SIZE_TO_PAGES (Desc->Length) ); ASSERT_EFI_ERROR (Status); } @@ -73,11 +72,10 @@ AmdSevDxeEntryPoint ( // the range. // if (PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D INTEL_Q35_MCH_DEVICE_ID)= { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, FixedPcdGet64 (PcdPciExpressBaseAddress), - EFI_SIZE_TO_PAGES (SIZE_256MB), - FALSE + EFI_SIZE_TO_PAGES (SIZE_256MB) ); =20 ASSERT_EFI_ERROR (Status); --=20 2.17.1