From nobody Tue Feb 10 08:28:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+89948+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1653267773377994.5039560917128; Sun, 22 May 2022 18:02:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WqqNYY1788612x7mO6POoe3n; Sun, 22 May 2022 18:02:53 -0700 X-Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.41]) by mx.groups.io with SMTP id smtpd.web12.288.1653060563251388879 for ; Fri, 20 May 2022 08:29:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k1vID3+lPPQHjaEFsL+Z8UcGkKsd9BL8EOG7qVBhDW6wZ7uv60QI++Ed7PLDwej5rSpEJ2r/2GXB/WRpCx4ORRzTzJxLuECMaVESSVN+PTiKaOLlZY2aJPSSEYMPoyewiJpVDm79sRcip0UvwPgu5dAD+fIUOJod0nHqOndquyTkEVLUhOFU30D5L31GW6vI6cOTjRLQmbE0f3OqL3L7ZVjEvNXDr9IZt/ICE4GICH5bqWXoO5ojx1AVpwIdVcDVkd4CyUHlgC5XAjMoLkwdT3rYIIRX8pKP2YEbUuiqHBjJaNtmiOpf846BTdGhGZACIjH/U19qxABJ7qJkcSvgOA== 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=yaUi0LuDwX01sbQw5cqEJCK45GSPvqlB/lGSnu02mY8=; b=LJL62rvPBUycjldxSqOg+XrDfKtUnKYT/cBjNezuUHS8+6EH4I8BgdVXoi6eDIzxZ2Xrilh+hXHkrMxcByh4VYbAJRD7GRmkICgaDKHeKTKMOkBwAB7FZAagK+dZyj9c/IreLDIchK1T6uV8ouXB53i4NSmjFwJpnegJXkwsMsJikyGApObB20GsaDC1JgqZ55YT75ZWvggm7CsO+S3u2a/YInHFT6rncA7IALcIGrmqP+Tu3Vf/5RmkvH89BOfxOYtI3ilsBRwY/VnqcfqsNmRSsusrzHm2P39PpAkqohqzmIx+K1g9NaPw7eQjTVKD/TvhzgHVAJcWhsI6549BcA== 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 X-Received: from DM6PR13CA0065.namprd13.prod.outlook.com (2603:10b6:5:134::42) by DM4PR12MB5102.namprd12.prod.outlook.com (2603:10b6:5:391::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Fri, 20 May 2022 15:29:21 +0000 X-Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::e4) by DM6PR13CA0065.outlook.office365.com (2603:10b6:5:134::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Fri, 20 May 2022 15:29:21 +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 (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+89948+1787277+3901457@groups.io; helo=mail02.groups.io; 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; pr=C X-Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Fri, 20 May 2022 15:29:21 +0000 X-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, 20 May 2022 10:29:20 -0500 From: "Michael Roth via groups.io" To: CC: Tom Lendacky , "Ni, Ray" Subject: [edk2-devel] [PATCH v3 3/4] OvmfPkg: Initialize the PcdSevSnpSecretsAddress PCD during PEI phase Date: Fri, 20 May 2022 10:27:29 -0500 Message-ID: <20220520152730.7924-4-michael.roth@amd.com> In-Reply-To: <20220520152730.7924-1-michael.roth@amd.com> References: <20220520152730.7924-1-michael.roth@amd.com> MIME-Version: 1.0 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: 4719671b-f240-421f-7cf7-08da3a75835b X-MS-TrafficTypeDiagnostic: DM4PR12MB5102:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: pZdnTJJnqLUD6hOGD8odtsa0bXJMMCUId/1qXzwCux2SQa+ifPmu5xluKXC93Vay0DorFORvvldoxICLbdJoq9aXRoDIpejujY1LeMRkEI1/ozAWmv033jrL2eYVKFRMKWwhtmxcITTVq8BZ0aYbFSayWQUkESOhnr60nTCORBcTAPgxnRZwrIW1/O8/Vs331u2X8m+DTihQ0L1tPYGXMT3fTezBE79lvYgTqsJKGtTr0oCRya+ZCjrL9aAToHZb8wygGCjfOjBIvqUaUoP51JGsu6BnLSookP296Cb9GQYsPcJziU1hWi3VmKyKzijlmqkBqgt2C4hoGKG4js7oo/0Vs/PaUEyqBvyxp/XpNs0/Cbyi7CERz8e/dC70dSdgaFIHWc88ROu+Pz5kacFO87sA96FQvjDoeDdWekbzy3DTki6YxtYmJwtnEBGJk6qO9vT17f+v6177DELAlvbjMP7R2sKpqUt707Dz454C5gJVFsXh34L+cl27iHtffd4G02Q6Wr3YB7gcTvP3FG6LoI1HzaqvLerhvHW7AXUJgdwV3Ee7i0AVyw1AAyvh/PymjgVEiXL1k6Kc3oIjZb6hakseVPIS/HkZOI3GoKHLn0PzCXWC2dAv7Tk4pYXXQ/buJdWITnZEs0rJHFdfchklnTmIo01utiiKznpGcrUQcCZZzl72BpnPW490bq+2FYerGFwpxOX62KRQzI9XfhOkyWJbk3lB0NAjHaxVq349d8+AFMlvWsWO7NskpDJICfKj X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2022 15:29:21.4648 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4719671b-f240-421f-7cf7-08da3a75835b 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: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5102 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.roth@amd.com X-Gm-Message-State: Y3PW0CLH33HuoB9cU4nWuUkLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1653267773; bh=x5/CSNax19rK1pRXcqdBowHEXv6Wr0sGar6VKCgpLdQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=eTLH8gEUo3y5tTDOh8TwVD1/XGmryNI8UJtvtRqOvb11w83/Gy2aNCR9a5AnQDfvwrD oDa7AdYRrnkqdGasq9soj3P3mLR5yIjO/Bx5ZcsBdvNYSAGH4oadJ5ot0yGQUF6Bz/cGj CzyR63Gqz2p26Ep5GauSnH9u0HBAlcFwEII= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1653267775483100013 Content-Type: text/plain; charset="utf-8" This needs to be set so that UefiCpuPkg can locate the SEV-SNP secrets page later to set the AP Jump Table address. Signed-off-by: Michael Roth --- OvmfPkg/AmdSev/AmdSevX64.dsc | 3 +++ OvmfPkg/CloudHv/CloudHvX64.dsc | 3 +++ OvmfPkg/IntelTdx/IntelTdxX64.dsc | 3 +++ OvmfPkg/Microvm/MicrovmX64.dsc | 3 +++ OvmfPkg/OvmfPkgIa32.dsc | 3 +++ OvmfPkg/OvmfPkgIa32X64.dsc | 3 +++ OvmfPkg/OvmfPkgX64.dsc | 3 +++ OvmfPkg/PlatformPei/AmdSev.c | 5 +++++ OvmfPkg/PlatformPei/PlatformPei.inf | 1 + 9 files changed, 27 insertions(+) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index bead9722ea..c0a3548f22 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -576,6 +576,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + !include OvmfPkg/OvmfTpmPcds.dsc.inc =20 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000 diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 92664f319b..ba4c14dd02 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -631,6 +631,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + [PcdsDynamicHii] !include OvmfPkg/OvmfTpmPcdsHii.dsc.inc =20 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX6= 4.dsc index 00bc1255bc..c069bd9d1e 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -513,6 +513,9 @@ =20 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + ##########################################################################= ###### # # Components Section - list of all EDK II Modules needed by this Platform. diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index f8fc977cb2..774e5e2ca9 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -614,6 +614,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + ##########################################################################= ###### # # Components Section - list of all EDK II Modules needed by this Platform. diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index c16a840fff..a531fcd070 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -650,6 +650,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + !if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000 !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index d3a80cb568..cd579246f8 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -658,6 +658,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + !if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000 !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 7b3d48aac4..a026706279 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -683,6 +683,9 @@ # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 + # Set SEV-SNP Secrets page address default + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress|0 + !if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|100000000 !endif diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 385562b44c..70352ca43b 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -408,6 +408,11 @@ AmdSevInitialize ( // if (MemEncryptSevSnpIsEnabled ()) { PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdS= evSnp); + ASSERT_RETURN_ERROR (PcdStatus); + PcdStatus =3D PcdSet64S ( + PcdSevSnpSecretsAddress, + (UINT64)(UINTN)PcdGet32 (PcdOvmfSnpSecretsBase) + ); } else if (MemEncryptSevEsIsEnabled ()) { PcdStatus =3D PcdSet64S (PcdConfidentialComputingGuestAttr, CCAttrAmdS= evEs); } else { diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 00372fa0eb..c688e4ee24 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -114,6 +114,7 @@ gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask + gEfiMdePkgTokenSpaceGuid.PcdSevSnpSecretsAddress =20 [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#89948): https://edk2.groups.io/g/devel/message/89948 Mute This Topic: https://groups.io/mt/91279453/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-