[PATCH v2 0/1] MdeModulePkg/Usb/EfiKey: Fix endpoint selection

[PATCH v2 0/1] MdeModulePkg/Usb/EfiKey: Fix endpoint selection

[MrChromebox]

USB keyboard initialization fails if the OUT interrupt
endpoint precedes the IN endpoint. Fix that.

Matt DeVillier (1):
  MdeModulePkg/Usb/EfiKey: Fix endpoint selection

 MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.20.1

[PATCH v2 1/1] MdeModulePkg/Usb/EfiKey: Fix endpoint selection

[MrChromebox]

The endpoint selected by the driver needs to not
only be an interrupt type, but have direction IN
as required to set up an asynchronous interrupt transfer.

Currently, the driver assumes that the first INT endpoint
will be of type IN, but that is not true of all devices,
and will silently fail on devices which have the OUT endpoint
before the IN. Adjust the endpoint selection loop to explictly
check for direction IN.

Test: detachable keyboard on Google Pixel Slate now works.

Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
---
 MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index 27685995c2..ccb389067a 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -215,7 +215,7 @@ USBKeyboardDriverBindingStart (
   EndpointNumber = UsbKeyboardDevice->InterfaceDescriptor.NumEndpoints;
 
   //
-  // Traverse endpoints to find interrupt endpoint
+  // Traverse endpoints to find interrupt endpoint IN
   //
   Found = FALSE;
   for (Index = 0; Index < EndpointNumber; Index++) {
@@ -226,7 +226,8 @@ USBKeyboardDriverBindingStart (
              &EndpointDescriptor
              );
 
-    if ((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT) {
+    if (((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT) &&
+        ((EndpointDescriptor.EndpointAddress & USB_ENDPOINT_DIR_IN) != 0)) {
       //
       // We only care interrupt endpoint here
       //
-- 
2.20.1

Re: [edk2-devel] [PATCH v2 0/1] MdeModulePkg/Usb/EfiKey: Fix endpoint selection

[Wu, Hao A]

I found that besides the UsbKbDxe & UsbMouseDxe drivers, UsbMouseAbsolutePointerDxe
has a similar issue. Could you help to address it as well?

Really sorry about this, I should have caught this earlier.

Best Regards,
Hao Wu


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> MrChromebox
> Sent: Friday, January 03, 2020 11:43 AM
> To: devel@edk2.groups.io
> Cc: Matt DeVillier
> Subject: [edk2-devel] [PATCH v2 0/1] MdeModulePkg/Usb/EfiKey: Fix
> endpoint selection
> 
> USB keyboard initialization fails if the OUT interrupt
> endpoint precedes the IN endpoint. Fix that.
> 
> Matt DeVillier (1):
>   MdeModulePkg/Usb/EfiKey: Fix endpoint selection
> 
>  MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> --
> 2.20.1
> 
> 
>