From nobody Mon Feb 9 19:30:22 2026 Delivered-To: importer@patchew.org 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+111073+1787277+3901457@groups.io; helo=mail02.groups.io; 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+111073+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699660747; cv=none; d=zohomail.com; s=zohoarc; b=B37KRSVHlpxHp88I3bbtNT3QKZ1rA5tkcJ0MbGtnKxnFfyIjSk/UJPKg773CEGJFKnt9sYOFizDQ9GrBYWVJLOh/rBDnJ0tP3wMqiEekWWNT7PqzQxm5zoRT7kK0MtFBA8ETYwZGQgW5bzImPNuZ4Ih6f+dmoKDY/Ca5HdAi6Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699660747; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=xKOvbQyjngK1nPf4t6uvmm8DR/hnRUcUQJobJ7RbDi0=; b=b+A0exJeBJKzn7AJhbvOLcU2gofvGllqVFw1s3GF4n7Dpuzv8xU78BMfZAS6D8A1bsb0dwslD2pvRGtTNZ29oFHU+qWTbCxNE+Wk4/6vrIi5MpEGhUuUdEPJAfabqj/Cd5Z4ZXiSXipYlvTVSyJYldpg94gt8fB+iOZfaZpsTRs= ARC-Authentication-Results: i=1; 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+111073+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699660747193609.2775987057789; Fri, 10 Nov 2023 15:59:07 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=xKOvbQyjngK1nPf4t6uvmm8DR/hnRUcUQJobJ7RbDi0=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699660746; v=1; b=A0+VOHIk/qxQZDD8UkwaUnFZpLC/PQSkYNwlDqkNr3VeMj/dm6K+kSifnqGDPjV2+lIWzyAI hGIMxDqzxPomjN/XOtxkhYQ59apa3sOHpw4PIArEvpjzOQisSAKtDXNdcLuZR7ejWK8wDBAhvnw eKItmLrbKE5zX8YgCTHNu5IM= X-Received: by 127.0.0.2 with SMTP id 1aPKYY1788612xxKbZ9sYnU3; Fri, 10 Nov 2023 15:59:06 -0800 X-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.web11.42813.1699660746270656115 for ; Fri, 10 Nov 2023 15:59:06 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-292-g19Iwag0M3amTBx2r2FjWA-1; Fri, 10 Nov 2023 18:59:04 -0500 X-MC-Unique: g19Iwag0M3amTBx2r2FjWA-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A81F428EA6E3; Fri, 10 Nov 2023 23:59:03 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC561C1596F; Fri, 10 Nov 2023 23:59:02 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Anthony Perard , Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [PATCH 02/37] OvmfPkg: remove PcdCsmEnable Date: Sat, 11 Nov 2023 00:57:45 +0100 Message-Id: <20231110235820.644381-3-lersek@redhat.com> In-Reply-To: <20231110235820.644381-1-lersek@redhat.com> References: <20231110235820.644381-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk 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,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 3XKymLGyDmmzEyIEc3dpu7aPx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699660747526100001 Content-Type: text/plain; charset="utf-8"; x-default="true" PcdCsmEnable was introduced in commits 50f911d25d39 ("OvmfPkg: introduce PcdCsmEnable feature flag", 2020-02-05) and 75839f977d37 ("OvmfPkg/PlatformPei: detect SMRAM at default SMBASE (for real)", 2020-02-05). Remove it, and substitute constant FALSE wherever it has been evaluated thus far. Regression test: after building OVMF IA32X64 with -D SMM_REQUIRE, and booting it on Q35, the log still contains > Q35SmramAtDefaultSmbaseInitialization: SMRAM at default SMBASE found Cc: Anthony Perard Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Jiewen Yao https://bugzilla.tianocore.org/show_bug.cgi?id=3D4588 Signed-off-by: Laszlo Ersek --- OvmfPkg/OvmfPkg.dec | 5 --- OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 - OvmfPkg/OvmfPkgIa32.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfXen.dsc | 1 - OvmfPkg/PlatformPei/PlatformPei.inf | 1 - OvmfPkg/PlatformPei/MemDetect.c | 36 +++++++------------- 8 files changed, 13 insertions(+), 34 deletions(-) diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec index e3861e5c1b39..74cc870cbed3 100644 --- a/OvmfPkg/OvmfPkg.dec +++ b/OvmfPkg/OvmfPkg.dec @@ -497,8 +497,3 @@ [PcdsFeatureFlag] =20 ## This feature flag indicates the firmware build supports secure boot. gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|FALSE|BOOLEAN|0x6d - - ## Informs modules (including pre-DXE-phase modules) whether the platform - # firmware contains a CSM (Compatibility Support Module). - # - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|FALSE|BOOLEAN|0x35 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX6= 4.dsc index 669d3343b199..5513b7763774 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -377,7 +377,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) !error "CSM is being torn down" - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE !endif !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdSecureBootSupported|TRUE diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 9b1117ac51f7..ea513eb2e951 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -472,7 +472,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) !error "CSM is being torn down" - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE !endif !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 22f9d903dcd5..bb078ed89c14 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -479,7 +479,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) !error "CSM is being torn down" - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE !endif !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index cf232e2b95b0..fb816c722c40 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -498,7 +498,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) !error "CSM is being torn down" - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE !endif !if $(SMM_REQUIRE) =3D=3D TRUE gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc index e83a6497a793..2fbab39b485d 100644 --- a/OvmfPkg/OvmfXen.dsc +++ b/OvmfPkg/OvmfXen.dsc @@ -364,7 +364,6 @@ [PcdsFeatureFlag] gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE !ifdef $(CSM_ENABLE) !error "CSM is being torn down" - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable|TRUE !endif =20 [PcdsFixedAtBuild] diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 3934aeed9514..ad52be306560 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -133,7 +133,6 @@ [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize =20 [FeaturePcd] - gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire =20 [Ppis] diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 0c755c4940bb..493cb1fbeb01 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -89,32 +89,22 @@ Q35SmramAtDefaultSmbaseInitialization ( ) { RETURN_STATUS PcdStatus; + UINTN CtlReg; + UINT8 CtlRegVal; =20 ASSERT (PlatformInfoHob->HostBridgeDevId =3D=3D INTEL_Q35_MCH_DEVICE_ID); =20 - PlatformInfoHob->Q35SmramAtDefaultSmbase =3D FALSE; - if (FeaturePcdGet (PcdCsmEnable)) { - DEBUG (( - DEBUG_INFO, - "%a: SMRAM at default SMBASE not checked due to CSM\n", - __func__ - )); - } else { - UINTN CtlReg; - UINT8 CtlRegVal; - - CtlReg =3D DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL); - PciWrite8 (CtlReg, MCH_DEFAULT_SMBASE_QUERY); - CtlRegVal =3D PciRead8 (CtlReg); - PlatformInfoHob->Q35SmramAtDefaultSmbase =3D (BOOLEAN)(CtlRegVal =3D= =3D - MCH_DEFAULT_SMBAS= E_IN_RAM); - DEBUG (( - DEBUG_INFO, - "%a: SMRAM at default SMBASE %a\n", - __func__, - PlatformInfoHob->Q35SmramAtDefaultSmbase ? "found" : "not found" - )); - } + CtlReg =3D DRAMC_REGISTER_Q35 (MCH_DEFAULT_SMBASE_CTL); + PciWrite8 (CtlReg, MCH_DEFAULT_SMBASE_QUERY); + CtlRegVal =3D PciRead8 (CtlReg); + PlatformInfoHob->Q35SmramAtDefaultSmbase =3D (BOOLEAN)(CtlRegVal =3D=3D + MCH_DEFAULT_SMBASE_= IN_RAM); + DEBUG (( + DEBUG_INFO, + "%a: SMRAM at default SMBASE %a\n", + __func__, + PlatformInfoHob->Q35SmramAtDefaultSmbase ? "found" : "not found" + )); =20 PcdStatus =3D PcdSetBoolS ( PcdQ35SmramAtDefaultSmbase, -=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 (#111073): https://edk2.groups.io/g/devel/message/111073 Mute This Topic: https://groups.io/mt/102518638/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-