IntelFrameworkModulePkg 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>
Cc: Jeff Fan <jeff.fan@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
Reviewed-by: Ruiyu Ni <Ruiyu.ni@intel.com>

4 files changed, 98 insertions, 5 deletions

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
index 9bde538d10..b528b89ac4 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdCtrller.c
@@ -1,7 +1,7 @@
 /** @file

   Routines that access 8042 keyboard controller

 

-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -1456,7 +1456,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 (

@@ -1466,7 +1466,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);

     }

   }

 

@@ -1665,6 +1671,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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
index 0efeb39e0d..5825a04c3e 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KbdTextIn.c
@@ -2,7 +2,7 @@
   Routines implements SIMPLE_TEXT_IN protocol's interfaces based on 8042 interfaces

   provided by Ps2KbdCtrller.c.

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -681,3 +681,52 @@ Exit:
   return Status;

 }

 

+/**

+  Process key notify.

+

+  @param  Event                 Indicates the event that invoke this function.

+  @param  Context               Indicates the calling context.

+**/

+VOID

+EFIAPI

+KeyNotifyProcessHandler (

+  IN  EFI_EVENT                 Event,

+  IN  VOID                      *Context

+  )

+{

+  EFI_STATUS                    Status;

+  KEYBOARD_CONSOLE_IN_DEV       *ConsoleIn;

+  EFI_KEY_DATA                  KeyData;

+  LIST_ENTRY                    *Link;

+  LIST_ENTRY                    *NotifyList;

+  KEYBOARD_CONSOLE_IN_EX_NOTIFY *CurrentNotify;

+  EFI_TPL                       OldTpl;

+

+  ConsoleIn = (KEYBOARD_CONSOLE_IN_DEV *) Context;

+

+  //

+  // Invoke notification functions.

+  //

+  NotifyList = &ConsoleIn->NotifyList;

+  while (TRUE) {

+    //

+    // Enter critical section

+    //  

+    OldTpl = gBS->RaiseTPL (TPL_NOTIFY);

+    Status = PopEfikeyBufHead (&ConsoleIn->EfiKeyQueueForNotify, &KeyData);

+    //

+    // Leave critical section

+    //

+    gBS->RestoreTPL (OldTpl);

+    if (EFI_ERROR (Status)) {

+      break;

+    }

+    for (Link = GetFirstNode (NotifyList); !IsNull (NotifyList, Link); Link = GetNextNode (NotifyList, Link)) {

+      CurrentNotify = CR (Link, KEYBOARD_CONSOLE_IN_EX_NOTIFY, NotifyEntry, KEYBOARD_CONSOLE_IN_EX_NOTIFY_SIGNATURE);

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

+        CurrentNotify->KeyNotificationFn (&KeyData);

+      }

+    }

+  }

+}

+

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
index b6a9b70ca9..ff562b2698 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.c
@@ -3,7 +3,7 @@
   PS/2 Keyboard driver. Routines that interacts with callers,

   conforming to EFI driver model

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -306,6 +306,7 @@ KbdControllerDriverStart (
     StatusCode  = EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR;

     goto ErrorExit;

   }

+  

   // Setup a periodic timer, used for reading keystrokes at a fixed interval

   //

   Status = gBS->CreateEvent (

@@ -332,6 +333,19 @@ KbdControllerDriverStart (
     goto ErrorExit;

   }

 

+  Status = gBS->CreateEvent (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_CALLBACK,

+                  KeyNotifyProcessHandler,

+                  ConsoleIn,

+                  &ConsoleIn->KeyNotifyProcessEvent

+                  );

+  if (EFI_ERROR (Status)) {

+    Status      = EFI_OUT_OF_RESOURCES;

+    StatusCode  = EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_CONTROLLER_ERROR;

+    goto ErrorExit;

+  }

+

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

     EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT,

@@ -411,6 +425,9 @@ ErrorExit:
   if ((ConsoleIn != NULL) && (ConsoleIn->ConInEx.WaitForKeyEx != NULL)) {

     gBS->CloseEvent (ConsoleIn->ConInEx.WaitForKeyEx);

   }

+  if ((ConsoleIn != NULL) && (ConsoleIn->KeyNotifyProcessEvent != NULL)) {

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

+  }

   KbdFreeNotifyList (&ConsoleIn->NotifyList);

   if ((ConsoleIn != NULL) && (ConsoleIn->ControllerNameTable != NULL)) {

     FreeUnicodeStringTable (ConsoleIn->ControllerNameTable);

@@ -565,6 +582,10 @@ KbdControllerDriverStop (
     gBS->CloseEvent (ConsoleIn->ConInEx.WaitForKeyEx);

     ConsoleIn->ConInEx.WaitForKeyEx = NULL;

   }

+  if (ConsoleIn->KeyNotifyProcessEvent != NULL) {

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

+    ConsoleIn->KeyNotifyProcessEvent = NULL;

+  }

   KbdFreeNotifyList (&ConsoleIn->NotifyList);

   FreeUnicodeStringTable (ConsoleIn->ControllerNameTable);

   gBS->FreePool (ConsoleIn);

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
index 62d0e78c4d..82aa5a64fa 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2Keyboard.h
@@ -104,6 +104,7 @@ typedef struct {
   //

   SCAN_CODE_QUEUE                     ScancodeQueue;

   EFI_KEY_QUEUE                       EfiKeyQueue;

+  EFI_KEY_QUEUE                       EfiKeyQueueForNotify;

 

   //

   // Error state

@@ -117,6 +118,7 @@ typedef struct {
   // Notification Function List

   //

   LIST_ENTRY                          NotifyList;

+  EFI_EVENT                           KeyNotifyProcessEvent;

 } KEYBOARD_CONSOLE_IN_DEV;

 

 #define KEYBOARD_CONSOLE_IN_DEV_FROM_THIS(a)  CR (a, KEYBOARD_CONSOLE_IN_DEV, ConIn, KEYBOARD_CONSOLE_IN_DEV_SIGNATURE)

@@ -268,6 +270,19 @@ KeyGetchar (
   );

 

 /**

+  Process key notify.

+

+  @param  Event                 Indicates the event that invoke this function.

+  @param  Context               Indicates the calling context.

+**/

+VOID

+EFIAPI

+KeyNotifyProcessHandler (

+  IN  EFI_EVENT                 Event,

+  IN  VOID                      *Context

+  );

+

+/**

   Perform 8042 controller and keyboard Initialization.

   If ExtendedVerification is TRUE, do additional test for

   the keyboard interface