This is a note to let you know that I've just added the patch titled
Subject: USB: ehci potential oops fix on ARC/TDI cores
to my gregkh-2.6 tree. Its filename is
usb-ehci-potential-oops-fix-on-arc-tdi-cores.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From [EMAIL PROTECTED] Wed Dec 19 12:04:15 2007
From: David Brownell <[EMAIL PROTECTED]>
Date: Wed, 19 Dec 2007 11:30:39 -0800
Subject: USB: ehci potential oops fix on ARC/TDI cores
To: Greg KH <[EMAIL PROTECTED]>, USB list <linux-usb@vger.kernel.org>
Message-ID: <[EMAIL PROTECTED]>
Content-Disposition: inline
Kernel bugzilla entry #9569 reports a potential OOPS in some code
supporting the integrated root hub TT support used on ARC/TDI
derived cores. (This seems to have been a longstanding issue.)
This patch cleans up usage of urb->dev->tt to avoid that potential
oops and also fixes some overly long lines.
Signed-off-by: David Brownell <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
---
drivers/usb/host/ehci-q.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -198,7 +198,8 @@ static int qtd_copy_status (
/* if async CSPLIT failed, try cleaning out the TT buffer */
if (status != -EPIPE
- && urb->dev->tt && !usb_pipeint (urb->pipe)
+ && urb->dev->tt
+ && !usb_pipeint(urb->pipe)
&& ((token & QTD_STS_MMF) != 0
|| QTD_CERR(token) == 0)
&& (!ehci_is_TDI(ehci)
@@ -211,6 +212,9 @@ static int qtd_copy_status (
urb->dev->ttport, urb->dev->devnum,
usb_pipeendpoint (urb->pipe), token);
#endif /* DEBUG */
+ /* REVISIT ARC-derived cores don't clear the root
+ * hub TT buffer in this way...
+ */
usb_hub_tt_clear_buffer (urb->dev, urb->pipe);
}
}
@@ -638,6 +642,7 @@ qh_make (
u32 info1 = 0, info2 = 0;
int is_input, type;
int maxp = 0;
+ struct usb_tt *tt = urb->dev->tt;
if (!qh)
return qh;
@@ -661,8 +666,9 @@ qh_make (
* For control/bulk requests, the HC or TT handles these.
*/
if (type == PIPE_INTERRUPT) {
- qh->usecs = NS_TO_US (usb_calc_bus_time (USB_SPEED_HIGH,
is_input, 0,
- hb_mult (maxp) * max_packet (maxp)));
+ qh->usecs = NS_TO_US(usb_calc_bus_time(USB_SPEED_HIGH,
+ is_input, 0,
+ hb_mult(maxp) * max_packet(maxp)));
qh->start = NO_FRAME;
if (urb->dev->speed == USB_SPEED_HIGH) {
@@ -680,7 +686,6 @@ qh_make (
goto done;
}
} else {
- struct usb_tt *tt = urb->dev->tt;
int think_time;
/* gap is f(FS/LS transfer times) */
@@ -736,10 +741,8 @@ qh_make (
/* set the address of the TT; for TDI's integrated
* root hub tt, leave it zeroed.
*/
- if (!ehci_is_TDI(ehci)
- || urb->dev->tt->hub !=
- ehci_to_hcd(ehci)->self.root_hub)
- info2 |= urb->dev->tt->hub->devnum << 16;
+ if (tt && tt->hub != ehci_to_hcd(ehci)->self.root_hub)
+ info2 |= tt->hub->devnum << 16;
/* NOTE: if (PIPE_INTERRUPT) { scheduler sets c-mask } */
Patches currently in gregkh-2.6 which might be from [EMAIL PROTECTED] are
usb/usb-convert-ehci-debug-files-to-use-debugfs-instead-of-sysfs.patch
usb/usb-convert-ohci-debug-files-to-use-debugfs-instead-of-sysfs.patch
usb/usb-ehci-add-separate-iaa-watchdog-timer.patch
usb/usb-gadget-pxa2xx_udc-supports-inverted-vbus.patch
usb/usb-remove-ohci-useless-masking-unmasking-of-wdh-interrupt.patch
usb/usb-device-dma-support-on-omap2.patch
usb/usb-s3c2410_udc-minor-irq-handler-cleanups.patch
usb/usb-m66592-udc-add-support-for-sh7722-usbf.patch
usb/usb-add-missing-space-to-printk-messages.patch
usb/usb-add-printer-gadget-driver.patch
usb/usb-usb-peripheral-controller-driver-oops-avoidance.patch
usb/usb-gadget-at91_udc-minor-fix.patch
usb/usb-don-t-change-hc-power-state-for-a-freeze.patch
usb/usb-dummy_hcd-don-t-register-drivers-on-the-platform-bus.patch
usb/usb-force-handover-port-to-companion-when-hub_port_connect_change-fails.patch
usb/usb-gadget-code-switches-to-pr_err-and-friends.patch
usb/usb-update-pxa27x-ohci-driver-to-use-clk-support.patch
usb/usb-add-marvell-orion-usb-host-support.patch
usb/usb-ehci-potential-oops-fix-on-arc-tdi-cores.patch
usb/usb-gadget-ethernet-error-path-potential-oops-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
