From: Laszlo Ersek <lersek@redhat.com>
To: Hao Wu <hao.a.wu@intel.com>, edk2-devel@lists.01.org
Cc: Jordan Justen <jordan.l.justen@intel.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Ray Ni <ray.ni@intel.com>
Subject: Re: [PATCH v2 3/3] OvmfPkg: Add a build flag to select ISA driver stack
Date: Mon, 25 Mar 2019 12:20:53 +0100 [thread overview]
Message-ID: <20139f7a-1d72-0f20-7ff4-8d5a8330011a@redhat.com> (raw)
In-Reply-To: <20190325052853.11220-4-hao.a.wu@intel.com>
On 03/25/19 06:28, Hao Wu wrote:
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1495
>
> This commit will add a static build flag 'USE_LEGACY_ISA_STACK' to select
> the ISA driver stack.
>
> If the flag is set to TRUE, the below driver stack will be used:
> PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
> IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
> IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
> IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
>
> If the flag is set to FALSE, the below driver stack will be used:
> OvmfPkg/SioBusDxe/SioBusDxe.inf
> MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
> MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
>
> The default value is set to FALSE in OVMF DSC files.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Ray Ni <ray.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 6 ++++++
> OvmfPkg/OvmfPkgIa32X64.dsc | 6 ++++++
> OvmfPkg/OvmfPkgX64.dsc | 6 ++++++
> OvmfPkg/OvmfPkgIa32.fdf | 18 ++++++++++++------
> OvmfPkg/OvmfPkgIa32X64.fdf | 18 ++++++++++++------
> OvmfPkg/OvmfPkgX64.fdf | 18 ++++++++++++------
> 6 files changed, 54 insertions(+), 18 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 3be0314146..f55ab5a3d2 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -41,6 +41,7 @@
> DEFINE TLS_ENABLE = FALSE
> DEFINE TPM2_ENABLE = FALSE
> DEFINE TPM2_CONFIG_ENABLE = FALSE
> + DEFINE USE_LEGACY_ISA_STACK = FALSE
>
> #
> # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to
> @@ -752,11 +753,16 @@
> #
> # 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 3b85c2e6af..5c9bdf034e 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -41,6 +41,7 @@
> DEFINE TLS_ENABLE = FALSE
> DEFINE TPM2_ENABLE = FALSE
> DEFINE TPM2_CONFIG_ENABLE = FALSE
> + DEFINE USE_LEGACY_ISA_STACK = FALSE
>
> #
> # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to
> @@ -761,11 +762,16 @@
> #
> # 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 104b2e79a5..2943e9e8af 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -41,6 +41,7 @@
> DEFINE TLS_ENABLE = FALSE
> DEFINE TPM2_ENABLE = FALSE
> DEFINE TPM2_CONFIG_ENABLE = FALSE
> + DEFINE USE_LEGACY_ISA_STACK = FALSE
>
> #
> # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to
> @@ -759,11 +760,16 @@
> #
> # 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 54d7f06a70..006ea9a415 100644
> --- a/OvmfPkg/OvmfPkgIa32.fdf
> +++ b/OvmfPkg/OvmfPkgIa32.fdf
> @@ -265,14 +265,20 @@ INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
>
> -INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
> -
> +!if $(USE_LEGACY_ISA_STACK) == FALSE
> + INF OvmfPkg/SioBusDxe/SioBusDxe.inf
> !ifndef $(SOURCE_DEBUG_ENABLE)
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
> + 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
> !endif
> -
> -INF IntelFrameworkModulePkg/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 7519b53a9b..6c40540202 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> @@ -266,14 +266,20 @@ INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
>
> -INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
> -
> +!if $(USE_LEGACY_ISA_STACK) == FALSE
> + INF OvmfPkg/SioBusDxe/SioBusDxe.inf
> !ifndef $(SOURCE_DEBUG_ENABLE)
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
> + 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
> !endif
> -
> -INF IntelFrameworkModulePkg/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 7519b53a9b..6c40540202 100644
> --- a/OvmfPkg/OvmfPkgX64.fdf
> +++ b/OvmfPkg/OvmfPkgX64.fdf
> @@ -266,14 +266,20 @@ INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
> INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
> INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
>
> -INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
> -
> +!if $(USE_LEGACY_ISA_STACK) == FALSE
> + INF OvmfPkg/SioBusDxe/SioBusDxe.inf
> !ifndef $(SOURCE_DEBUG_ENABLE)
> -INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
> + 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
> !endif
> -
> -INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
>
> INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
> INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
next prev parent reply other threads:[~2019-03-25 11:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-25 5:28 [PATCH v2 0/3] Ovmf: Stop using ISA drivers within IntelFrameworkModulePkg Hao Wu
2019-03-25 5:28 ` [PATCH v2 1/3] OvmfPkg: Drop the ISA Floppy device support Hao Wu
2019-03-25 10:42 ` Laszlo Ersek
2019-03-25 5:28 ` [PATCH v2 2/3] OvmfPkg: Add an Super IO bus driver Hao Wu
2019-03-25 11:22 ` Laszlo Ersek
2019-03-26 2:52 ` Wu, Hao A
2019-03-25 12:00 ` Laszlo Ersek
2019-03-25 17:30 ` Kinney, Michael D
2019-03-25 18:33 ` Laszlo Ersek
2019-03-25 20:02 ` Kinney, Michael D
2019-03-26 11:19 ` Laszlo Ersek
2019-03-25 5:28 ` [PATCH v2 3/3] OvmfPkg: Add a build flag to select ISA driver stack Hao Wu
2019-03-25 11:20 ` Laszlo Ersek [this message]
2019-03-25 8:28 ` [PATCH v2 0/3] Ovmf: Stop using ISA drivers within IntelFrameworkModulePkg Ard Biesheuvel
2019-03-25 10:58 ` Laszlo Ersek
2019-03-25 11:29 ` Laszlo Ersek
2019-03-26 2:49 ` Wu, Hao A
2019-03-26 10:14 ` Laszlo Ersek
2019-03-26 11:21 ` Laszlo Ersek
2019-03-26 10:09 ` Julien Grall
2019-03-26 11:53 ` Laszlo Ersek
2019-03-26 13:03 ` Anthony PERARD
2019-03-26 15:01 ` Laszlo Ersek
2019-03-26 15:14 ` Anthony PERARD
2019-03-26 15:15 ` Laszlo Ersek
2019-03-27 0:20 ` Wu, Hao A
2019-03-27 3:37 ` Laszlo Ersek
2019-03-27 5:28 ` Wu, Hao A
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20139f7a-1d72-0f20-7ff4-8d5a8330011a@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox