From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by mx.groups.io with SMTP id smtpd.web08.1050.1608082993701030683 for ; Tue, 15 Dec 2020 17:43:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=FQ871Fjr; spf=pass (domain: linux.ibm.com, ip: 148.163.156.1, mailfrom: jejb@linux.ibm.com) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0BG13iv3127230; Tue, 15 Dec 2020 20:43:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=fd9bT+zPaa/CtmtvdoTqN5KlMDGT+FBNQnS9KDa9mpw=; b=FQ871Fjr0iBNm532y1anyYEC4+GZ7Ro3vY2lBywXguv/g9kbboK1r7hktOsSXuFjulPj XoIWyStSlSmM9ZA0fMkxwzH/9JIbk/1wr4fs+A+6JoWlgCzOTKaAbxpLWYCDqbNXbyN1 ce7UUM/zCdm6PrDSDjvTqvEsgi5EI0FfiOns3YYkNamLh5VZ2YwoXizfHr0TkbnRv0TC 3D13cEahKsAzNoJtynN3TbhtSgQpLoUoTwbnnMCbGm0R2jIUScIM7R+XC9gUbfoB40Rh Sk33sEygMcPBrA8WVGEJqVDDhjWIp0n1f7OYM/XWwjeVXNnoKW1JCRJHjFOGVyOXfJmX IA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 35f7ygh3pn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 20:43:07 -0500 Received: from m0098410.ppops.net (m0098410.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0BG1h7qI103628; Tue, 15 Dec 2020 20:43:07 -0500 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 35f7ygh3p7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 15 Dec 2020 20:43:07 -0500 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0BG1h5FE005531; Wed, 16 Dec 2020 01:43:05 GMT Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by ppma02wdc.us.ibm.com with ESMTP id 35cng9463w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Dec 2020 01:43:05 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0BG1h3q221627376 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Dec 2020 01:43:03 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 79463AC065; Wed, 16 Dec 2020 01:43:03 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 83F74AC059; Wed, 16 Dec 2020 01:43:01 +0000 (GMT) Received: from jarvis.int.hansenpartnership.com (unknown [9.80.214.106]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 16 Dec 2020 01:43:01 +0000 (GMT) From: "James Bottomley" To: devel@edk2.groups.io Cc: dovmurik@linux.vnet.ibm.com, Dov.Murik1@il.ibm.com, ashish.kalra@amd.com, brijesh.singh@amd.com, tobin@ibm.com, david.kaplan@amd.com, jon.grimm@amd.com, thomas.lendacky@amd.com, jejb@linux.ibm.com, frankeh@us.ibm.com, "Dr . David Alan Gilbert" , Laszlo Ersek , Jordan Justen , Ard Biesheuvel , "Yao, Jiewen" Subject: [PATCH 2/2] OvmfPkg/AmdSev/SecretDxe: make secret location naming generic Date: Tue, 15 Dec 2020 17:41:46 -0800 Message-Id: <20201216014146.2229-3-jejb@linux.ibm.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201216014146.2229-1-jejb@linux.ibm.com> References: <20201216014146.2229-1-jejb@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2020-12-15_13:2020-12-15,2020-12-15 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=815 clxscore=1015 impostorscore=0 lowpriorityscore=0 mlxscore=0 adultscore=0 malwarescore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012160002 Content-Transfer-Encoding: 8bit It is anticipated that this part of the code will work for both Intel TDX and AMD SEV, so remove the SEV specific naming and change to ConfidentialComputing as a more architecture neutral prefix. Apart from the symbol rename, there are no code changes. Signed-off-by: James Bottomley --- OvmfPkg/OvmfPkg.dec | 2 +- OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf | 2 +- ...SevLaunchSecret.h => ConfidentialComputingSecret.h} | 10 +++++----- OvmfPkg/AmdSev/SecretDxe/SecretDxe.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename OvmfPkg/Include/Guid/{SevLaunchSecret.h => ConfidentialComputingSecret.h} (69%) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index 8a294116efaa..50d7b27d941c 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -117,7 +117,7 @@ [Guids] gLinuxEfiInitrdMediaGuid = {0x5568e427, 0x68fc, 0x4f3d, {0xac, 0x74, 0xca, 0x55, 0x52, 0x31, 0xcc, 0x68}} gQemuKernelLoaderFsMediaGuid = {0x1428f772, 0xb64a, 0x441e, {0xb8, 0xc3, 0x9e, 0xbd, 0xd7, 0xf8, 0x93, 0xc7}} gGrubFileGuid = {0xb5ae312c, 0xbc8a, 0x43b1, {0x9c, 0x62, 0xeb, 0xb8, 0x26, 0xdd, 0x5d, 0x07}} - gSevLaunchSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}} + gConfidentialComputingSecretGuid = {0xadf956ad, 0xe98c, 0x484c, {0xae, 0x11, 0xb5, 0x1c, 0x7d, 0x33, 0x64, 0x47}} [Ppis] # PPI whose presence in the PPI database signals that the TPM base address diff --git a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf index 62ab00a3d382..40bda7ff846c 100644 --- a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf +++ b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf @@ -27,7 +27,7 @@ [LibraryClasses] UefiDriverEntryPoint [Guids] - gSevLaunchSecretGuid + gConfidentialComputingSecretGuid [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdSevLaunchSecretBase diff --git a/OvmfPkg/Include/Guid/SevLaunchSecret.h b/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h similarity index 69% rename from OvmfPkg/Include/Guid/SevLaunchSecret.h rename to OvmfPkg/Include/Guid/ConfidentialComputingSecret.h index dfd89646651b..7026fc5b089f 100644 --- a/OvmfPkg/Include/Guid/SevLaunchSecret.h +++ b/OvmfPkg/Include/Guid/ConfidentialComputingSecret.h @@ -6,12 +6,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -#ifndef SEV_LAUNCH_SECRET_H_ -#define SEV_LAUNCH_SECRET_H_ +#ifndef CONFIDENTIAL_COMPUTING_SECRET_H_ +#define CONFIDENTIAL_COMPUTING_SECRET_H_ #include -#define SEV_LAUNCH_SECRET_GUID \ +#define CONFIDENTIAL_COMPUTING_SECRET_GUID \ { 0xadf956ad, \ 0xe98c, \ 0x484c, \ @@ -21,8 +21,8 @@ typedef struct { UINT64 Base; UINT64 Size; -} SEV_LAUNCH_SECRET_LOCATION; +} CONFIDENTIAL_COMPUTING_SECRET_LOCATION; -extern EFI_GUID gSevLaunchSecretGuid; +extern EFI_GUID gConfidentialComputingSecretGuid; #endif // SEV_LAUNCH_SECRET_H_ diff --git a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c index 5385a6aea275..308022b5b25e 100644 --- a/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c +++ b/OvmfPkg/AmdSev/SecretDxe/SecretDxe.c @@ -6,9 +6,9 @@ **/ #include #include -#include +#include -STATIC SEV_LAUNCH_SECRET_LOCATION mSecretDxeTable = { +STATIC CONFIDENTIAL_COMPUTING_SECRET_LOCATION mSecretDxeTable = { FixedPcdGet32 (PcdSevLaunchSecretBase), FixedPcdGet32 (PcdSevLaunchSecretSize), }; @@ -21,7 +21,7 @@ InitializeSecretDxe( ) { return gBS->InstallConfigurationTable ( - &gSevLaunchSecretGuid, + &gConfidentialComputingSecretGuid, &mSecretDxeTable ); } -- 2.26.2