1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH V2] UefiPayloadPkg/BootManager: Add PS2 keyboard support

Guo Dong posted 1 patch 4 years, 4 months ago
Failed in applying to current master (apply log)
UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c | 25 ++++++++++++++++++++-----
UefiPayloadPkg/UefiPayloadPkg.fdf                               |  4 ++++
UefiPayloadPkg/UefiPayloadPkgIa32.dsc                           |  4 ++++
UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                        |  5 +++++
4 files changed, 33 insertions(+), 5 deletions(-)
[edk2-devel] [PATCH V2] UefiPayloadPkg/BootManager: Add PS2 keyboard support
Posted by Guo Dong 4 years, 4 months ago 
Add PS2 keyboard support.
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2316

This patch adds PS2 keyboard support in boot manager, and
add a build flag PS2_KEYBOARD_ENABLE for PS2 keyboard to
build PS2 keyboard driver and SIO driver. Be default the
build flag is not enabled since PS2 keyboard is not common
used. could use -DPS2_KEYBOARD_ENABLE to enable build it
if need this feature.

Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
---
 UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c | 25 ++++++++++++++++++++-----
 UefiPayloadPkg/UefiPayloadPkg.fdf                               |  4 ++++
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc                           |  4 ++++
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                        |  5 +++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
index ee2d8c8d1e..a27cc552ab 100644
--- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
+++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
@@ -44,6 +44,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define gPnp16550ComPort \
   PNPID_DEVICE_PATH_NODE(0x0501)
 
+#define gPnpPs2Keyboard \
+  PNPID_DEVICE_PATH_NODE(0x0303)
+
 #define gUartVendor \
   { \
     { \
@@ -87,7 +90,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
     DEVICE_PATH_MESSAGING_PC_ANSI \
   }
 
-
+ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode  = gPnpPs2Keyboard;
 ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode = gPnp16550ComPort;
 UART_DEVICE_PATH           gUartDeviceNode            = gUart;
 VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode    = gPcAnsiTerminal;
@@ -109,12 +112,15 @@ EFI_DEVICE_PATH_PROTOCOL          *gPlatformRootBridges[] = {
 BOOLEAN       mDetectVgaOnly;
 
 /**
-  Add UART to ConOut, ConIn, ErrOut.
+  Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.
 
-  @param[in]   DeviceHandle - LPC device path.
+  @param[in] DeviceHandle  Handle of the LPC Bridge device.
 
-  @retval EFI_SUCCESS  - Serial console is added to ConOut, ConIn, and ErrOut.
-  @retval EFI_STATUS   - No serial console is added.
+  @retval EFI_SUCCESS  Console devices on the LPC bridge have been added to
+                       ConOut, ConIn, and ErrOut.
+
+  @return              Error codes, due to EFI_DEVICE_PATH_PROTOCOL missing
+                       from DeviceHandle.
 **/
 EFI_STATUS
 PrepareLpcBridgeDevicePath (
@@ -123,6 +129,7 @@ PrepareLpcBridgeDevicePath (
 {
   EFI_STATUS                Status;
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
+  EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;
 
   DevicePath = NULL;
   Status = gBS->HandleProtocol (
@@ -133,10 +140,18 @@ PrepareLpcBridgeDevicePath (
   if (EFI_ERROR (Status)) {
     return Status;
   }
+  TempDevicePath = DevicePath;
+
+  //
+  // Register Keyboard
+  //
+  DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);
+  EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
 
   //
   // Register COM1
   //
+  DevicePath = TempDevicePath;
   DevicePath = AppendDevicePathNode ((EFI_DEVICE_PATH_PROTOCOL *)NULL, (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceVendorNode);
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);
   DevicePath = AppendDevicePathNode (DevicePath, (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode);
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 4cd88a3f85..dfbcde5668 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -120,6 +120,10 @@ INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
 # ISA Support
 #
 INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+!if $(PS2_KEYBOARD_ENABLE) == TRUE
+INF OvmfPkg/SioBusDxe/SioBusDxe.inf
+INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+!endif
 
 #
 # Console Support
diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 11cf17ca06..d52945442e 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -491,6 +491,10 @@
   # ISA Support
   #
   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+!if $(PS2_KEYBOARD_ENABLE) == TRUE
+  OvmfPkg/SioBusDxe/SioBusDxe.inf
+  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+!endif
 
   #
   # Console Support
diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index 5b7994a62c..0736cd9954 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -25,6 +25,7 @@
   FLASH_DEFINITION                    = UefiPayloadPkg/UefiPayloadPkg.fdf
 
   DEFINE SOURCE_DEBUG_ENABLE          = FALSE
+  DEFINE PS2_KEYBOARD_ENABLE          = FALSE
 
   #
   # SBL:      UEFI payload for Slim Bootloader
@@ -492,6 +493,10 @@
   # ISA Support
   #
   MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
+!if $(PS2_KEYBOARD_ENABLE) == TRUE
+  OvmfPkg/SioBusDxe/SioBusDxe.inf
+  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
+!endif
 
   #
   # Console Support
-- 
2.16.2.windows.1


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

View/Reply Online (#52299): https://edk2.groups.io/g/devel/message/52299
Mute This Topic: https://groups.io/mt/68776665/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH V2] UefiPayloadPkg/BootManager: Add PS2 keyboard support
Posted by Ma, Maurice 4 years, 4 months ago 
Reviewed-by: Maurice Ma <maurice.ma@intel.com>

Thanks,
-Maurice
> -----Original Message-----
> From: Dong, Guo
> Sent: Tuesday, December 17, 2019 16:12
> To: devel@edk2.groups.io
> Cc: Ma, Maurice <maurice.ma@intel.com>; You, Benjamin
> <benjamin.you@intel.com>; Dong, Guo <guo.dong@intel.com>;
> u14935@gmail.com
> Subject: [edk2-devel] [PATCH V2] UefiPayloadPkg/BootManager: Add PS2
> keyboard support
> 
> Add PS2 keyboard support.
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2316
> 
> This patch adds PS2 keyboard support in boot manager, and add a build flag
> PS2_KEYBOARD_ENABLE for PS2 keyboard to build PS2 keyboard driver and
> SIO driver. Be default the build flag is not enabled since PS2 keyboard is not
> common used. could use -DPS2_KEYBOARD_ENABLE to enable build it if
> need this feature.
> 
> Signed-off-by: Guo Dong <guo.dong@intel.com>
> Reviewed-by: Maurice Ma <maurice.ma@intel.com>
> ---
>  UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c | 25
> ++++++++++++++++++++-----
>  UefiPayloadPkg/UefiPayloadPkg.fdf                               |  4 ++++
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc                           |  4 ++++
>  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc                        |  5 +++++
>  4 files changed, 33 insertions(+), 5 deletions(-)
> 
> diff --git
> a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> index ee2d8c8d1e..a27cc552ab 100644
> --- a/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> +++ b/UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformConsole.c
> @@ -44,6 +44,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent  #define
> gPnp16550ComPort \
>    PNPID_DEVICE_PATH_NODE(0x0501)
> 
> +#define gPnpPs2Keyboard \
> +  PNPID_DEVICE_PATH_NODE(0x0303)
> +
>  #define gUartVendor \
>    { \
>      { \
> @@ -87,7 +90,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>      DEVICE_PATH_MESSAGING_PC_ANSI \
>    }
> 
> -
> +ACPI_HID_DEVICE_PATH       gPnpPs2KeyboardDeviceNode  =
> gPnpPs2Keyboard;
>  ACPI_HID_DEVICE_PATH       gPnp16550ComPortDeviceNode =
> gPnp16550ComPort;
>  UART_DEVICE_PATH           gUartDeviceNode            = gUart;
>  VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode    = gPcAnsiTerminal;
> @@ -109,12 +112,15 @@ EFI_DEVICE_PATH_PROTOCOL
> *gPlatformRootBridges[] = {
>  BOOLEAN       mDetectVgaOnly;
> 
>  /**
> -  Add UART to ConOut, ConIn, ErrOut.
> +  Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut.
> 
> -  @param[in]   DeviceHandle - LPC device path.
> +  @param[in] DeviceHandle  Handle of the LPC Bridge device.
> 
> -  @retval EFI_SUCCESS  - Serial console is added to ConOut, ConIn, and
> ErrOut.
> -  @retval EFI_STATUS   - No serial console is added.
> +  @retval EFI_SUCCESS  Console devices on the LPC bridge have been added
> to
> +                       ConOut, ConIn, and ErrOut.
> +
> +  @return              Error codes, due to EFI_DEVICE_PATH_PROTOCOL missing
> +                       from DeviceHandle.
>  **/
>  EFI_STATUS
>  PrepareLpcBridgeDevicePath (
> @@ -123,6 +129,7 @@ PrepareLpcBridgeDevicePath (  {
>    EFI_STATUS                Status;
>    EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
> +  EFI_DEVICE_PATH_PROTOCOL  *TempDevicePath;
> 
>    DevicePath = NULL;
>    Status = gBS->HandleProtocol (
> @@ -133,10 +140,18 @@ PrepareLpcBridgeDevicePath (
>    if (EFI_ERROR (Status)) {
>      return Status;
>    }
> +  TempDevicePath = DevicePath;
> +
> +  //
> +  // Register Keyboard
> +  //
> +  DevicePath = AppendDevicePathNode (DevicePath,
> + (EFI_DEVICE_PATH_PROTOCOL *)&gPnpPs2KeyboardDeviceNode);
> + EfiBootManagerUpdateConsoleVariable (ConIn, DevicePath, NULL);
> 
>    //
>    // Register COM1
>    //
> +  DevicePath = TempDevicePath;
>    DevicePath = AppendDevicePathNode ((EFI_DEVICE_PATH_PROTOCOL
> *)NULL, (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceVendorNode);
>    DevicePath = AppendDevicePathNode (DevicePath,
> (EFI_DEVICE_PATH_PROTOCOL *)&gUartDeviceNode);
>    DevicePath = AppendDevicePathNode (DevicePath,
> (EFI_DEVICE_PATH_PROTOCOL *)&gTerminalTypeDeviceNode); diff --git
> a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
> index 4cd88a3f85..dfbcde5668 100644
> --- a/UefiPayloadPkg/UefiPayloadPkg.fdf
> +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
> @@ -120,6 +120,10 @@ INF
> MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
>  # ISA Support
>  #
>  INF MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> +!if $(PS2_KEYBOARD_ENABLE) == TRUE
> +INF OvmfPkg/SioBusDxe/SioBusDxe.inf
> +INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
> +!endif
> 
>  #
>  # Console Support
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> index 11cf17ca06..d52945442e 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
> @@ -491,6 +491,10 @@
>    # ISA Support
>    #
>    MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> +!if $(PS2_KEYBOARD_ENABLE) == TRUE
> +  OvmfPkg/SioBusDxe/SioBusDxe.inf
> +  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
> +!endif
> 
>    #
>    # Console Support
> diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> index 5b7994a62c..0736cd9954 100644
> --- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
> @@ -25,6 +25,7 @@
>    FLASH_DEFINITION                    = UefiPayloadPkg/UefiPayloadPkg.fdf
> 
>    DEFINE SOURCE_DEBUG_ENABLE          = FALSE
> +  DEFINE PS2_KEYBOARD_ENABLE          = FALSE
> 
>    #
>    # SBL:      UEFI payload for Slim Bootloader
> @@ -492,6 +493,10 @@
>    # ISA Support
>    #
>    MdeModulePkg/Universal/SerialDxe/SerialDxe.inf
> +!if $(PS2_KEYBOARD_ENABLE) == TRUE
> +  OvmfPkg/SioBusDxe/SioBusDxe.inf
> +  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
> +!endif
> 
>    #
>    # Console Support
> --
> 2.16.2.windows.1


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

View/Reply Online (#52364): https://edk2.groups.io/g/devel/message/52364
Mute This Topic: https://groups.io/mt/68776665/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.