From nobody Tue Feb 10 05:44:49 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+111102+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+111102+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1699660785; cv=none; d=zohomail.com; s=zohoarc; b=Zm/oXjcaBV957Yo31UmJ1hs7iaXgmRHU8f3GbTfFpsVvTX8KW+JLiy3ifR2xAIAu0RC2rmbLfHtfGFwngXuoFgraFFf/fvydLhW8aeODkAYvPWG/eP/sMtS6VLuIz6Q4JoM9fzTCJ0RDxzkmZKAcc5yiRBv3NfiUwUPYg7XO6Ts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699660785; 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=Hl+mn6ceYOUI8WWa0B4uk8SixT+Nm+vR8TT1K9WrMvA=; b=ORvRAEmVPVDOSmaVR3GjUx6xvzSIan6es+CcNiNH9w33eKFxv8uKTqZL8XzSnEPbXsBpdjl9Mtp9YKlRodwoIy+SJwLvLn1dTnnjNiHvw07QubbHwyhYkL7tTy4G83Ze303UReUSBwv21T2Gj3XAK9j15DXH02+SW7nCIkAjSVw= 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+111102+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 1699660785760615.5473349965246; Fri, 10 Nov 2023 15:59:45 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Hl+mn6ceYOUI8WWa0B4uk8SixT+Nm+vR8TT1K9WrMvA=; 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=1699660785; v=1; b=eeNfQQwrz5CMug5y0iolyM5dTFwpaI8dfQ0SmQxs0OHDii/r1M6JS3hR+HNU2MMvXT1Fqd1X OtWgjCw+GRKzFaOd38W9zDmSg4g86e67Y+1HCLi3w3NJOyFXFQiSZJ0tjsUiYAc5GIaOJfaBDCC 2yPQeC+1LgLhHESYUTsAdyfI= X-Received: by 127.0.0.2 with SMTP id g3qCYY1788612xEslTOtR8Rl; Fri, 10 Nov 2023 15:59:45 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.42652.1699660784090722161 for ; Fri, 10 Nov 2023 15:59:44 -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-371-olNOuTdKMiKaD3AZMbGooA-1; Fri, 10 Nov 2023 18:59:41 -0500 X-MC-Unique: olNOuTdKMiKaD3AZMbGooA-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 8D4243C0C485; Fri, 10 Nov 2023 23:59:41 +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 B2FFDC1596F; Fri, 10 Nov 2023 23:59:40 +0000 (UTC) From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Gerd Hoffmann , Jiewen Yao Subject: [edk2-devel] [PATCH 31/37] OvmfPkg: exclude 8254TimerDxe Date: Sat, 11 Nov 2023 00:58:14 +0100 Message-Id: <20231110235820.644381-32-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: nIHaORp7aHbToqkI0gkkeEQDx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699660787666100013 Content-Type: text/plain; charset="utf-8"; x-default="true" In the original three OVMF platforms, CSM_ENABLE selects the legacy timer driver; exclude it. Instead, include LocalApicTimerDxe unconditionally (which in turn consumes PcdFSBClock). Background: commits c37cbc030d96 ("OvmfPkg: Switch timer in build time for OvmfPkg", 2022-04-02) and 07c0c2eb0a59 ("OvmfPkg: fix PcdFSBClock", 2022-05-25). Regression test: verified that the BDS progress bar still advanced at normal speed in each platform. Cc: Ard Biesheuvel Cc: Gerd Hoffmann Cc: Jiewen Yao Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4588 Signed-off-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32.dsc | 6 +----- OvmfPkg/OvmfPkgIa32X64.dsc | 6 +----- OvmfPkg/OvmfPkgX64.dsc | 6 +----- OvmfPkg/OvmfPkgIa32.fdf | 4 +--- OvmfPkg/OvmfPkgIa32X64.fdf | 4 +--- OvmfPkg/OvmfPkgX64.fdf | 4 +--- 6 files changed, 6 insertions(+), 24 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index fcd7f4a58957..a98406cb8ca6 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -669,9 +669,7 @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 -!if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 -!endif =20 [PcdsDynamicHii] !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc @@ -757,10 +755,8 @@ [Components] UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) OvmfPkg/8259InterruptControllerDxe/8259.inf - OvmfPkg/8254TimerDxe/8254Timer.inf -!else +!endif OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf -!endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 8cbe3733aba2..6962735f668f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -677,9 +677,7 @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 -!if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 -!endif =20 [PcdsDynamicDefault.X64] # IPv4 and IPv6 PXE Boot support. @@ -771,10 +769,8 @@ [Components.X64] UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) OvmfPkg/8259InterruptControllerDxe/8259.inf - OvmfPkg/8254TimerDxe/8254Timer.inf -!else +!endif OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf -!endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 288c2cf28abf..7429136a1ffa 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -701,9 +701,7 @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 -!if $(CSM_ENABLE) =3D=3D FALSE gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 -!endif =20 [PcdsDynamicHii] !include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc @@ -839,10 +837,8 @@ [Components] =20 !ifdef $(CSM_ENABLE) OvmfPkg/8259InterruptControllerDxe/8259.inf - OvmfPkg/8254TimerDxe/8254Timer.inf -!else +!endif OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf -!endif OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 44e3b4e140d0..c1ff11f50e31 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -221,10 +221,8 @@ [FV.DXEFV] INF UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) INF OvmfPkg/8259InterruptControllerDxe/8259.inf - INF OvmfPkg/8254TimerDxe/8254Timer.inf -!else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif +INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 1fbfdd40c58a..11d73a16df7e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -222,10 +222,8 @@ [FV.DXEFV] INF UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) INF OvmfPkg/8259InterruptControllerDxe/8259.inf - INF OvmfPkg/8254TimerDxe/8254Timer.inf -!else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif +INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 2220d1769c91..dd97615b0d8d 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -247,10 +247,8 @@ [FV.DXEFV] =20 !ifdef $(CSM_ENABLE) INF OvmfPkg/8259InterruptControllerDxe/8259.inf - INF OvmfPkg/8254TimerDxe/8254Timer.inf -!else - INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf !endif +INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.= inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf -=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 (#111102): https://edk2.groups.io/g/devel/message/111102 Mute This Topic: https://groups.io/mt/102518673/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-