[RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four

[RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four

[Yinghai Lu]

so we avoid checking class again and again in that quirk.

following patches will remove disable/enable for non-xhci
and nelogic vendor checking for uhci/xhci

So total lines will increase 8 at last.

need to be applied after pci/linux-next and usb/usb-next

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 drivers/usb/host/pci-quirks.c |   64 ++++++++++++++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 14 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
@@ -884,17 +884,60 @@ static void __devinit quirk_usb_handoff_
 	iounmap(base);
 }
 
-static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
+static void __devinit quirk_usb_early_handoff_uhci(struct pci_dev *pdev)
+{
+	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
+		return;
+
+	if (pci_enable_device(pdev) < 0) {
+		dev_warn(&pdev->dev, "Can't enable PCI device, "
+				"BIOS handoff failed.\n");
+		return;
+	}
+	quirk_usb_handoff_uhci(pdev);
+	pci_disable_device(pdev);
+}
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
+
+static void __devinit quirk_usb_early_handoff_ohci(struct pci_dev *pdev)
 {
 	/* Skip Netlogic mips SoC's internal PCI USB controller.
 	 * This device does not need/support EHCI/OHCI handoff
 	 */
 	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
-	if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
+
+	if (pci_enable_device(pdev) < 0) {
+		dev_warn(&pdev->dev, "Can't enable PCI device, "
+				"BIOS handoff failed.\n");
+		return;
+	}
+	quirk_usb_handoff_ohci(pdev);
+	pci_disable_device(pdev);
+}
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+		PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci);
+
+static void __devinit quirk_usb_early_handoff_ehci(struct pci_dev *pdev)
+{
+	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
+		return;
+
+	if (pci_enable_device(pdev) < 0) {
+		dev_warn(&pdev->dev, "Can't enable PCI device, "
+				"BIOS handoff failed.\n");
+		return;
+	}
+	quirk_usb_handoff_ehci(pdev);
+	pci_disable_device(pdev);
+}
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
+		PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);
+
+static void __devinit quirk_usb_early_handoff_xhci(struct pci_dev *pdev)
+{
+	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
 
 	if (pci_enable_device(pdev) < 0) {
@@ -902,15 +945,8 @@ static void __devinit quirk_usb_early_ha
 				"BIOS handoff failed.\n");
 		return;
 	}
-	if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)
-		quirk_usb_handoff_uhci(pdev);
-	else if (pdev->class == PCI_CLASS_SERIAL_USB_OHCI)
-		quirk_usb_handoff_ohci(pdev);
-	else if (pdev->class == PCI_CLASS_SERIAL_USB_EHCI)
-		quirk_usb_handoff_ehci(pdev);
-	else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
-		quirk_usb_handoff_xhci(pdev);
+	quirk_usb_handoff_xhci(pdev);
 	pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
-			PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
+		PCI_CLASS_SERIAL_USB_XHCI, 0, quirk_usb_early_handoff_xhci);

[RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk

[Yinghai Lu]

| commit cab928ee1f221c9cc48d6615070fefe2e444384a
|    USB: Fix handoff when BIOS disables host PCI device.

mention only need to do disable/enable for xhci controller.

So just remove that for non-xhci controller and restore old behavior for them.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>

---
 drivers/usb/host/pci-quirks.c |   18 ------------------
 1 file changed, 18 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
@@ -889,13 +889,7 @@ static void __devinit quirk_usb_early_ha
 	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
 
-	if (pci_enable_device(pdev) < 0) {
-		dev_warn(&pdev->dev, "Can't enable PCI device, "
-				"BIOS handoff failed.\n");
-		return;
-	}
 	quirk_usb_handoff_uhci(pdev);
-	pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
@@ -908,13 +902,7 @@ static void __devinit quirk_usb_early_ha
 	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
 
-	if (pci_enable_device(pdev) < 0) {
-		dev_warn(&pdev->dev, "Can't enable PCI device, "
-				"BIOS handoff failed.\n");
-		return;
-	}
 	quirk_usb_handoff_ohci(pdev);
-	pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci);
@@ -924,13 +912,7 @@ static void __devinit quirk_usb_early_ha
 	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
 
-	if (pci_enable_device(pdev) < 0) {
-		dev_warn(&pdev->dev, "Can't enable PCI device, "
-				"BIOS handoff failed.\n");
-		return;
-	}
 	quirk_usb_handoff_ehci(pdev);
-	pci_disable_device(pdev);
 }
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
 		PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);

[RFC PATCH 3/3] usb, PCI: remove vendor checking for netlogic with uhci/xhci

[Yinghai Lu]

| commit e4436a7c17ac2b5e138f93f83a541cba9b311685
|    usb: Skip PCI USB quirk handling for Netlogic XLP
|    The Netlogic XLP SoC's on-chip USB controller appears as a PCI
|    USB device, but does not need the EHCI/OHCI handoff done in
|    usb/host/pci-quirks.c.

so only do that checking for EHCI and OHCI.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jayachandran C <jayachandranc@netlogicmicro.com>

---
 drivers/usb/host/pci-quirks.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 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
@@ -884,15 +884,8 @@ static void __devinit quirk_usb_handoff_
 	iounmap(base);
 }
 
-static void __devinit quirk_usb_early_handoff_uhci(struct pci_dev *pdev)
-{
-	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
-		return;
-
-	quirk_usb_handoff_uhci(pdev);
-}
 DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
-		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
+		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_handoff_uhci);
 
 static void __devinit quirk_usb_early_handoff_ohci(struct pci_dev *pdev)
 {
@@ -919,9 +912,6 @@ DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID
 
 static void __devinit quirk_usb_early_handoff_xhci(struct pci_dev *pdev)
 {
-	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
-		return;
-
 	if (pci_enable_device(pdev) < 0) {
 		dev_warn(&pdev->dev, "Can't enable PCI device, "
 				"BIOS handoff failed.\n");

Re: [RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk

[Sarah Sharp]

On Thu, Mar 01, 2012 at 11:24:02AM -0800, Yinghai Lu wrote:
> | commit cab928ee1f221c9cc48d6615070fefe2e444384a
> |    USB: Fix handoff when BIOS disables host PCI device.
> 
> mention only need to do disable/enable for xhci controller.
> 
> So just remove that for non-xhci controller and restore old behavior for them.

As I said, we do need to do the enable/disable for all USB hosts.  Jesse
Barnes confirms that the PCI core doesn't do that for us, so we can't
rely on the BIOS always enabling the PCI device.  I don't think we need
this patch, because we should always be doing the enable/disable for all
USB hosts.  We just never had a BIOS that caused this bug to be
discovered until the xHCI BIOS for the Intel system in question.

> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> 
> ---
>  drivers/usb/host/pci-quirks.c |   18 ------------------
>  1 file changed, 18 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
> @@ -889,13 +889,7 @@ static void __devinit quirk_usb_early_ha
>  	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
>  		return;
>  
> -	if (pci_enable_device(pdev) < 0) {
> -		dev_warn(&pdev->dev, "Can't enable PCI device, "
> -				"BIOS handoff failed.\n");
> -		return;
> -	}
>  	quirk_usb_handoff_uhci(pdev);
> -	pci_disable_device(pdev);
>  }
>  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
>  		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
> @@ -908,13 +902,7 @@ static void __devinit quirk_usb_early_ha
>  	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
>  		return;
>  
> -	if (pci_enable_device(pdev) < 0) {
> -		dev_warn(&pdev->dev, "Can't enable PCI device, "
> -				"BIOS handoff failed.\n");
> -		return;
> -	}
>  	quirk_usb_handoff_ohci(pdev);
> -	pci_disable_device(pdev);
>  }
>  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
>  		PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci);
> @@ -924,13 +912,7 @@ static void __devinit quirk_usb_early_ha
>  	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
>  		return;
>  
> -	if (pci_enable_device(pdev) < 0) {
> -		dev_warn(&pdev->dev, "Can't enable PCI device, "
> -				"BIOS handoff failed.\n");
> -		return;
> -	}
>  	quirk_usb_handoff_ehci(pdev);
> -	pci_disable_device(pdev);
>  }
>  DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
>  		PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);

Re: [RFC PATCH 2/3] usb, PCI: remove disable/enable device with non-xhci quirk

[Yinghai Lu]

On Thu, Mar 1, 2012 at 12:10 PM, Sarah Sharp
<sarah.a.sharp@linux.intel.com> wrote:
> On Thu, Mar 01, 2012 at 11:24:02AM -0800, Yinghai Lu wrote:
>> | commit cab928ee1f221c9cc48d6615070fefe2e444384a
>> |    USB: Fix handoff when BIOS disables host PCI device.
>>
>> mention only need to do disable/enable for xhci controller.
>>
>> So just remove that for non-xhci controller and restore old behavior for them.
>
> As I said, we do need to do the enable/disable for all USB hosts.  Jesse
> Barnes confirms that the PCI core doesn't do that for us, so we can't
> rely on the BIOS always enabling the PCI device.  I don't think we need
> this patch, because we should always be doing the enable/disable for all
> USB hosts.  We just never had a BIOS that caused this bug to be
> discovered until the xHCI BIOS for the Intel system in question.

ok

after
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID,
                                                quirk_usb_early_handoff);
+DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
                        PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff);
in pci-next get merged,

how about following change ?

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
@@ -891,11 +891,6 @@ static void __devinit quirk_usb_early_ha
 	 */
 	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
 		return;
-	if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
-			pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
-		return;

 	if (pci_enable_device(pdev) < 0) {
 		dev_warn(&pdev->dev, "Can't enable PCI device, "

Re: [RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four

[Sergei Shtylyov]

Hello.

On 01-03-2012 23:24, Yinghai Lu wrote:

> so we avoid checking class again and again in that quirk.

> following patches will remove disable/enable for non-xhci
> and nelogic vendor checking for uhci/xhci

    Why add them in the first place?

> So total lines will increase 8 at last.

> need to be applied after pci/linux-next and usb/usb-next

> Signed-off-by: Yinghai Lu<yinghai@kernel.org>
>
> ---
>   drivers/usb/host/pci-quirks.c |   64 ++++++++++++++++++++++++++++++++----------
>   1 file changed, 50 insertions(+), 14 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
> @@ -884,17 +884,60 @@ static void __devinit quirk_usb_handoff_
>   	iounmap(base);
>   }
>
> -static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
> +static void __devinit quirk_usb_early_handoff_uhci(struct pci_dev *pdev)
> +{
> +	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
> +		return;

    NetLogic vendor check should be only in quirk_usb_early_handoff_ohci() and
quirk_usb_early_handoff_ehci() according to the comment below.

> +
> +	if (pci_enable_device(pdev)<  0) {
> +		dev_warn(&pdev->dev, "Can't enable PCI device, "
> +				"BIOS handoff failed.\n");
> +		return;
> +	}
> +	quirk_usb_handoff_uhci(pdev);
> +	pci_disable_device(pdev);
> +}
> +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
> +		PCI_CLASS_SERIAL_USB_UHCI, 0, quirk_usb_early_handoff_uhci);
> +
> +static void __devinit quirk_usb_early_handoff_ohci(struct pci_dev *pdev)
>   {
>   	/* Skip Netlogic mips SoC's internal PCI USB controller.
>   	 * This device does not need/support EHCI/OHCI handoff
>   	 */
>   	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
>   		return;
> -	if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI&&
> -			pdev->class != PCI_CLASS_SERIAL_USB_OHCI&&
> -			pdev->class != PCI_CLASS_SERIAL_USB_EHCI&&
> -			pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
> +
> +	if (pci_enable_device(pdev)<  0) {
> +		dev_warn(&pdev->dev, "Can't enable PCI device, "
> +				"BIOS handoff failed.\n");
> +		return;
> +	}
> +	quirk_usb_handoff_ohci(pdev);
> +	pci_disable_device(pdev);
> +}
> +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
> +		PCI_CLASS_SERIAL_USB_OHCI, 0, quirk_usb_early_handoff_ohci);
> +
> +static void __devinit quirk_usb_early_handoff_ehci(struct pci_dev *pdev)
> +{

    The NetLogic comment should probably be repeated here.

> +	if (pdev->vendor == 0x184e)	/* vendor Netlogic */
> +		return;
> +
> +	if (pci_enable_device(pdev)<  0) {
> +		dev_warn(&pdev->dev, "Can't enable PCI device, "
> +				"BIOS handoff failed.\n");
> +		return;
> +	}
> +	quirk_usb_handoff_ehci(pdev);
> +	pci_disable_device(pdev);
> +}
> +DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
> +		PCI_CLASS_SERIAL_USB_EHCI, 0, quirk_usb_early_handoff_ehci);
> +
> +static void __devinit quirk_usb_early_handoff_xhci(struct pci_dev *pdev)
> +{
> +	if (pdev->vendor == 0x184e)	/* vendor Netlogic */

    Not needed.

WBR, Sergei

Re: [RFC PATCH 1/3] usb, PCI: split quirk for usb host controller to four

[Yinghai Lu]

On Fri, Mar 2, 2012 at 3:15 AM, Sergei Shtylyov <sshtylyov@mvista.com> wrote:
> Hello.
>
>
> On 01-03-2012 23:24, Yinghai Lu wrote:
>
>> so we avoid checking class again and again in that quirk.
>
>
>> following patches will remove disable/enable for non-xhci
>> and nelogic vendor checking for uhci/xhci
>
>
>   Why add them in the first place?
>

never mind, just drop those patches, sarah had some different view and
want to keep disable/enable
device for all usb host controller instead of only xhci.

Thanks

       Yinghai