32696fd8dd
- edk2-ArmVirt-add-VirtioSerialDxe-to-ArmVirtQemu-builds.patch [RHEL-643] - edk2-ArmVirt-PlatformBootManagerLib-factor-out-IsVirtio.patch [RHEL-643] - edk2-ArmVirt-PlatformBootManagerLib-factor-out-IsVirtioPc.patch [RHEL-643] - edk2-ArmVirt-PlatformBootManagerLib-set-up-virtio-serial-.patch [RHEL-643] - edk2-OvmfPkg-VirtioSerialDxe-use-TPL_NOTIFY.patch [RHEL-643] - edk2-OvmfPkg-VirtioSerialDxe-Remove-noisy-debug-print-on-.patch [RHEL-643] - edk2-OvmfPkg-PlatformInitLib-limit-phys-bits-to-46.patch [bz#2174749] - edk2-Revert-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch [bz#2174749] - edk2-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch [bz#2124143] - edk2-OvmfPkg-PlatformInitLib-check-PcdUse1GPageTable.patch [RHEL-644] - edk2-OvmfPkg-OvmfPkgIa32X64-enable-1G-pages.patch [RHEL-644] - edk2-OvmfPkg-MicrovmX64-enable-1G-pages.patch [RHEL-644] - Resolves: RHEL-643 (add virtio serial support to armvirt) - Resolves: bz#2174749 ([edk2] re-enable dynamic mmio window) - Resolves: bz#2124143 (ovmf must consider max cpu count not boot cpu count for apic mode [rhel-9]) - Resolves: RHEL-644 (enable gigabyte pages)
229 lines
5.8 KiB
Diff
229 lines
5.8 KiB
Diff
From ad95ab2b76485458fed60ab20631b62a010c0e4d Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu, 1 Jun 2023 13:57:13 +0200
|
|
Subject: [PATCH 04/12] ArmVirt/PlatformBootManagerLib: set up virtio serial as
|
|
console
|
|
|
|
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
RH-MergeRequest: 39: ArmVirt: add VirtioSerialDxe to ArmVirtQemu builds
|
|
RH-Jira: RHEL-643
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
RH-Commit: [4/6] 46540eeb8901cfeef83cffcdcb6e1c23995b391a (kraxel/centos-edk2)
|
|
|
|
In case a virtio serial device is found in the system register the first
|
|
console port as EFI console, by updating ConIn, ConOut and ErrOut.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 15f83fa36442eaa272300b31699b3b82ce7e07a9)
|
|
---
|
|
.../PlatformBootManagerLib/PlatformBm.c | 172 ++++++++++++++++++
|
|
1 file changed, 172 insertions(+)
|
|
|
|
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
|
|
index ed38c42a43..b92a916f7e 100644
|
|
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
|
|
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
|
|
@@ -312,6 +312,21 @@ IsVirtioRng (
|
|
return IsVirtio (Handle, ReportText, VIRTIO_SUBSYSTEM_ENTROPY_SOURCE);
|
|
}
|
|
|
|
+/**
|
|
+ This FILTER_FUNCTION checks if a handle corresponds to a Virtio serial device at
|
|
+ the VIRTIO_DEVICE_PROTOCOL level.
|
|
+**/
|
|
+STATIC
|
|
+BOOLEAN
|
|
+EFIAPI
|
|
+IsVirtioSerial (
|
|
+ IN EFI_HANDLE Handle,
|
|
+ IN CONST CHAR16 *ReportText
|
|
+ )
|
|
+{
|
|
+ return IsVirtio (Handle, ReportText, VIRTIO_SUBSYSTEM_CONSOLE);
|
|
+}
|
|
+
|
|
/**
|
|
This function checks if a handle corresponds to the Virtio Device ID given
|
|
at the EFI_PCI_IO_PROTOCOL level.
|
|
@@ -446,6 +461,21 @@ IsVirtioPciRng (
|
|
return IsVirtioPci (Handle, ReportText, VIRTIO_SUBSYSTEM_ENTROPY_SOURCE);
|
|
}
|
|
|
|
+/**
|
|
+ This FILTER_FUNCTION checks if a handle corresponds to a Virtio serial device at
|
|
+ the EFI_PCI_IO_PROTOCOL level.
|
|
+**/
|
|
+STATIC
|
|
+BOOLEAN
|
|
+EFIAPI
|
|
+IsVirtioPciSerial (
|
|
+ IN EFI_HANDLE Handle,
|
|
+ IN CONST CHAR16 *ReportText
|
|
+ )
|
|
+{
|
|
+ return IsVirtioPci (Handle, ReportText, VIRTIO_SUBSYSTEM_CONSOLE);
|
|
+}
|
|
+
|
|
/**
|
|
This CALLBACK_FUNCTION attempts to connect a handle non-recursively, asking
|
|
the matching driver to produce all first-level child handles.
|
|
@@ -534,6 +564,142 @@ AddOutput (
|
|
));
|
|
}
|
|
|
|
+/**
|
|
+ This CALLBACK_FUNCTION retrieves the EFI_DEVICE_PATH_PROTOCOL from
|
|
+ the handle, appends serial, uart and terminal nodes, finally updates
|
|
+ ConIn, ConOut and ErrOut.
|
|
+**/
|
|
+STATIC
|
|
+VOID
|
|
+EFIAPI
|
|
+SetupVirtioSerial (
|
|
+ IN EFI_HANDLE Handle,
|
|
+ IN CONST CHAR16 *ReportText
|
|
+ )
|
|
+{
|
|
+ STATIC CONST ACPI_HID_DEVICE_PATH SerialNode = {
|
|
+ {
|
|
+ ACPI_DEVICE_PATH,
|
|
+ ACPI_DP,
|
|
+ {
|
|
+ (UINT8)(sizeof (ACPI_HID_DEVICE_PATH)),
|
|
+ (UINT8)((sizeof (ACPI_HID_DEVICE_PATH)) >> 8)
|
|
+ },
|
|
+ },
|
|
+ EISA_PNP_ID (0x0501),
|
|
+ 0
|
|
+ };
|
|
+
|
|
+ STATIC CONST UART_DEVICE_PATH UartNode = {
|
|
+ {
|
|
+ MESSAGING_DEVICE_PATH,
|
|
+ MSG_UART_DP,
|
|
+ {
|
|
+ (UINT8)(sizeof (UART_DEVICE_PATH)),
|
|
+ (UINT8)((sizeof (UART_DEVICE_PATH)) >> 8)
|
|
+ },
|
|
+ },
|
|
+ 0,
|
|
+ 115200,
|
|
+ 8,
|
|
+ 1,
|
|
+ 1
|
|
+ };
|
|
+
|
|
+ STATIC CONST VENDOR_DEVICE_PATH TerminalNode = {
|
|
+ {
|
|
+ MESSAGING_DEVICE_PATH,
|
|
+ MSG_VENDOR_DP,
|
|
+ {
|
|
+ (UINT8)(sizeof (VENDOR_DEVICE_PATH)),
|
|
+ (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
|
|
+ },
|
|
+ },
|
|
+ DEVICE_PATH_MESSAGING_VT_UTF8
|
|
+ };
|
|
+
|
|
+ EFI_STATUS Status;
|
|
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath, *OldDevicePath;
|
|
+
|
|
+ DevicePath = DevicePathFromHandle (Handle);
|
|
+
|
|
+ if (DevicePath == NULL) {
|
|
+ DEBUG ((
|
|
+ DEBUG_ERROR,
|
|
+ "%a: %s: handle %p: device path not found\n",
|
|
+ __func__,
|
|
+ ReportText,
|
|
+ Handle
|
|
+ ));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ DevicePath = AppendDevicePathNode (
|
|
+ DevicePath,
|
|
+ &SerialNode.Header
|
|
+ );
|
|
+
|
|
+ OldDevicePath = DevicePath;
|
|
+ DevicePath = AppendDevicePathNode (
|
|
+ DevicePath,
|
|
+ &UartNode.Header
|
|
+ );
|
|
+ FreePool (OldDevicePath);
|
|
+
|
|
+ OldDevicePath = DevicePath;
|
|
+ DevicePath = AppendDevicePathNode (
|
|
+ DevicePath,
|
|
+ &TerminalNode.Header
|
|
+ );
|
|
+ FreePool (OldDevicePath);
|
|
+
|
|
+ Status = EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
|
|
+ if (EFI_ERROR (Status)) {
|
|
+ DEBUG ((
|
|
+ DEBUG_ERROR,
|
|
+ "%a: %s: adding to ConIn: %r\n",
|
|
+ __func__,
|
|
+ ReportText,
|
|
+ Status
|
|
+ ));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ Status = EfiBootManagerUpdateConsoleVariable (ConOut, DevicePath, NULL);
|
|
+ if (EFI_ERROR (Status)) {
|
|
+ DEBUG ((
|
|
+ DEBUG_ERROR,
|
|
+
|
|
+ "%a: %s: adding to ConOut: %r\n",
|
|
+ __func__,
|
|
+ ReportText,
|
|
+ Status
|
|
+ ));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ Status = EfiBootManagerUpdateConsoleVariable (ErrOut, DevicePath, NULL);
|
|
+ if (EFI_ERROR (Status)) {
|
|
+ DEBUG ((
|
|
+ DEBUG_ERROR,
|
|
+ "%a: %s: adding to ErrOut: %r\n",
|
|
+ __func__,
|
|
+ ReportText,
|
|
+ Status
|
|
+ ));
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ FreePool (DevicePath);
|
|
+
|
|
+ DEBUG ((
|
|
+ DEBUG_VERBOSE,
|
|
+ "%a: %s: added to ConIn, ConOut and ErrOut\n",
|
|
+ __func__,
|
|
+ ReportText
|
|
+ ));
|
|
+}
|
|
+
|
|
STATIC
|
|
VOID
|
|
PlatformRegisterFvBootOption (
|
|
@@ -932,6 +1098,12 @@ PlatformBootManagerBeforeConsole (
|
|
// instances on Virtio PCI RNG devices.
|
|
//
|
|
FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciRng, Connect);
|
|
+
|
|
+ //
|
|
+ // Register Virtio serial devices as console.
|
|
+ //
|
|
+ FilterAndProcess (&gVirtioDeviceProtocolGuid, IsVirtioSerial, SetupVirtioSerial);
|
|
+ FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciSerial, SetupVirtioSerial);
|
|
}
|
|
|
|
/**
|
|
--
|
|
2.39.3
|
|
|