From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web08.5170.1641896461172387085 for ; Tue, 11 Jan 2022 02:21:07 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ey4Lbw7E; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: sebastien.boeuf@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641896467; x=1673432467; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zn7yeyRrfvcGN/jsFj9njw2sZ39KfMs1eEnVZin2heM=; b=ey4Lbw7ELoc4gZQn7C5iZdKH4FrT5PL4o6NXdPGaMniyMAkWeyTM0jF0 kEs9AAuZx/Qrp5f1n56oixot8W8QiWBhn3TjU/eFJYyV9dsHKFotGPNAe g/CVaji3yL6SPvanqU6Kc5q8JIqnm3F3mVhieywqqY8maAPAKIt/bKGCm gfhp88nJmBRZIH1GiHA2uGRKw5DgLuMZyNDCFeix36XoWEE5043fSuCKH 19rp/N9azhWVGQYwc++/3VLGDfJHvdJcP1afFEz8AaYIZfkHDgWf4qZLR t3VPmNmsvbUSXJ6YgvqYnz5JVgQgsEDUML0AERUmge+JF2+pFBPZagjO8 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10223"; a="224148612" X-IronPort-AV: E=Sophos;i="5.88,279,1635231600"; d="scan'208";a="224148612" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 02:21:06 -0800 X-IronPort-AV: E=Sophos;i="5.88,279,1635231600"; d="scan'208";a="472412668" Received: from ojocher-mobl1.ger.corp.intel.com (HELO sboeuf-mobl.home) ([10.252.28.2]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 02:21:04 -0800 From: "Boeuf, Sebastien" To: devel@edk2.groups.io Cc: jiewen.yao@intel.com, jordan.l.justen@intel.com, kraxel@redhat.com, sebastien.boeuf@intel.com Subject: [PATCH v3 03/11] OvmfPkg/CloudHv: Connect serial console Date: Tue, 11 Jan 2022 11:20:45 +0100 Message-Id: <7a8084c2484596459c4b554aeef1fda3b013bc11.1641894685.git.sebastien.boeuf@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable From: Sebastien Boeuf 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 --- OvmfPkg/CloudHv/CloudHvX64.dsc | 6 ++---- OvmfPkg/CloudHv/CloudHvX64.fdf | 6 +----- OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 8 +++++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 5e11942d08..d6d34a4677 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -828,11 +828,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/SetupBrows= erDxe.inf INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf INF MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe= .inf = -INF OvmfPkg/SioBusDxe/SioBusDxe.inf -!if $(SOURCE_DEBUG_ENABLE) =3D=3D 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..51016a5548 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -418,10 +418,16 @@ PlatformBootManagerBeforeConsole ( SaveS3BootScript (); } = + // // We need to connect all trusted consoles for TCG PP. Here we treat all // consoles in OVMF to be trusted consoles. + // + // Cloud Hypervisor doesn't emulate any LPC bridge, which is why it must + // rely on the serial I/O port to be connected as a console. It reuses t= he + // definition from Xen as it is very generic. + // PlatformInitializeConsole ( - XenDetected () ? gXenPlatformConsole : gPlatformConsole + (XenDetected () || PcdGet16 (PcdOvmfHostBridgePciDevId) =3D=3D 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.