From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Yinghai Lu To: Sarah Sharp , Greg Kroah-Hartman , Jesse Barnes Cc: linux-usb@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Yinghai Lu Subject: [RFC PATCH] usb, PCI: split quirk for usb host controller to three Date: Thu, 1 Mar 2012 09:17:07 -0800 Message-Id: <1330622227-4209-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: so we avoid checking class again and again in that quirk. need to be applied after pci/linux-next and usb/usb-next Signed-off-by: Yinghai Lu --- drivers/usb/host/pci-quirks.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 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,33 +884,47 @@ 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) +{ + 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); + +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) + + quirk_usb_handoff_ohci(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; + quirk_usb_handoff_ehci(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 (pci_enable_device(pdev) < 0) { dev_warn(&pdev->dev, "Can't enable PCI device, " "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);