From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Cloud Hypervisor doesn't emulate any LPC bridge, therefore we simply
need to rely on the serial I/O port to be connected as a console.
It reuses the code from Xen since it's very generic.
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
OvmfPkg/CloudHv/CloudHvX64.dsc | 6 ++----
OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +-----
OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 1d84b7d0b9..4207ecaa3e 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -827,11 +827,9 @@
OvmfPkg/VirtioGpuDxe/VirtioGpu.inf
#
- # ISA Support
+ # Serial Support
#
- OvmfPkg/SioBusDxe/SioBusDxe.inf
- MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
- MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+ MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
#
# SMBIOS Support
diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf
index f35458551b..5ce3233bf7 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.fdf
+++ b/OvmfPkg/CloudHv/CloudHvX64.fdf
@@ -290,11 +290,7 @@ INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
-INF OvmfPkg/SioBusDxe/SioBusDxe.inf
-!if $(SOURCE_DEBUG_ENABLE) == FALSE
-INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf
-!endif
-INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 0918c35f1f..e59bf3b1f5 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -421,7 +421,7 @@ PlatformBootManagerBeforeConsole (
// We need to connect all trusted consoles for TCG PP. Here we treat all
// consoles in OVMF to be trusted consoles.
PlatformInitializeConsole (
- XenDetected () ? gXenPlatformConsole : gPlatformConsole
+ (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) == CLOUDHV_DEVICE_ID) ? gXenPlatformConsole : gPlatformConsole
);
//
--
2.30.2
---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris,
92196 Meudon Cedex, France
Registration Number: 302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85462): https://edk2.groups.io/g/devel/message/85462
Mute This Topic: https://groups.io/mt/88324056/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Please copy the description as comment to the code. Thank you Yao Jiewen > -----Original Message----- > From: Boeuf, Sebastien <sebastien.boeuf@intel.com> > Sent: Monday, January 10, 2022 10:26 PM > To: devel@edk2.groups.io > Cc: Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L > <jordan.l.justen@intel.com>; kraxel@redhat.com; Boeuf, Sebastien > <sebastien.boeuf@intel.com> > Subject: [PATCH 3/9] OvmfPkg/CloudHv: Connect serial console > > From: Sebastien Boeuf <sebastien.boeuf@intel.com> > > Cloud Hypervisor doesn't emulate any LPC bridge, therefore we simply > need to rely on the serial I/O port to be connected as a console. > It reuses the code from Xen since it's very generic. > > Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> > --- > OvmfPkg/CloudHv/CloudHvX64.dsc | 6 ++---- > OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +----- > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +- > 3 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc > b/OvmfPkg/CloudHv/CloudHvX64.dsc > index 1d84b7d0b9..4207ecaa3e 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > @@ -827,11 +827,9 @@ > OvmfPkg/VirtioGpuDxe/VirtioGpu.inf > > > > # > > - # ISA Support > > + # Serial Support > > # > > - OvmfPkg/SioBusDxe/SioBusDxe.inf > > - MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > - MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > + MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > # > > # SMBIOS Support > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf > b/OvmfPkg/CloudHv/CloudHvX64.fdf > index f35458551b..5ce3233bf7 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.fdf > +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf > @@ -290,11 +290,7 @@ INF > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > > INF > MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD > xe.inf > > > > -INF OvmfPkg/SioBusDxe/SioBusDxe.inf > > -!if $(SOURCE_DEBUG_ENABLE) == FALSE > > -INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > -!endif > > -INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > +INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index 0918c35f1f..e59bf3b1f5 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -421,7 +421,7 @@ PlatformBootManagerBeforeConsole ( > // We need to connect all trusted consoles for TCG PP. Here we treat all > > // consoles in OVMF to be trusted consoles. > > PlatformInitializeConsole ( > > - XenDetected () ? gXenPlatformConsole : gPlatformConsole > > + (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) == > CLOUDHV_DEVICE_ID) ? gXenPlatformConsole : gPlatformConsole > > ); > > > > // > > -- > 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85469): https://edk2.groups.io/g/devel/message/85469 Mute This Topic: https://groups.io/mt/88324056/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
On Mon, 2022-01-10 at 14:46 +0000, Yao, Jiewen wrote: > Please copy the description as comment to the code. Do you mean you want me to use my commit message as a comment in the code to explain why we have this special use case for Cloud Hypervisor? I'll be happy to do it, just making sure that's what you suggested :) Thanks, Sebastien > > Thank you > Yao Jiewen > > > -----Original Message----- > > From: Boeuf, Sebastien <sebastien.boeuf@intel.com> > > Sent: Monday, January 10, 2022 10:26 PM > > To: devel@edk2.groups.io > > Cc: Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L > > <jordan.l.justen@intel.com>; kraxel@redhat.com; Boeuf, Sebastien > > <sebastien.boeuf@intel.com> > > Subject: [PATCH 3/9] OvmfPkg/CloudHv: Connect serial console > > > > From: Sebastien Boeuf <sebastien.boeuf@intel.com> > > > > Cloud Hypervisor doesn't emulate any LPC bridge, therefore we > > simply > > need to rely on the serial I/O port to be connected as a console. > > It reuses the code from Xen since it's very generic. > > > > Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> > > --- > > OvmfPkg/CloudHv/CloudHvX64.dsc | 6 ++---- > > OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +----- > > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +- > > 3 files changed, 4 insertions(+), 10 deletions(-) > > > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc > > b/OvmfPkg/CloudHv/CloudHvX64.dsc > > index 1d84b7d0b9..4207ecaa3e 100644 > > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > > @@ -827,11 +827,9 @@ > > OvmfPkg/VirtioGpuDxe/VirtioGpu.inf > > > > > > > > # > > > > - # ISA Support > > > > + # Serial Support > > > > # > > > > - OvmfPkg/SioBusDxe/SioBusDxe.inf > > > > - MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > > > - MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > > > + MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > > > > > # > > > > # SMBIOS Support > > > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf > > b/OvmfPkg/CloudHv/CloudHvX64.fdf > > index f35458551b..5ce3233bf7 100644 > > --- a/OvmfPkg/CloudHv/CloudHvX64.fdf > > +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf > > @@ -290,11 +290,7 @@ INF > > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > > > > INF > > MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD > > xe.inf > > > > > > > > -INF OvmfPkg/SioBusDxe/SioBusDxe.inf > > > > -!if $(SOURCE_DEBUG_ENABLE) == FALSE > > > > -INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > > > -!endif > > > > -INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > > > +INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > > > > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > > > > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > > > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > index 0918c35f1f..e59bf3b1f5 100644 > > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > @@ -421,7 +421,7 @@ PlatformBootManagerBeforeConsole ( > > // We need to connect all trusted consoles for TCG PP. Here we > > treat all > > > > // consoles in OVMF to be trusted consoles. > > > > PlatformInitializeConsole ( > > > > - XenDetected () ? gXenPlatformConsole : gPlatformConsole > > > > + (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) == > > CLOUDHV_DEVICE_ID) ? gXenPlatformConsole : gPlatformConsole > > > > ); > > > > > > > > // > > > > -- > > 2.30.2 > --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85472): https://edk2.groups.io/g/devel/message/85472 Mute This Topic: https://groups.io/mt/88324056/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Exactly > -----Original Message----- > From: Boeuf, Sebastien <sebastien.boeuf@intel.com> > Sent: Monday, January 10, 2022 10:54 PM > To: Yao, Jiewen <jiewen.yao@intel.com>; devel@edk2.groups.io > Cc: kraxel@redhat.com; Justen, Jordan L <jordan.l.justen@intel.com> > Subject: Re: [PATCH 3/9] OvmfPkg/CloudHv: Connect serial console > > On Mon, 2022-01-10 at 14:46 +0000, Yao, Jiewen wrote: > > Please copy the description as comment to the code. > > Do you mean you want me to use my commit message as a comment in the > code to explain why we have this special use case for Cloud Hypervisor? > > I'll be happy to do it, just making sure that's what you suggested :) > > Thanks, > Sebastien > > > > Thank you > > Yao Jiewen > > > > > -----Original Message----- > > > From: Boeuf, Sebastien <sebastien.boeuf@intel.com> > > > Sent: Monday, January 10, 2022 10:26 PM > > > To: devel@edk2.groups.io > > > Cc: Yao, Jiewen <jiewen.yao@intel.com>; Justen, Jordan L > > > <jordan.l.justen@intel.com>; kraxel@redhat.com; Boeuf, Sebastien > > > <sebastien.boeuf@intel.com> > > > Subject: [PATCH 3/9] OvmfPkg/CloudHv: Connect serial console > > > > > > From: Sebastien Boeuf <sebastien.boeuf@intel.com> > > > > > > Cloud Hypervisor doesn't emulate any LPC bridge, therefore we > > > simply > > > need to rely on the serial I/O port to be connected as a console. > > > It reuses the code from Xen since it's very generic. > > > > > > Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> > > > --- > > > OvmfPkg/CloudHv/CloudHvX64.dsc | 6 ++---- > > > OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +----- > > > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 2 +- > > > 3 files changed, 4 insertions(+), 10 deletions(-) > > > > > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc > > > b/OvmfPkg/CloudHv/CloudHvX64.dsc > > > index 1d84b7d0b9..4207ecaa3e 100644 > > > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > > > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > > > @@ -827,11 +827,9 @@ > > > OvmfPkg/VirtioGpuDxe/VirtioGpu.inf > > > > > > > > > > > > # > > > > > > - # ISA Support > > > > > > + # Serial Support > > > > > > # > > > > > > - OvmfPkg/SioBusDxe/SioBusDxe.inf > > > > > > - MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > > > > > - MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > > > > > + MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > > > > > > > > > # > > > > > > # SMBIOS Support > > > > > > diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf > > > b/OvmfPkg/CloudHv/CloudHvX64.fdf > > > index f35458551b..5ce3233bf7 100644 > > > --- a/OvmfPkg/CloudHv/CloudHvX64.fdf > > > +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf > > > @@ -290,11 +290,7 @@ INF > > > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > > > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > > > > > > INF > > > > MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestD > > > xe.inf > > > > > > > > > > > > -INF OvmfPkg/SioBusDxe/SioBusDxe.inf > > > > > > -!if $(SOURCE_DEBUG_ENABLE) == FALSE > > > > > > -INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf > > > > > > -!endif > > > > > > -INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf > > > > > > +INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf > > > > > > > > > > > > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > > > > > > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > > > > > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > > index 0918c35f1f..e59bf3b1f5 100644 > > > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > > > @@ -421,7 +421,7 @@ PlatformBootManagerBeforeConsole ( > > > // We need to connect all trusted consoles for TCG PP. Here we > > > treat all > > > > > > // consoles in OVMF to be trusted consoles. > > > > > > PlatformInitializeConsole ( > > > > > > - XenDetected () ? gXenPlatformConsole : gPlatformConsole > > > > > > + (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) == > > > CLOUDHV_DEVICE_ID) ? gXenPlatformConsole : gPlatformConsole > > > > > > ); > > > > > > > > > > > > // > > > > > > -- > > > 2.30.2 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85473): https://edk2.groups.io/g/devel/message/85473 Mute This Topic: https://groups.io/mt/88324056/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2026 Red Hat, Inc.