From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Mon, 27 May 2019 10:42:28 -0700 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E2BAF81DF0; Mon, 27 May 2019 17:42:18 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-23.rdu2.redhat.com [10.10.120.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 732635D978; Mon, 27 May 2019 17:42:16 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH v1] OvmfPkg: Drop build flag USE_LEGACY_ISA_STACK and legacy ISA stack To: devel@edk2.groups.io, hao.a.wu@intel.com Cc: Ray Ni , Jordan Justen , Ard Biesheuvel References: <20190527032329.11776-1-hao.a.wu@intel.com> From: "Laszlo Ersek" Message-ID: <2baf1cbf-c3d5-d910-f0f8-048cb8212db7@redhat.com> Date: Mon, 27 May 2019 19:42:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190527032329.11776-1-hao.a.wu@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 27 May 2019 17:42:24 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 05/27/19 05:23, Wu, Hao A wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1842 > > According to the discussion at: > https://edk2.groups.io/g/devel/topic/30918343#38093 > > For OVMF, we keep both ISA stacks: > * The legacy one in PcAtChipsetPkg/IntelFrameworkModulePkg > * The Sio bus based OVMF-specified one introduced by commit a5cc178aeb > > for a period of time (includes 1 stable tag: edk2-stable201905). And we > also keep the Sio bus based OVMF-specified stack as the default one (via a > build option 'USE_LEGACY_ISA_STACK') to validate its stability. Yes, the idea is to release edk2-stable201905 with the toggle still available to users. The patch looks good to me (for edk2-stable201908). Reviewed-by: Laszlo Ersek Thanks Laszlo > > This commit will propose to drop the legacy ISA stack from OVMF and remove > the usage of the build flag 'USE_LEGACY_ISA_STACK' at the same time. This > is considered as a preparation for the removal of > PcAtChipsetPkg/IsaAcpiDxe & IntelFrameworkModulePkg. > > Cc: Ray Ni > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Signed-off-by: Hao A Wu > --- > ''' > Please note that the patch will be hold until edk2-stable201905 is created > ''' > OvmfPkg/OvmfPkgIa32.dsc | 8 -------- > OvmfPkg/OvmfPkgIa32X64.dsc | 8 -------- > OvmfPkg/OvmfPkgX64.dsc | 8 -------- > OvmfPkg/OvmfPkgIa32.fdf | 15 +++------------ > OvmfPkg/OvmfPkgIa32X64.fdf | 15 +++------------ > OvmfPkg/OvmfPkgX64.fdf | 15 +++------------ > 6 files changed, 9 insertions(+), 60 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index b3446ece31..ae43c9dadc 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -32,7 +32,6 @@ [Defines] > DEFINE SMM_REQUIRE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > - DEFINE USE_LEGACY_ISA_STACK = FALSE > > # > # Network definition > @@ -745,16 +744,9 @@ [Components] > # > # ISA Support > # > -!if $(USE_LEGACY_ISA_STACK) == FALSE > OvmfPkg/SioBusDxe/SioBusDxe.inf > MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > -!endif > > # > # SMBIOS Support > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 679d4eb8dd..6f802e672a 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -32,7 +32,6 @@ [Defines] > DEFINE SMM_REQUIRE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > - DEFINE USE_LEGACY_ISA_STACK = FALSE > > # > # Network definition > @@ -754,16 +753,9 @@ [Components.X64] > # > # ISA Support > # > -!if $(USE_LEGACY_ISA_STACK) == FALSE > OvmfPkg/SioBusDxe/SioBusDxe.inf > MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > -!endif > > # > # SMBIOS Support > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 56a9560262..1b8d9866db 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -32,7 +32,6 @@ [Defines] > DEFINE SMM_REQUIRE = FALSE > DEFINE TPM2_ENABLE = FALSE > DEFINE TPM2_CONFIG_ENABLE = FALSE > - DEFINE USE_LEGACY_ISA_STACK = FALSE > > # > # Network definition > @@ -752,16 +751,9 @@ [Components] > # > # ISA Support > # > -!if $(USE_LEGACY_ISA_STACK) == FALSE > OvmfPkg/SioBusDxe/SioBusDxe.inf > MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > - IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > -!endif > > # > # SMBIOS Support > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index e428334702..12da9f4706 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -259,20 +259,11 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > -!if $(USE_LEGACY_ISA_STACK) == FALSE > - INF OvmfPkg/SioBusDxe/SioBusDxe.inf > +INF OvmfPkg/SioBusDxe/SioBusDxe.inf > !ifndef $(SOURCE_DEBUG_ENABLE) > - INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > -!endif > - INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > - INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > -!endif > - INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > +INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 6ddffe7547..47ac7d8646 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -260,20 +260,11 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > -!if $(USE_LEGACY_ISA_STACK) == FALSE > - INF OvmfPkg/SioBusDxe/SioBusDxe.inf > +INF OvmfPkg/SioBusDxe/SioBusDxe.inf > !ifndef $(SOURCE_DEBUG_ENABLE) > - INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > -!endif > - INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > - INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > -!endif > - INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > +INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 6ddffe7547..47ac7d8646 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -260,20 +260,11 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf > > -!if $(USE_LEGACY_ISA_STACK) == FALSE > - INF OvmfPkg/SioBusDxe/SioBusDxe.inf > +INF OvmfPkg/SioBusDxe/SioBusDxe.inf > !ifndef $(SOURCE_DEBUG_ENABLE) > - INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > -!endif > - INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > -!else > - INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf > - INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf > -!ifndef $(SOURCE_DEBUG_ENABLE) > - INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf > -!endif > - INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf > +INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > !endif > +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf >