From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.74425.1669986637790697739 for ; Fri, 02 Dec 2022 05:10:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=YqyeXLF3; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669986636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XaX3cKPrckFuzvy54tGOaKAv4kfzdyVEe6ogXvgDdTw=; b=YqyeXLF3ILK3TsRTmYBmzDp0sUEWs12jnn8Js2hgn+bjzoP3OLpW0Acp2aPEPK394ucggv KNdJsjLcXPnLdAwRUqerdsNRcsX94OdC/P1BdwC1s17HrT14eSSedWRRFNGxD3B4vpQgE2 45V3G0vkrOu9u9hLOJwax4uurjQc+hA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-470-O3GrG7DxMS-Ll723i-Qk_g-1; Fri, 02 Dec 2022 08:10:33 -0500 X-MC-Unique: O3GrG7DxMS-Ll723i-Qk_g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C1A4185A794; Fri, 2 Dec 2022 13:10:32 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7A9A1402BDC; Fri, 2 Dec 2022 13:10:31 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 00EE81801561; Fri, 2 Dec 2022 14:10:10 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Bob Feng , Yuwei Chen , Erdem Aktas , Jordan Justen , Peter Grehan , Rebecca Cran , Liming Gao , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao , Min Xu , Brijesh Singh , Oliver Steffen , Pawel Polawski , Tom Lendacky , James Bottomley Subject: [PATCH 11/14] OvmfPkg/PlatformPei: remove mFeatureControlValue Date: Fri, 2 Dec 2022 14:10:06 +0100 Message-Id: <20221202131009.3190040-12-kraxel@redhat.com> In-Reply-To: <20221202131009.3190040-1-kraxel@redhat.com> References: <20221202131009.3190040-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true Use PlatformInfoHob->FeatureControlValue instead. OnMpServicesAvailable() will find PlatformInfoHob using GetFirstGuidHob() and pass a pointer to the WriteFeatureControl callback. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Library/PlatformInitLib.h | 2 ++ OvmfPkg/PlatformPei/Platform.h | 2 +- OvmfPkg/PlatformPei/FeatureControl.c | 44 ++++++++++++++++------- OvmfPkg/PlatformPei/Platform.c | 2 +- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/OvmfPkg/Include/Library/PlatformInitLib.h b/OvmfPkg/Include/Library/PlatformInitLib.h index c5234bf26d45..da7ed76041d2 100644 --- a/OvmfPkg/Include/Library/PlatformInitLib.h +++ b/OvmfPkg/Include/Library/PlatformInitLib.h @@ -48,6 +48,8 @@ typedef struct { UINT32 S3AcpiReservedMemoryBase; UINT32 S3AcpiReservedMemorySize; + + UINT64 FeatureControlValue; } EFI_HOB_PLATFORM_INFO; #pragma pack() diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 86f603ff649c..1cf44844a781 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -70,7 +70,7 @@ MemTypeInfoInitialization ( VOID InstallFeatureControlCallback ( - VOID + IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob ); VOID diff --git a/OvmfPkg/PlatformPei/FeatureControl.c b/OvmfPkg/PlatformPei/FeatureControl.c index 5864ee0c214d..d8a398cd5565 100644 --- a/OvmfPkg/PlatformPei/FeatureControl.c +++ b/OvmfPkg/PlatformPei/FeatureControl.c @@ -8,6 +8,7 @@ **/ #include +#include #include #include #include @@ -16,11 +17,6 @@ #include "Platform.h" -// -// The value to be written to the Feature Control MSR, retrieved from fw_cfg. -// -STATIC UINT64 mFeatureControlValue; - /** Write the Feature Control MSR on an Application Processor or the Boot Processor. @@ -38,10 +34,22 @@ WriteFeatureControl ( IN OUT VOID *WorkSpace ) { + EFI_HOB_PLATFORM_INFO *PlatformInfoHob = WorkSpace; + if (TdIsEnabled ()) { - TdVmCall (TDVMCALL_WRMSR, (UINT64)MSR_IA32_FEATURE_CONTROL, mFeatureControlValue, 0, 0, 0); + TdVmCall ( + TDVMCALL_WRMSR, + (UINT64)MSR_IA32_FEATURE_CONTROL, + PlatformInfoHob->FeatureControlValue, + 0, + 0, + 0 + ); } else { - AsmWriteMsr64 (MSR_IA32_FEATURE_CONTROL, mFeatureControlValue); + AsmWriteMsr64 ( + MSR_IA32_FEATURE_CONTROL, + PlatformInfoHob->FeatureControlValue + ); } } @@ -67,6 +75,15 @@ OnMpServicesAvailable ( { EFI_PEI_MP_SERVICES_PPI *MpServices; EFI_STATUS Status; + EFI_HOB_PLATFORM_INFO *PlatformInfoHob; + EFI_HOB_GUID_TYPE *GuidHob; + + GuidHob = GetFirstGuidHob (&gUefiOvmfPkgPlatformInfoGuid); + if (GuidHob == NULL) { + return EFI_UNSUPPORTED; + } + + PlatformInfoHob = (EFI_HOB_PLATFORM_INFO *)GET_GUID_HOB_DATA (GuidHob); DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__)); @@ -80,7 +97,7 @@ OnMpServicesAvailable ( WriteFeatureControl, // Procedure FALSE, // SingleThread 0, // TimeoutInMicroSeconds: inf. - NULL // ProcedureArgument + PlatformInfoHob // ProcedureArgument ); if (EFI_ERROR (Status) && (Status != EFI_NOT_STARTED)) { DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status)); @@ -90,7 +107,7 @@ OnMpServicesAvailable ( // // Now write the MSR on the BSP too. // - WriteFeatureControl (NULL); + WriteFeatureControl (PlatformInfoHob); return EFI_SUCCESS; } @@ -107,7 +124,7 @@ STATIC CONST EFI_PEI_NOTIFY_DESCRIPTOR mMpServicesNotify = { VOID InstallFeatureControlCallback ( - VOID + IN OUT EFI_HOB_PLATFORM_INFO *PlatformInfoHob ) { EFI_STATUS Status; @@ -119,7 +136,7 @@ InstallFeatureControlCallback ( &FwCfgItem, &FwCfgSize ); - if (EFI_ERROR (Status) || (FwCfgSize != sizeof mFeatureControlValue)) { + if (EFI_ERROR (Status) || (FwCfgSize != sizeof (PlatformInfoHob->FeatureControlValue))) { // // Nothing to do. // @@ -127,7 +144,10 @@ InstallFeatureControlCallback ( } QemuFwCfgSelectItem (FwCfgItem); - QemuFwCfgReadBytes (sizeof mFeatureControlValue, &mFeatureControlValue); + QemuFwCfgReadBytes ( + sizeof (PlatformInfoHob->FeatureControlValue), + &(PlatformInfoHob->FeatureControlValue) + ); Status = PeiServicesNotifyPpi (&mMpServicesNotify); if (EFI_ERROR (Status)) { diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index ebce2ba1290e..148240342b4b 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -396,7 +396,7 @@ InitializePlatform ( } IntelTdxInitialize (); - InstallFeatureControlCallback (); + InstallFeatureControlCallback (PlatformInfoHob); return EFI_SUCCESS; } -- 2.38.1