USB: ehci-dbgp,ehci: Allow early or late use of the dbgp device

If the EHCI debug port is initialized and in use, the EHCI host
controller driver must follow two rules.

1) If the EHCI host driver issues a controller reset, the debug
   controller driver re-initialization must get called after the reset
   is completed.

2) The EHCI host driver should ignore any requests to the physical
   EHCI debug port when the EHCI debug port is in use.

The code to check for the debug port was moved from ehci_pci_reinit()
to ehci_pci_setup because it must get called prior to ehci_reset()
which will clear the debug port registers.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: dbrownell@users.sourceforge.net
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 818647c33da8..6b5e4d18d4bf 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -855,6 +855,15 @@ static int ehci_hub_control (
         case SetPortFeature:
                 selector = wIndex >> 8;
                 wIndex &= 0xff;
+                if (unlikely(ehci->debug)) {
+                        /* If the debug port is active any port
+                         * feature requests should get denied */
+                        if (wIndex == HCS_DEBUG_PORT(ehci->hcs_params) &&
+                            (readl(&ehci->debug->control) & DBGP_ENABLED)) {
+                                retval = -ENODEV;
+                                goto error_exit;
+                        }
+                }
                 if (!wIndex || wIndex > ports)
                         goto error;
                 wIndex--;
@@ -951,6 +960,7 @@ error:
                 /* "stall" on error */
                 retval = -EPIPE;
         }
+error_exit:
         spin_unlock_irqrestore (&ehci->lock, flags);
         return retval;
 }