MdeModulePkg Ps2KbDxe: Execute key notify func at TPL_CALLBACK

Current implementation executes key notify function in TimerHandler
at TPL_NOTIFY. The code change is to make key notify function
executed at TPL_CALLBACK to reduce the time occupied at TPL_NOTIFY.

The code will signal KeyNotify process event if the key pressed
matches any key registered and insert the KeyData to the EFI Key
queue for notify, then the KeyNotify process handler will invoke
key notify functions at TPL_CALLBACK.

Cc: Ruiyu Ni <Ruiyu.ni@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index eeb7de34ab..f92521046f 100644
--- a/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -1420,7 +1420,7 @@ KeyGetchar (
   }

 

   //

-  // Invoke notification functions if exist

+  // Signal KeyNotify process event if this key pressed matches any key registered.

   //

   for (Link = GetFirstNode (&ConsoleIn->NotifyList); !IsNull (&ConsoleIn->NotifyList, Link); Link = GetNextNode (&ConsoleIn->NotifyList, Link)) {

     CurrentNotify = CR (

@@ -1430,7 +1430,13 @@ KeyGetchar (
                       KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE

                       );

     if (IsKeyRegistered (&CurrentNotify->KeyData, &KeyData)) {

-      CurrentNotify->KeyNotificationFn (&KeyData);

+      //

+      // The key notification function needs to run at TPL_CALLBACK

+      // while current TPL is TPL_NOTIFY. It will be invoked in

+      // KeyNotifyProcessHandler() which runs at TPL_CALLBACK.

+      //

+      PushEfikeyBufTail (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);

+      gBS->SignalEvent (ConsoleIn->KeyNotifyProcessEvent);

     }

   }

 

@@ -1629,6 +1635,8 @@ InitKeyboard (
   ConsoleIn->ScancodeQueue.Tail = 0;

   ConsoleIn->EfiKeyQueue.Head   = 0;

   ConsoleIn->EfiKeyQueue.Tail   = 0;

+  ConsoleIn->EfiKeyQueueForNotify.Head = 0;

+  ConsoleIn->EfiKeyQueueForNotify.Tail = 0;

 

   //

   // Reset the status indicators