From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.72]) by mx.groups.io with SMTP id smtpd.web08.8183.1652448215746526968 for ; Fri, 13 May 2022 06:23:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=KDg3jJ7n; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.237.72, mailfrom: michael.roth@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YkFIjtMD+/pak4Gv1JLOgf+4QDi1/TrY7o6MQCBrXamsgW7zx7f7nQwt+J5jQCT69Ek0tbaFy88zDY+1GWWRYUzr0H3AOz7gAcaiKjczjYLGBWgQb0On9LTTK/tK4Uol4XjI8HfmLclM/FJLWvn9pYwmrmAzXNGp9BwZBqGqmSz2KhYheFwrDp13+5ZtYpb8/D0oafXEWmRDRodGIT0Cf29M+3gra4qMjmcxNw66SBWDtbrJt6M8cSMyKNSgHaWiCZd2KdzrudOgVzfTDXAyWtjG8GyM6jYorAd2wkx668EMOEGTjK/pcNFy78jB2lbYSr51j+nvmX6J9KFlhRtN8A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KL44T1VHTDFn+QJxhABRAtumeg9aOlOcncCgn7uyzHg=; b=YVscMj2VnFe4J3sz9VmCusHXlvoalWxAM9IhoYjuhE8yZmyU7I7442QMlUn55cJzMaNcHuJEgOuNqGxIKub4DHafHlWcYPbDnsN/JvjFBIsg3vtvgIXX0dXppRPi3WyHixXcSWqgy5bs98iNForB4C1uDpfczSdTUXG+3JT4+VgyZIzW9Ytps2jFBlRK7ythBd56D3foatEWzfucexKLpzilZRDupeCnHo6J8DsOgbYo8aj6diJEY4OLtO69HlwohHO8B0gkN1EC+M0KX06HnWBpHvrrbgwyUlYVlE7Akkcz+egv9eglLylAmsFeyr1tGktxrbcsoIOPQbcchZGC3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); 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=KL44T1VHTDFn+QJxhABRAtumeg9aOlOcncCgn7uyzHg=; b=KDg3jJ7n/PgIMBMvAgWMfrFskyZFZBop91rkIoihYNKFan4LcU/tUndcCVsgu5B9dtRCjMc6ioLm2/vOhf7pF7Cfw5HehhdIK88wApLioJLqKyswXghOTMnkpEqMLues4fLRdGx7GqDduxSFVgn0zufoH01cM4tFv7Bqj9VIe60= Received: from DM6PR03CA0079.namprd03.prod.outlook.com (2603:10b6:5:333::12) by SJ0PR12MB5470.namprd12.prod.outlook.com (2603:10b6:a03:3bd::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Fri, 13 May 2022 13:23:33 +0000 Received: from DM6NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:5:333:cafe::60) by DM6PR03CA0079.outlook.office365.com (2603:10b6:5:333::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14 via Frontend Transport; Fri, 13 May 2022 13:23:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT052.mail.protection.outlook.com (10.13.172.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5250.13 via Frontend Transport; Fri, 13 May 2022 13:23:33 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 13 May 2022 08:23:32 -0500 From: Michael Roth To: CC: Tom Lendacky Subject: [PATCH] OvmfPkg/AmdSevDxe: Update ConfidentialComputing blob struct definition Date: Fri, 13 May 2022 08:22:24 -0500 Message-ID: <20220513132224.397601-1-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Return-Path: Michael.Roth@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3b7eefa1-fa1a-4021-bc65-08da34e3c73b X-MS-TrafficTypeDiagnostic: SJ0PR12MB5470:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aJfRs7RXhANYC307IwcGc51GWctqzpjDnteTgMuzcpNgthgI4PltY5V10VMNzWX9O58w4tqRG4hSWq+ngyaSW0V1qPEhcQCx0wx9rrZoWC/Q94SYSIJf7CyaCiXwthB5E2/ol9lPfSXcLU0XondirDjbeJobQqOmS2KJGXLIEbsX95yKau+FIC3w/QZiXYuwnTw7cM7qD7PH99sDGnnWDEabHPxyQhNwNxwnz3m8/pD7UN+bTjup0qGq+54yTZKxLnfXwH6ex+CPxsGzz0VyLLUoJy1iak9JouUaCaOau0YNAdr2L4nyEu7j9MJ6e/5I8frdevqJPM/o7TK9jZPIq+KlH6OwTXCLfL0+RGCXXAZPi/FZ+RnCrVuT+KNQeo6y0IAX3tURtwpvjz9oCSYL3C1APIWAfgnEiKyJDD7w1UnZoXvEvP1jgyqAO+aJd3QjYXcmGAysQUYs04p4ViPSpwwVzRiBeP3nSnM3CuIUE5nO68wGlwF0gYYZaTggf0L8tV/JRcLicdZt1FOPUDA/9/Iq43YcTPzB85teWNRETaWW9pzQwVcVC8lFSjyepG4WbLRdkXxsXlsS01ogm2IxQQYo8CPhsrLKIewziChwClA9IgErmhWBe+u21I69oR9pv8o8hdPvvroSWpH7mH20tKbBu9+FLtYfh7RXkP0bCeTmg0pMNpW5OmSjDbsQDHm5zHJXhwQ6XY7VroPkq3Lppg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(6916009)(36756003)(70206006)(70586007)(6666004)(8676002)(82310400005)(8936002)(356005)(81166007)(83380400001)(4326008)(316002)(508600001)(16526019)(5660300002)(336012)(47076005)(426003)(44832011)(26005)(15650500001)(2616005)(186003)(2906002)(1076003)(86362001)(40460700003)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2022 13:23:33.0210 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b7eefa1-fa1a-4021-bc65-08da34e3c73b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5470 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain The Confidential Computing blob defined here is intended to match the definition defined by linux guest kernel. Previously, both definitions relied on natural alignment, but that relies on both OVMF and kernel being compiled as 64-bit. While there aren't currently any plans to enable SNP support for 32-bit compilations, the kernel definition has since been updated to use explicit padding/reserved fields to avoid this dependency. Update OVMF to match that definition. No functional changes (for currently-supported environments, at least). Signed-off-by: Michael Roth --- OvmfPkg/AmdSevDxe/AmdSevDxe.c | 2 ++ OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c index 662d3c4ccb..ee6d2528d9 100644 --- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c +++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c @@ -27,8 +27,10 @@ STATIC CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION mSnpBoo= tDxeTable =3D { 0,=0D (UINT64)(UINTN)FixedPcdGet32 (PcdOvmfSnpSecretsBase),=0D FixedPcdGet32 (PcdOvmfSnpSecretsSize),=0D + 0,=0D (UINT64)(UINTN)FixedPcdGet32 (PcdOvmfCpuidBase),=0D FixedPcdGet32 (PcdOvmfCpuidSize),=0D + 0,=0D };=0D =0D EFI_STATUS=0D diff --git a/OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h b/OvmfP= kg/Include/Guid/ConfidentialComputingSevSnpBlob.h index b328310fd0..83620e31b8 100644 --- a/OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h +++ b/OvmfPkg/Include/Guid/ConfidentialComputingSevSnpBlob.h @@ -18,14 +18,16 @@ { 0x85, 0x54, 0x93, 0xd7, 0x77, 0x91, 0x2d, 0x42 }, \=0D }=0D =0D -typedef struct {=0D +typedef PACKED struct {=0D UINT32 Header;=0D UINT16 Version;=0D - UINT16 Reserved1;=0D + UINT16 Reserved;=0D UINT64 SecretsPhysicalAddress;=0D UINT32 SecretsSize;=0D + UINT32 Reserved1;=0D UINT64 CpuidPhysicalAddress;=0D UINT32 CpuidLSize;=0D + UINT32 Reserved2;=0D } CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION;=0D =0D extern EFI_GUID gConfidentialComputingSevSnpBlobGuid;=0D --=20 2.25.1