From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (NAM12-MW2-obe.outbound.protection.outlook.com [40.107.244.44]) by mx.groups.io with SMTP id smtpd.web10.9748.1602346095645589579 for ; Sat, 10 Oct 2020 09:08:15 -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=ig8u1qaZ; spf=none, err=SPF record not found (domain: amd.com, ip: 40.107.244.44, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=htyw+6UXwPD+DnhPGuhJwAy7WVobcBzi1uJ+KlwHlXZ+izFW08NhYInwj0z4NC9zHzbFOTzO3wn9oOpW0Qcgo97YGLOs/lyYapc6d3gqG1vb2/qnFVvc/bp4/qVN6Rt1i1s6UIWuufyIsejpJJHyHFI2X+8FxnWckrYAqPqhvc+y02nFICEuiHaeIGsq59dSppe1Bh3+W+WjNFAJAoCpZQgmiRApH9//gS/6fO955eXYZID11bk5gvyDWk03IOevMDsjMrPhv9Tsj5xhSsIZR0czkY90/1lSrhEi2agUCKydcc+fbESrfpmlr9nf/8gp3pALyPT275EU9eVKdavYfA== 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=+weVdUrQCbq90S8cvTftILwsAk2pj8d2L21Ax9oE9mQ=; b=Gkmu0fEMyV+yaO9oi9vLGfZJu88iIDtImNTOrDEnwkuT1I74Cqz+P7WuR88Zj0FNaiovjJazxNKeme3q7Qlz6qzbJQ1/hs2DVwkxgDUKoLZ55D01nQt1ERchci7yLnnkG/9NUZv0eXBoEsRy+YSSuynUp4Ra5/8PJc/1tYMMORsaFnO7bk85wb3mC18PaOdHgG0CRif5AJfdvjRrTFs3DSWLHEmlJsul46P17fjrrA9iqLN6L3j7wYE+7C0VdxZ+uEJHTNduo6a0vKn0eF9G9ASQajjkatDO+DeW2og4Ccq1OLlEz5L6PHm2Zo7NjRF8b5t9zr8hD3XSYhQ5jILQmg== 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=+weVdUrQCbq90S8cvTftILwsAk2pj8d2L21Ax9oE9mQ=; b=ig8u1qaZsxz8a/dIodKrbG+1DLbnlzN8n7j/Go/cnd/NWhC+ma94NQRZbXPYkJJ7jlE/XvYRsNf7DxViqZUJbQz6byoBL7lbfkUaI6oG3YLAzZ411hdKgtoWvT4nNx/TQhWu8tOnue27hjPGZNDjDr47vx5/wdfXYzcuZjA2xAw= 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:14 +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:14 +0000 From: "Lendacky, Thomas" To: devel@edk2.groups.io CC: Brijesh Singh , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Subject: [PATCH 7/9] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Fix erase blocks for SEV-ES Date: Sat, 10 Oct 2020 11:07:05 -0500 Message-ID: <9d802710d0a2de6032bf3d645d72a8f90f12a235.1602346027.git.thomas.lendacky@amd.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR04CA0037.namprd04.prod.outlook.com (2603:10b6:3:12b::23) 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 DM5PR04CA0037.namprd04.prod.outlook.com (2603:10b6:3:12b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.21 via Frontend Transport; Sat, 10 Oct 2020 16:08:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8c4a0b36-91d0-4bb3-da98-08d86d36b13d X-MS-TrafficTypeDiagnostic: DM5PR1201MB0122: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1303; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nzWV/UiM5f874nDR6C/Th5WkICjNF2HpkB/W3JbusXI7EB4X7teeXObnfxg8+F9U33F5npL7sDD4DuOVsyPLCr5N3OQs+soa8fhOCaKbmnfPz2qXdk6vhX0bibPdNFvvcu3Omsm7tVKcNfK7sbQ7j2WCd9WOLc/SsyR+2HM1gdTnO80txx2fVCGX+2uup7Aiv+M8dmpFZTS5wBRRg9xgt3aPdLhd1OVufJc8DAiNJhLP46+uaBVntItEyS28YF69dChhQ376nwJn3fQ572SnRQsH8xntro2IsEubFUKXJ0EnAVIOXCWt3Qv5tL0tB1FMg5SFPP9bx+Hg1/m7SGM1j0fTnQaC6jYK3wt7Sj21/qT/ocY3ljkrZ2fGRiqgQrsv 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:(4636009)(136003)(39860400002)(396003)(346002)(366004)(376002)(478600001)(4326008)(6916009)(2616005)(956004)(86362001)(26005)(54906003)(66476007)(316002)(8676002)(66946007)(6666004)(66556008)(52116002)(5660300002)(2906002)(83380400001)(36756003)(6486002)(7696005)(16526019)(186003)(8936002)(213903007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: QS/sEQJifyZWdpTKqbw/uOULvcQ5xuOOTnDpLyAS9x74HpQYA7uhpLS1xRBbpAdYMusHQTE/N0tRjcvlgpmISxl1SC6cV0X5no9tFyTrjW1x5S+NGvKJc0Sj6ulXe8YlAVvGCeCEdzGDTeGp5OoNUcnuv5MUSbB5XT14OAAWjHU+hy0WDZit0Y5NnaTVHQOuuJaU7YTI+ztWfCDmbWszG4wS3YzJKkFy/QP84xJ0Fbe8+IW5F2+v5Wh9kH9WyyuxLTifwk8NyUiMBxe8t96xmtqeETNcWBh7VrzalIpF7Y5d4en186hGLXCvVBnIgRwDSwzlR0zQ7YgSt/qprJ1JxRKbjqHVfmULTUf2Uv6vmeFIq7xY2l+vwHH+H4Nk00U3GvkZ1r7sEV8Vg/0iwn2mC2dd53Kpz3ETyIU22obf/MjG5keZhLNpqOFTzhFvSVNwReMIRJjxAJnJIrZne4byOZWPZn8k7mdEaROvihcDagZllp54R52GOLCmK1waB7kiZdtnjyT1qncZkwQGkVHrSndG5ixQtZbSwdQp8fJXl8uK8K6eA6sW5gbhflcCfWTEWqKMFV0ITIi/dALGjTGqr8AL5EUwh3jAMeoN4RgMzfcmZbFH/nKPBG78qoqeG1KYUStvi8CP8We3C3l857d+XA== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c4a0b36-91d0-4bb3-da98-08d86d36b13d 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:14.4146 (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: YWB30LZkij1gr5UKljVRLsjboKXAeAt7KAXAXGILw7e+FocqXSC9/F61Vur2NXM8sBXgven9LLSBM6ZE+G+OUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR1201MB0122 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Tom Lendacky The original SEV-ES support missed updating the QemuFlashEraseBlock() function to successfully erase blocks. Update QemuFlashEraseBlock() to call the QemuFlashPtrWrite() to be able to successfully perform the commands under SEV-ES. 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/QemuFlash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/Q= emuFlashFvbServicesRuntimeDxe/QemuFlash.c index 0d29bf701aca..d19997032ec9 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c @@ -232,8 +232,8 @@ QemuFlashEraseBlock ( } =20 Ptr =3D QemuFlashPtr (Lba, 0); - *Ptr =3D BLOCK_ERASE_CMD; - *Ptr =3D BLOCK_ERASE_CONFIRM_CMD; + QemuFlashPtrWrite (Ptr, BLOCK_ERASE_CMD); + QemuFlashPtrWrite (Ptr, BLOCK_ERASE_CONFIRM_CMD); return EFI_SUCCESS; } =20 --=20 2.28.0