From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.82]) by mx.groups.io with SMTP id smtpd.web10.9744.1602346088161265665 for ; Sat, 10 Oct 2020 09:08:08 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amdcloud.onmicrosoft.com header.s=selector2-amdcloud-onmicrosoft-com header.b=2gfhkynW; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.243.82, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MMmLz+EaDtt7P3U3ezViS/59TS5SK5TFD2KSqtuSQVwNJOvdf/URMVhB/aUpTfzr1q5KUraS87navhP98OU6jZaVrMDHsGMnt7wJ2DbHVG9Nyt9AX0DSfHwtONMm/agbZUhQUioxaW6mozMpbXeW3TwjY5mPb0NRGRJ/aT1ueawvJxoqGXmtSSsFw80GGYyiYu7uYC0ATVJIssIkZw7x1BCYN4ijDYV7gHC/elw8qigsHFbmrbhwChjwk2sfI+Xd6xFdIsO79NuAiAwEqfNE55plTjAmn5AdNH781K7n6dnFAV7mqibXaOCAktkz8t/Zk6tsU8gYNuzsqVJv2XJbiA== 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=FoEWNi4W4MamjJVj57cIp9PLaCuw5iJbVDkBZcEyOgs=; b=Xy5/Tu5Cu86QETlxEvsIrIkmwoVkUqlE2+HuGiGg0UpWsoTZjaGeWuhDQLWF2b2KGWWQcxpnzuAODV2Y9xcPJ6ICKzcp0gwENiEWsXGzAQ8dG6SllXgMG8JSyaNCnWBv10gVH2goAtn8jBkkqQwraQEyiE5yt3p/3fWIMwUHYOG08zaavQwY9OQP+FKTu+OzrFGzg8LgcQqYO9LmlkDSSV/tJSaZl9dEDRa1E3zUl3guXscO3pr0xzqDCtJH2ACQFkRCmG1GpL85GDBjmjpmRpJ4i062+SIHMUfhXriAEEypype2IvQFFWj1AOYAh5lnbOV+eu75HKXpqxaapWaBEg== 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=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FoEWNi4W4MamjJVj57cIp9PLaCuw5iJbVDkBZcEyOgs=; b=2gfhkynWiaxGiTgFTvksLWlLCP1hMy+6CNROffLNAWPcvCB4TR36k04bxvDPMvzCmdT82sRjjmd7PCvYJnIRjGJDLl0ZT924ISsd8tYu9KqAIHHD1GlXzSXN9Rk/a2gu8Lpm3w8fBkoRaRB0hxSUTSs9Zm+ct6/49HUHNbqAmio= 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 DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) by DM5PR1201MB0122.namprd12.prod.outlook.com (2603:10b6:4:57::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.28; Sat, 10 Oct 2020 16:08:06 +0000 Received: from DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4d88:9239:2419:7348]) by DM5PR12MB1355.namprd12.prod.outlook.com ([fe80::4d88:9239:2419:7348%2]) with mapi id 15.20.3455.026; Sat, 10 Oct 2020 16:08:06 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH 6/9] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Set the SwScratch valid bit Date: Sat, 10 Oct 2020 11:07:04 -0500 Message-ID: X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR11CA0033.namprd11.prod.outlook.com (2603:10b6:5:190::46) To DM5PR12MB1355.namprd12.prod.outlook.com (2603:10b6:3:6e::7) Return-Path: thomas.lendacky@amd.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from tlendack-t1.amd.com (165.204.77.1) by DM6PR11CA0033.namprd11.prod.outlook.com (2603:10b6:5:190::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.23 via Frontend Transport; Sat, 10 Oct 2020 16:08:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: abc97712-8f55-43af-a9fe-08d86d36aca8 X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zD5hZ/eqOiVW6HUMwpafQ6FdbHeNeh78NUkoytSe7ll0nzGSyFzX6UKaf7uwkqAUwlk8JmUv112cSoh8yUr2tau3v7j+grtDFG8I+rckmhXP2Jsl/6aLcSFHiDGJhLpkD0aFFtBHY1ULoURfbDsaGd+Kty0wEs17nx5AfABw+3rZvNh5CiTx9CYS/gHEIa67XNRClkDWwTETVOYbSTgzKMFDFd7bt+EMRpl9cq48FLCRh78iTDTzI4dvqi7iSGbhVBz+Txr/ExaMrcptbXeUl9bIxEZhUUCE3VeXLwKdbxyK+2yA13DfRpxWe2OJBTjvnIlUBYyRRzZ5Bpr7b9EYkbBS0avkGQzuOpyHRZtI+S8K86rBx4tRtYPGTwbRgwtl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM5PR12MB1355.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(4636009)(136003)(39860400002)(396003)(346002)(366004)(376002)(478600001)(4326008)(6916009)(2616005)(956004)(86362001)(26005)(54906003)(66476007)(316002)(8676002)(66946007)(66556008)(52116002)(5660300002)(2906002)(83380400001)(36756003)(6486002)(7696005)(16526019)(186003)(8936002)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: qkphZBCUrvNMg8YYqufd892Ao4qXHCVVePSKsJMkVY1hs+m26FZaGLL2faFpPCJn5Q7UVNVh7LHJMrVVlaxOROSNk8Hh9Uwfsn2BI3MA6gpzGGd5n/3JB39leDC2YWuPvhR5hXySiiCItrZtTOUMLDd+BryOKMFl/EgvFCt1o9QAqkSl9TkfR2IcSS7oQ/iFqYz4R73NkecbJv0u1kLtr3hz/vW7gS4n0xpah/EVrh0b8Las3xGJ0dO6u0xJc86UYIvA+ABwhzrnDsE9cQSyuyD8eTyUYRDZvPupxcIQ0bSHqwB2BRxv0L7qzXqLT1a6JhMzm+rvhUL32T+W7sKkiPdEr9115lCukERrO5EsojmMC30ithTsi5bGhD/5HZdPCenxDRRvJRqP0Hnj/mnFDRpgkmoI2co+MUs61rs5WdLu/CCmOQab0wh9mpNgZvkPjYVgX3Vh7zTDOHtc/uVKqZEgzqmh2QYGFfQ6hjjh7nAoo3TRUP28BxTGZaIWJRrGNx2KIIx9E3E44qaiwfSPaT4bHGyk/4AKCBZ9pQjLgOdQGK26CCqC7GzFX5KO+yu/9SNYrTnEsz/FxOSnsotGWvLQ75tvDYgfmxJ7H5Ti1Qab9Jb/BA+PV4FAbqa4CbRmBSgDt9mlr4Lm99eLS/fKuA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: abc97712-8f55-43af-a9fe-08d86d36aca8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR12MB1355.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2020 16:08:06.7490 (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: zWGkl8KirZLVXZOOifPcQTrAVrSfXUqz/D5hTquuCGPBi9VAz3i5wYveeVon6n/56Fr9Ez+c/1cTrstVV44/mw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky All fields that are set in the GHCB should have their associated bit in the GHCB ValidBitmap field set. Add support to set the bit for the scratch area field (SwScratch). Fixes: 437eb3f7a8db ("OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Bypass flash = detection with SEV-ES") Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Signed-off-by: Tom Lendacky --- OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c b/OvmfPk= g/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c index 565383ee26d2..5d5a117c48e0 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlashDxe.c @@ -52,10 +52,15 @@ QemuFlashPtrWrite ( if (MemEncryptSevEsIsEnabled ()) { MSR_SEV_ES_GHCB_REGISTER Msr; GHCB *Ghcb; + UINT32 ScratchIndex; + UINT32 ScratchBit; =20 Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); Ghcb =3D Msr.Ghcb; =20 + ScratchIndex =3D GhcbSwScratch / 8; + ScratchBit =3D GhcbSwScratch & 0x07; + // // Writing to flash is emulated by the hypervisor through the use of w= rite // protection. This won't work for an SEV-ES guest because the write w= on't @@ -66,6 +71,7 @@ QemuFlashPtrWrite ( VmgInit (Ghcb); Ghcb->SharedBuffer[0] =3D Value; Ghcb->SaveArea.SwScratch =3D (UINT64) (UINTN) Ghcb->SharedBuffer; + Ghcb->SaveArea.ValidBitmap[ScratchIndex] |=3D (1 << ScratchBit); VmgExit (Ghcb, SVM_EXIT_MMIO_WRITE, (UINT64) (UINTN) Ptr, 1); VmgDone (Ghcb); } else { --=20 2.28.0