From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.158.5]) by mx.groups.io with SMTP id smtpd.web12.4474.1608107259223227395 for ; Wed, 16 Dec 2020 00:27:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@ibm.com header.s=pp1 header.b=imHmQ17K; spf=none, err=permanent DNS error (domain: linux.vnet.ibm.com, ip: 148.163.158.5, mailfrom: dovmurik@linux.vnet.ibm.com) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 0BG81opn058760; Wed, 16 Dec 2020 03:27:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : message-id : references : mime-version : content-type : in-reply-to; s=pp1; bh=CDcxK8oJDVfKL+QIJqYWV7+IX+BByjc0HSgagMt0Alg=; b=imHmQ17KydlWZ/l+YtZjIuYOxJrV5mnZKQiQfNeZnNWlPcBNSWoEmFBPWxQFpbnxZ0Ug jrdvvjMZhWUYshwcg2RiiTJ7qjPtVseLgs3A1nhj836OOr9Czt+ZfSUkjec4L74J4SXZ IY60dn6/F9sFimP96Ab1hcwhsvO3YlAyNg2jEC+cVn+WKFpWZeIIY0LPwNN0jmLjQjl/ 2rfWIi2gnyCiBbA4cMxLDlNfHowqTT1KJew/K6pLQjUyzz7zvvp8ZmOD5coVoLEayEWo VpPwhRke/ezgAQ1UiCnr/jWvWyh9LcqRpbYQagGCEM6mOoE/kABdrIWC646CzNOg+Mw5 CA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com with ESMTP id 35fcdfuqa6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Dec 2020 03:27:35 -0500 Received: from m0098413.ppops.net (m0098413.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 0BG82Nn0061318; Wed, 16 Dec 2020 03:27:35 -0500 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 35fcdfuq8f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Dec 2020 03:27:34 -0500 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 0BG8MDII014596; Wed, 16 Dec 2020 08:27:31 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03ams.nl.ibm.com with ESMTP id 35cng8c2fg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Dec 2020 08:27:31 +0000 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 0BG8RShF27787684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Dec 2020 08:27:28 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7BB5FA4068; Wed, 16 Dec 2020 08:27:28 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 19532A4060; Wed, 16 Dec 2020 08:27:27 +0000 (GMT) Received: from amdrome1 (unknown [9.2.130.16]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Wed, 16 Dec 2020 08:27:26 +0000 (GMT) Date: Wed, 16 Dec 2020 03:27:13 -0500 From: "Dov Murik" To: James Bottomley Cc: devel@edk2.groups.io, 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, frankeh@us.ibm.com, "Dr . David Alan Gilbert" , Laszlo Ersek , Jordan Justen , Ard Biesheuvel , "Yao, Jiewen" Subject: Re: [PATCH 2/2] OvmfPkg/AmdSev/SecretDxe: make secret location naming generic Message-ID: <20201216082713.GA181797@amdrome1> References: <20201216014146.2229-1-jejb@linux.ibm.com> <20201216014146.2229-3-jejb@linux.ibm.com> MIME-Version: 1.0 In-Reply-To: <20201216014146.2229-3-jejb@linux.ibm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2020-12-16_02:2020-12-15,2020-12-16 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 spamscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 clxscore=1011 phishscore=0 malwarescore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012160047 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Dec 15, 2020 at 05:41:46PM -0800, James Bottomley wrote: > 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 > **/ The comment at the top of this file (not visible in this diff) also mentions "SEV Launch Secret" which should be renamed to "Confidential Computing Secret". -Dov > > -#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 >