2008-07-27 01:13:18

by Yinghai Lu

Subject: [PATCH] usb: don't hide bios bug warning

quirk_usb_disable_handoff will wait a while if there is BIOS bug.
let the end user know the reason for that.

Signed-off-by: Yinghai Lu <[email protected]>

---
drivers/usb/host/pci-quirks.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

Index: linux-2.6/drivers/usb/host/pci-quirks.c
===================================================================
--- linux-2.6.orig/drivers/usb/host/pci-quirks.c
+++ linux-2.6/drivers/usb/host/pci-quirks.c
@@ -190,7 +190,8 @@ static void __devinit quirk_usb_handoff_
msleep(10);
}
if (wait_time <= 0)
- dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
+ dev_printk(KERN_WARNING, &pdev->dev,
+ "OHCI: BIOS handoff failed"
" (BIOS bug?) %08x\n",
readl(base + OHCI_CONTROL));

@@ -242,7 +243,8 @@ static void __devinit quirk_usb_disable_
switch (cap & 0xff) {
case 1: /* BIOS/SMM/... handoff support */
if ((cap & EHCI_USBLEGSUP_BIOS)) {
- dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n");
+ dev_printk(KERN_DEBUG, &pdev->dev,
+ "EHCI: BIOS handoff\n");

#if 0
/* [email protected] reports that some systems need SMI forced on,
@@ -283,7 +285,8 @@ static void __devinit quirk_usb_disable_
/* well, possibly buggy BIOS... try to shut
* it down, and hope nothing goes too wrong
*/
- dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
+ dev_printk(KERN_WARNING, &pdev->dev,
+ "EHCI: BIOS handoff failed"
" (BIOS bug?) %08x\n", cap);
pci_write_config_byte(pdev, offset + 2, 0);
}

2008-07-27 01:27:43

by Greg KH

Subject: Re: [PATCH] usb: don't hide bios bug warning

On Sat, Jul 26, 2008 at 06:12:15PM -0700, Yinghai Lu wrote:
>
> quirk_usb_disable_handoff will wait a while if there is BIOS bug.
> let the end user know the reason for that.
>
> Signed-off-by: Yinghai Lu <[email protected]>
>
> ---
> drivers/usb/host/pci-quirks.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> Index: linux-2.6/drivers/usb/host/pci-quirks.c
> ===================================================================
> --- linux-2.6.orig/drivers/usb/host/pci-quirks.c
> +++ linux-2.6/drivers/usb/host/pci-quirks.c
> @@ -190,7 +190,8 @@ static void __devinit quirk_usb_handoff_
> msleep(10);
> }
> if (wait_time <= 0)
> - dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
> + dev_printk(KERN_WARNING, &pdev->dev,
> + "OHCI: BIOS handoff failed"

This is the exact same thing here, no change.

> @@ -242,7 +243,8 @@ static void __devinit quirk_usb_disable_
> switch (cap & 0xff) {
> case 1: /* BIOS/SMM/... handoff support */
> if ((cap & EHCI_USBLEGSUP_BIOS)) {
> - dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n");
> + dev_printk(KERN_DEBUG, &pdev->dev,
> + "EHCI: BIOS handoff\n");

Is this what you really want to see? But you just made things noiser.

> @@ -283,7 +285,8 @@ static void __devinit quirk_usb_disable_
> /* well, possibly buggy BIOS... try to shut
> * it down, and hope nothing goes too wrong
> */
> - dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
> + dev_printk(KERN_WARNING, &pdev->dev,
> + "EHCI: BIOS handoff failed"

This is the exact same thing, no change.

confused,

greg k-h

2008-07-27 01:48:20

by Yinghai Lu

Subject: Re: [PATCH] usb: don't hide bios bug warning

On Sat, Jul 26, 2008 at 6:24 PM, Greg KH <[email protected]> wrote:
> On Sat, Jul 26, 2008 at 06:12:15PM -0700, Yinghai Lu wrote:
>>
>> quirk_usb_disable_handoff will wait a while if there is BIOS bug.
>> let the end user know the reason for that.
>>
>> Signed-off-by: Yinghai Lu <[email protected]>
>>
>> ---
>> drivers/usb/host/pci-quirks.c | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> Index: linux-2.6/drivers/usb/host/pci-quirks.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/usb/host/pci-quirks.c
>> +++ linux-2.6/drivers/usb/host/pci-quirks.c
>> @@ -190,7 +190,8 @@ static void __devinit quirk_usb_handoff_
>> msleep(10);
>> }
>> if (wait_time <= 0)
>> - dev_warn(&pdev->dev, "OHCI: BIOS handoff failed"
>> + dev_printk(KERN_WARNING, &pdev->dev,
>> + "OHCI: BIOS handoff failed"
>
> This is the exact same thing here, no change.
>
>> @@ -242,7 +243,8 @@ static void __devinit quirk_usb_disable_
>> switch (cap & 0xff) {
>> case 1: /* BIOS/SMM/... handoff support */
>> if ((cap & EHCI_USBLEGSUP_BIOS)) {
>> - dev_dbg(&pdev->dev, "EHCI: BIOS handoff\n");
>> + dev_printk(KERN_DEBUG, &pdev->dev,
>> + "EHCI: BIOS handoff\n");
>
> Is this what you really want to see? But you just made things noiser.
>
>> @@ -283,7 +285,8 @@ static void __devinit quirk_usb_disable_
>> /* well, possibly buggy BIOS... try to shut
>> * it down, and hope nothing goes too wrong
>> */
>> - dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
>> + dev_printk(KERN_WARNING, &pdev->dev,
>> + "EHCI: BIOS handoff failed"
>
> This is the exact same thing, no change.
>
> confused,

end user will not set CONFIG_USB_DEBUG, so that dev_warn will do nothing.

YH

2008-07-27 01:54:32

by David Brownell

Subject: Re: [PATCH] usb: don't hide bios bug warning

> >> - dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
> >> + dev_printk(KERN_WARNING, &pdev->dev,
> >> + "EHCI: BIOS handoff failed"
> >
> > This is the exact same thing, no change.
> >
> > confused,
>
> end user will not set CONFIG_USB_DEBUG, so that dev_warn will do nothing.

Yes it does ... KERN_WARNING != KERN_DEBUG, and it's the latter
which is toggled (via DEBUG) by CONFIG_USB_DEBUG...

2008-07-27 03:25:06

by Yinghai Lu

Subject: Re: [PATCH] usb: don't hide bios bug warning

On Sat, Jul 26, 2008 at 6:56 PM, David Brownell <[email protected]> wrote:
>> >> - dev_warn(&pdev->dev, "EHCI: BIOS handoff failed"
>> >> + dev_printk(KERN_WARNING, &pdev->dev,
>> >> + "EHCI: BIOS handoff failed"
>> >
>> > This is the exact same thing, no change.
>> >
>> > confused,
>>
>> end user will not set CONFIG_USB_DEBUG, so that dev_warn will do nothing.
>
> Yes it does ... KERN_WARNING != KERN_DEBUG, and it's the latter
> which is toggled (via DEBUG) by CONFIG_USB_DEBUG...

you are right,

please forget about the patch.

YH