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=XU4d+y6U; 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=nu1LnfPLj6YcAM3c+5ph89wS5uOnBWHat3MQEIbwQJHMtpsYNsr2z56H77u3ucP7x6n9wlFZBP/TFfJMhgqIvbDFf/9egr6ClXDsMzsjpLLnJietoUzh0CtNXlHphPsvmakSWeD0oM+edDX3e4WPJxhcwsnDtcB4hFRxbwL1CRBMeBKjF6po66f0yq6A67Yz5ysr+MZt4V6Ic52MQ0LpKBLgdkbJQx/LuCqf6EjG2KWdQwN24ifSvC5ugXDY3I5Moax+UOPP4keY7uY+BgOHjgvG/EguPvgfVNSTpt6DxchJG8A+EPmzgvI+hRGd+wJNBBMFphDZAjRmobty8Dy6fA== 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=fzufsZrWgS+UNzs4KbfjAj1i6bjJ2PYGsIILu54EiEI=; b=c18ybwRNM8tgd1e4eM7h3JwtHAIaa2akaDV8J90AVeofNjZ95bZNiw8aIXebx4EArpxU9ivYlJ8Q7JdHuNadnLeRcFTNVJg0h/H1PJ0OvfI7hiHcU859R2p/qicO1hAfgA2QgVP5yuSmKPEmNSOS29x7zNoHDZAeevCrBG3NxDDf5r5/voSPpWAswsmT6Y4WnRhmsmsdXRpuyC20u2jA03eZ9NJ1NcZHwL66wnA+plT1aGYsbu/Nh+oDA9VJ9RlBeWdkLh7YZHG7NuKGcqY4M+kee+zrH7mM3DCZtKNZtfRG7UqAj+vm1P8LlbpYttYDbN3dBIEFbg/fj+5ZF+tDLw== 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=fzufsZrWgS+UNzs4KbfjAj1i6bjJ2PYGsIILu54EiEI=; b=XU4d+y6Ue0y9cYb6yERT38E2Ls56ikwQaoS7YPoP5pIzCraNvVDUwHMBxfSKEGC3hVvknoHJzAqvs7k2S5p5Tqr/xZryUKum9cdQQLeYyUsaLJ9tznviUa24HWexC1oF7ynDAcRPCR5QI/fXVRugZIr7g2pe3EHgM4f8vD5KVzM= 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 11/13] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: use Mmio helper to clear enc mask Date: Wed, 12 May 2021 18:46:13 -0500 Message-ID: <20210512234615.1726-12-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: fc4730b9-d08d-4b8e-ce4e-08d915a03417 X-MS-TrafficTypeDiagnostic: SN6PR12MB2781: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9H1ulQoJh8S0hEp6V41UeLqsgLhfqvfLvA+pBmFKhEkZa4vwIM+kzlbwkQgYjf+JxYM4ThH2TmKQfpfX4lvfgcpqG7YR79ygAKFORF/B72bolqS8wEUrTVISgRGbhbyOLQMGvHwz9fERMkFt1t4suyLnf035w3EemPQJ38lsKPZswP7xrL1QjHnlY82LkhC52sEf3+81kbJdAIYCISOkGsTM6UyRa5p2qoKm8oKhnoOpJUZZ4j2b+1RlE6CyXiZxpKdxk9tdgLu5lDNl3YeMblW+928p8nmEWM8R4cfZKQCODUNu9uXypBeyn40LJurUkjSg9besT9N2DtLm3izsSoLdk/NFYUwNv7ZVPCn3a5l2WK8S8C+GTU94jBi7et1f3VXEq1R8yF/Jujn4ZNdlOJ/zhCUqzhTiBXvYImIbmT/JPrHFnFack1I8+PJUpMZoHFnhdG2MSaJL+r0acsWrKsMLoIs5JK1PfXjdL2v65NbiQpry/YWrud40q/LfDkkGd91k3OUP3XIwYLmU3SkgtfhifTFarLY1q/SAur7Y/vPsQt9i9PopGxYBKtJmJLTh3BS3gFoOq7IxQbtJkXXZ5HvRoAggj3kvJ5yBk4KKdGw3l4vh7ycYI3TOGyWSMxPoiAQ233DunWNQI8VczMJmBeMtMIcCCyhOJlfvVzzgg4/U8XIrvUil70YL4FRjEJjqtQJp3IDcndVSmkM9HN4zUCu3XndHthAyyPxOvCChWMKNp1NRalrha1VqJ/DT6kgeu+0ioFhj1D0kQ1IBRLRzbw== 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?Ov3RNJS4YIIUmXPLPa4OW13lc+iV5eK+SoHknRMq/qcgihIF14bc+vwF0m5H?= =?us-ascii?Q?fkpxwdd9SU9cPDECYZqFOMt6ogo0dowz7x+1LgD/QkMg8n2aDjzXfIdYGonP?= =?us-ascii?Q?CmW8aybAgqwDiVLQwtc6yBNLPsm3+zseP720FOo787NnuLEYnQOt5t3I8ASw?= =?us-ascii?Q?9Rge9jHdKtt3A//ZEetQdsq+sR/QIWmyoztsw+sDg3FkjmPIXsL0oUbrVSHo?= =?us-ascii?Q?JjSWlyWZ9ypNThnSRjmcrlbyITW+77vnUZk5EOcidFGQ0xHA4IEaIuSaF+Ff?= =?us-ascii?Q?zYEXkyrT913iHJbGF/w03/SuFWOLIoT53L9yI2zo3eStzrZcx6aNqtGgqp9T?= =?us-ascii?Q?RyRVOd9eIpWO9ZZ+/INeh2vwBOjZW2lmmOp/Tf8tl6iJt5Efbm7yfuhOlAMa?= =?us-ascii?Q?ogZljr1ngi1Nos7prFmpEp6uImRb6nD38CQeJuI8MCDXiSx2xpsT8apbuf9x?= =?us-ascii?Q?B+j++S3Sp/Qkpw9eX3kLaPJ6Pvc0/e6HDBBmm+g9ULGpGlIX8rVyTxzY2QhH?= =?us-ascii?Q?9fqD/ZdXS3fgud16XDkrn0ta2kyw07tpG937PK6aBbL/rbqow1uK5E/MS+tc?= =?us-ascii?Q?DGGaYN3l1ORyW8gGK2ohYqz68mNYsJ0i2elo7qvripn1jeLY1xq5WGHRiBs2?= =?us-ascii?Q?/VOvlI+WtavUvii3GLByN4yxpgQtKkJS2YqBvJpU3w9WiQgFwS26nIVfiecm?= =?us-ascii?Q?mYK6TSYHWq/jd8/YC+jboKtoG+gNfNf7ux0LAJ1iBtp6ZbktDDrz7ncc1kDU?= =?us-ascii?Q?tKCijhPkp5lmtt607gq7UGvOdYZ3cf1ynYHqL4JeLuwvabxiSfk2oReSjX4H?= =?us-ascii?Q?CPgPzD9lNAm04ufXT9SrvAzw+nN8eSrpEEtiKgWK0EvGJzKLjLdph35ptvzL?= =?us-ascii?Q?dUVi5DtmIRaTVX8LJi+5S3EvoLBmB0D1+dMdHC2z8KCnAwO8OSQ26JfWPgxI?= =?us-ascii?Q?NaKmIXO5Owmm4E6vnTfFNDCStf9l6t89NCeAVmXr7umdEZjMdBei4vBB3NIA?= =?us-ascii?Q?zH8iN+w3vZFc0tePzpqLFEPD8JEdyKat0gqUO/XoqQ8x0W0+m8U91iPe16Ea?= =?us-ascii?Q?jxRfGKqGrWOGCiCxxM22AlPwOgCWJB05nvrKa/R8u5kPZUWz1RfSdJt8t08X?= =?us-ascii?Q?v13bm6n/5Rbl4TCrUXYDa6UHCUad2t248MsFQDDVr4++rlGHKCwAFUaTv4yW?= =?us-ascii?Q?8LgOZKogpjLHZOa72e3lTWWmPl7GCQwIJRiFESkF33RP6n5xlJmrfMeUoMoR?= =?us-ascii?Q?owChnyiKfHweLtlVl5FyKujwCXEjBej0kOpjvcHAifRC1BryOeHvR8wVg0Fy?= =?us-ascii?Q?k2t1xm2cotRnVXM3vd61gnue?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc4730b9-d08d-4b8e-ce4e-08d915a03417 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:46.5090 (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: uRObYgIPMv7SmjubdZuHyY5K2ruk7Sh7lGcn6epYbGKAXhUDxJjqi6w+v6J9nCwrg8pyGNYMwfuOK7Z0t9EUeQ== 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/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c | 5 ++--- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index 1f285e008372..ab40087a8408 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -205,11 +205,10 @@ MarkIoMemoryRangeForRuntimeAccess ( // memory range. // if (MemEncryptSevIsEnabled ()) { - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, BaseAddress, - EFI_SIZE_TO_PAGES (Length), - FALSE + EFI_SIZE_TO_PAGES (Length) ); ASSERT_EFI_ERROR (Status); } diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c b/OvmfPk= g/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c index 7eb80bfeffae..ea75b489c7fd 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashSmm.c @@ -38,11 +38,10 @@ QemuFlashBeforeProbe ( // C-bit on flash ranges from SMM page table. // =20 - Status =3D MemEncryptSevClearPageEncMask ( + Status =3D MemEncryptSevClearMmioPageEncMask ( 0, BaseAddress, - EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount), - FALSE + EFI_SIZE_TO_PAGES (FdBlockSize * FdBlockCount) ); ASSERT_EFI_ERROR (Status); } --=20 2.17.1