* Peter Zijlstra <[email protected]> wrote:
> Hi Ingo,
>
> I'm having some difficulty with your latest patches; more specifically
> linux-2.6.12-rc6-git4-RT-V0.7.48-10 floods me with BUGs like these:
> I gather these are because of:
>
> drivers/usb/code/hcd.c:rh_report_status
>
> static void rh_report_status (unsigned long ptr)
does the patch below help?
> On another note; X seems to have trouble getting up. It consumes a
> full CPU right after mode switching (afaict) without getting any
> progress. I'll try and get a nice trace of X using sysrq-t.
could this be due to the messages spamming the console?
Ingo
--- usb/core/hcd.c.orig
+++ usb/core/hcd.c
@@ -353,7 +353,9 @@ static int rh_call_control (struct usb_h
const u8 *bufp = tbuf;
int len = 0;
int patch_wakeup = 0;
+#ifndef CONFIG_PREEMPT_RT
unsigned long flags;
+#endif
int status = 0;
int n;
@@ -506,13 +508,17 @@ error:
}
/* any errors get returned through the urb completion */
+#ifndef CONFIG_PREEMPT_RT
local_irq_save (flags);
+#endif
spin_lock (&urb->lock);
if (urb->status == -EINPROGRESS)
urb->status = status;
spin_unlock (&urb->lock);
usb_hcd_giveback_urb (hcd, urb, NULL);
+#ifndef CONFIG_PREEMPT_RT
local_irq_restore (flags);
+#endif
return 0;
}
@@ -562,15 +568,13 @@ static void rh_report_status (unsigned l
unsigned long flags;
urb = (struct urb *) ptr;
- local_irq_save (flags);
- spin_lock (&urb->lock);
+ spin_lock_irqsave (&urb->lock, flags);
/* do nothing if the urb's been unlinked */
if (!urb->dev
|| urb->status != -EINPROGRESS
|| (hcd = urb->dev->bus->hcpriv) == NULL) {
- spin_unlock (&urb->lock);
- local_irq_restore (flags);
+ spin_unlock_irqrestore (&urb->lock, flags);
return;
}
@@ -588,12 +592,12 @@ static void rh_report_status (unsigned l
mod_timer (&hcd->rh_timer, jiffies + HZ/4);
}
spin_unlock (&hcd_data_lock);
- spin_unlock (&urb->lock);
/* local irqs are always blocked in completions */
if (length > 0)
usb_hcd_giveback_urb (hcd, urb, NULL);
- local_irq_restore (flags);
+
+ spin_unlock_irqrestore (&urb->lock, flags);
}
/*-------------------------------------------------------------------------*/
@@ -619,17 +623,23 @@ static int rh_urb_enqueue (struct usb_hc
static int usb_rh_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
{
+#ifndef CONFIG_PREEMPT_RT
unsigned long flags;
+#endif
/* note: always a synchronous unlink */
if ((unsigned long) urb == hcd->rh_timer.data) {
del_timer_sync (&hcd->rh_timer);
hcd->rh_timer.data = 0;
+#ifndef CONFIG_PREEMPT_RT
local_irq_save (flags);
+#endif
urb->hcpriv = NULL;
usb_hcd_giveback_urb (hcd, urb, NULL);
+#ifndef CONFIG_PREEMPT_RT
local_irq_restore (flags);
+#endif
} else if (usb_pipeendpoint(urb->pipe) == 0) {
spin_lock_irq(&urb->lock); /* from usb_kill_urb */
@@ -1357,15 +1367,13 @@ hcd_endpoint_disable (struct usb_device
WARN_ON (!HC_IS_RUNNING (hcd->state) && hcd->state != HC_STATE_HALT);
- local_irq_disable ();
-
/* FIXME move most of this into message.c as part of its
* endpoint disable logic
*/
/* ep is already gone from udev->ep_{in,out}[]; no more submits */
rescan:
- spin_lock (&hcd_data_lock);
+ spin_lock_irq (&hcd_data_lock);
list_for_each_entry (urb, &ep->urb_list, urb_list) {
int tmp;
@@ -1378,13 +1386,13 @@ rescan:
if (urb->status != -EINPROGRESS)
continue;
usb_get_urb (urb);
- spin_unlock (&hcd_data_lock);
+ spin_unlock_irq (&hcd_data_lock);
- spin_lock (&urb->lock);
+ spin_lock_irq (&urb->lock);
tmp = urb->status;
if (tmp == -EINPROGRESS)
urb->status = -ESHUTDOWN;
- spin_unlock (&urb->lock);
+ spin_unlock_irq (&urb->lock);
/* kick hcd unless it's already returning this */
if (tmp == -EINPROGRESS) {
@@ -1407,8 +1415,7 @@ rescan:
/* list contents may have changed */
goto rescan;
}
- spin_unlock (&hcd_data_lock);
- local_irq_enable ();
+ spin_unlock_irq (&hcd_data_lock);
/* synchronize with the hardware, so old configuration state
* clears out immediately (and will be freed).
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
