[edk2-devel] [PATCH v1] OvmfPkg: Drop build flag USE_LEGACY_ISA_STACK and legacy ISA stack

Laszlo Ersek lersek at redhat.com
Mon May 27 17:42:15 UTC 2019 

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 <lersek at redhat.com>

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 <ray.ni at intel.com>
> Cc: Jordan Justen <jordan.l.justen at intel.com>
> Cc: Laszlo Ersek <lersek at redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel at linaro.org>
> Signed-off-by: Hao A Wu <hao.a.wu at intel.com>
> ---
> '''
> 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
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#41423): https://edk2.groups.io/g/devel/message/41423
Mute This Topic: https://groups.io/mt/31805602/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

More information about the edk2-devel-archive mailing list