2004-01-13 12:05:57

by Colin Leroy

[permalink] [raw]
Subject: cdc-acm problems

Hi,

I have problems with cdc-acm killing ohci. I tried to narrow down the problem,
but didn't get far.
Basically `killall -HUP pppd` gives (in dmesg):

drivers/usb/class/cdc-acm.c: acm_ctrl_irq - urb shutting down with status: -2
ohci_hcd 0001:01:1b.1: OHCI Unrecoverable Error, disabled
ohci_hcd 0001:01:1b.1: HC died; cleaning up
usb 4-1: USB disconnect, address 2
bus usb: remove device 4-1:1.0
bus usb: remove device 4-1:1.1
bus usb: remove device 4-1

I modified cdc-acm.c according to the attached patch, and noticed there may be
a buffer overflow: after applying this patch, `dmesg|grep high` gives:
drivers/usb/class/cdc-acm.c: databits index too high: 48
drivers/usb/class/cdc-acm.c: databits index too high: 48
drivers/usb/class/cdc-acm.c: databits index too high: 48
drivers/usb/class/cdc-acm.c: databits index too high: 48
drivers/usb/class/cdc-acm.c: databits index too high: 48

I'm on a Mac (big-endian). Maybe an endianness issue ?
My patch doesn't solve any problem, but maybe exposes one.

By the way, what's the difference between cpu_to_le32p() and cpu_to_le32() ?
I'm wondering because of the newline.speed = cpu_to_le32p(...) line (537).

Thanks,
--
Colin


Attachments:
cdc-acm.patch (1.21 kB)

2004-01-13 20:48:51

by Colin Leroy

[permalink] [raw]
Subject: [PATCH] Re: cdc-acm problems


> I have problems with cdc-acm killing ohci. I tried to narrow down the problem,
> but didn't get far.
> Basically `killall -HUP pppd` gives (in dmesg):
>
> drivers/usb/class/cdc-acm.c: acm_ctrl_irq - urb shutting down with status: -2
> ohci_hcd 0001:01:1b.1: OHCI Unrecoverable Error, disabled
> ohci_hcd 0001:01:1b.1: HC died; cleaning up
> usb 4-1: USB disconnect, address 2
> bus usb: remove device 4-1:1.0
> bus usb: remove device 4-1:1.1
> bus usb: remove device 4-1

After having looked some more hours, it looks like acm_tty_close() unlinks
urbs too soon or something like that... The attached patch fixes it for me
(I don't think it's really clean, but it may help ?)

--
Colin


Attachments:
cdc-acm.diff (1.25 kB)

2004-01-15 01:45:38

by Benjamin Herrenschmidt

[permalink] [raw]
Subject: Re: cdc-acm problems

On Tue, 2004-01-13 at 23:05, Colin Leroy wrote:
> Hi,
>
> I have problems with cdc-acm killing ohci. I tried to narrow down the problem,
> but didn't get far.
> Basically `killall -HUP pppd` gives (in dmesg):
>
> drivers/usb/class/cdc-acm.c: acm_ctrl_irq - urb shutting down with status: -2
> ohci_hcd 0001:01:1b.1: OHCI Unrecoverable Error, disabled
> ohci_hcd 0001:01:1b.1: HC died; cleaning up

The above is interesting, looks like a PCI error. I keep getting those
unrecoverable errors with those new USB2 capable chips, I don't know
what's going on yet. Can try this patch and tell me what it dumps ?


===== drivers/usb/host/ohci-hcd.c 1.53 vs edited =====
--- 1.53/drivers/usb/host/ohci-hcd.c Wed Dec 31 15:25:17 2003
+++ edited/drivers/usb/host/ohci-hcd.c Wed Jan 14 13:20:52 2004
@@ -316,6 +316,11 @@
/* ASSERT: any requests/urbs are being unlinked */
/* ASSERT: nobody can be submitting urbs for this any more */

+ if (!HCD_IS_RUNNING (ohci->hcd.state)) {
+ ed->state = ED_IDLE;
+ finish_unlinks (ohci, 0, 0);
+ }
+
epnum <<= 1;
if (epnum != 0 && !(ep & USB_DIR_IN))
epnum |= 1;
@@ -571,9 +576,17 @@
disable (ohci);
ohci_err (ohci, "OHCI Unrecoverable Error, disabled\n");
// e.g. due to PCI Master/Target Abort
+#if 1
+ if (hcd->pdev) {
+ u16 status;
+
+ pci_read_config_word(hcd->pdev, PCI_STATUS, &status);
+ printk(KERN_ERR "OHCI PCI Status: 0x%04x\n", status);
+ }
+#endif

ohci_dump (ohci, 1);
- hc_reset (ohci);
+ hc_reset (ohci);
}

if (ints & OHCI_INTR_WDH) {
===== drivers/usb/host/ohci-pci.c 1.20 vs edited =====
--- 1.20/drivers/usb/host/ohci-pci.c Tue Oct 28 15:36:00 2003
+++ edited/drivers/usb/host/ohci-pci.c Wed Jan 14 13:23:07 2004
@@ -36,6 +36,17 @@
int ret;

if (hcd->pdev) {
+#if 1
+ u16 status;
+
+ pci_read_config_word(hcd->pdev, PCI_STATUS, &status);
+ printk(KERN_ERR "OHCI PCI Status: 0x%04x\n", status);
+ if (status & 0xf900) {
+ printk(KERN_ERR "Initial error ! clearing ...\n");
+ pci_write_config_word(hcd->pdev, PCI_STATUS, status);
+ }
+#endif
+
ohci->hcca = pci_alloc_consistent (hcd->pdev,
sizeof *ohci->hcca, &ohci->hcca_dma);
if (!ohci->hcca)