[edk2] [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

[edk2] [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

[MrChromebox]

[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]

>From 2a8e343f8a5848825d3d12ba76df0fb4212ab5b8 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Thu, 12 Dec 2019 12:54:14 -0600
Subject: [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

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.

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

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index f4448bffe6..e9f74cec60 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -209,7 +209,7 @@ USBMouseDriverBindingStart (
EndpointNumber = UsbMouseDevice->InterfaceDescriptor.NumEndpoints;

//
-  // Traverse endpoints to find interrupt endpoint
+  // Traverse endpoints to find interrupt endpoint IN
//
Found = FALSE;
for (Index = 0; Index < EndpointNumber; Index++) {
@@ -219,7 +219,8 @@ USBMouseDriverBindingStart (
&EndpointDescriptor
);

-    if ((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT) {
+    if ((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT &&
+          (EndpointDescriptor.EndpointAddress & USB_ENDPOINT_DIR_IN) ) {
//
// We only care interrupt endpoint here
//
--
2.20.1

[-- Attachment #2: Type: text/html, Size: 2679 bytes --]

Re: [edk2-devel] [edk2] [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

[newexplorerj]

[-- Attachment #1: Type: text/plain, Size: 47 bytes --]

Reviewed-by: GuoMinJ <newexplorerj@gmail.com>

[-- Attachment #2: Type: text/html, Size: 53 bytes --]

Re: [edk2-devel] [edk2] [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

[Wu, Hao A]

[-- Attachment #1: Type: text/plain, Size: 2487 bytes --]

Similar comments with PATCH 1, could you help to change the modified 'if'
statement to:

if (((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT) &&
    ((EndpointDescriptor.EndpointAddress & USB_ENDPOINT_DIR_IN) != 0)) {

so that the 2nd condition can be aligned with others.

With the above change
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of MrChromebox
Sent: Friday, December 13, 2019 3:38 AM
To: devel@edk2.groups.io
Subject: [edk2-devel] [edk2] [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

From 2a8e343f8a5848825d3d12ba76df0fb4212ab5b8 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Thu, 12 Dec 2019 12:54:14 -0600
Subject: [PATCH 2/2] MdeModulePkg/Usb/UsbMouse: Fix endpoint selection

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.

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

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index f4448bffe6..e9f74cec60 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -209,7 +209,7 @@ USBMouseDriverBindingStart (
   EndpointNumber = UsbMouseDevice->InterfaceDescriptor.NumEndpoints;

   //
-  // Traverse endpoints to find interrupt endpoint
+  // Traverse endpoints to find interrupt endpoint IN
   //
   Found = FALSE;
   for (Index = 0; Index < EndpointNumber; Index++) {
@@ -219,7 +219,8 @@ USBMouseDriverBindingStart (
              &EndpointDescriptor
              );

-    if ((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT) {
+    if ((EndpointDescriptor.Attributes & (BIT0 | BIT1)) == USB_ENDPOINT_INTERRUPT &&
+          (EndpointDescriptor.EndpointAddress & USB_ENDPOINT_DIR_IN) ) {
       //
       // We only care interrupt endpoint here
       //
--
2.20.1



[-- Attachment #2: Type: text/html, Size: 30923 bytes --]