usb: ehci: use amd_chipset_type to filter for usb subsystem hang bug

Commit "usb: pci-quirks: refactor AMD quirk to abstract AMD chipset types"
introduced a new AMD chipset type to filter AMD platforms with different
chipsets.

According to a recent thread [1], this patch updates USB subsystem hang
symptom quirk which is observed on AMD all SB600 and SB700 revision
0x3a/0x3b. And make it use the new chipset type to represent.

[1] http://marc.info/?l=linux-usb&m=138012321616452&w=2

Signed-off-by: Huang Rui <ray.huang@amd.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 18 deletions

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 854c2ec7b699..3e86bf4371b3 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -58,8 +58,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
 {
         struct ehci_hcd         *ehci = hcd_to_ehci(hcd);
         struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
-        struct pci_dev          *p_smbus;
-        u8                      rev;
         u32                     temp;
         int                     retval;
 
@@ -175,22 +173,12 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                 /* SB600 and old version of SB700 have a bug in EHCI controller,
                  * which causes usb devices lose response in some cases.
                  */
-                if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) {
-                        p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
-                                                 PCI_DEVICE_ID_ATI_SBX00_SMBUS,
-                                                 NULL);
-                        if (!p_smbus)
-                                break;
-                        rev = p_smbus->revision;
-                        if ((pdev->device == 0x4386) || (rev == 0x3a)
-                            || (rev == 0x3b)) {
-                                u8 tmp;
-                                ehci_info(ehci, "applying AMD SB600/SB700 USB "
-                                        "freeze workaround\n");
-                                pci_read_config_byte(pdev, 0x53, &tmp);
-                                pci_write_config_byte(pdev, 0x53, tmp | (1<<3));
-                        }
-                        pci_dev_put(p_smbus);
+                if ((pdev->device == 0x4386 || pdev->device == 0x4396) &&
+                                usb_amd_hang_symptom_quirk()) {
+                        u8 tmp;
+                        ehci_info(ehci, "applying AMD SB600/SB700 USB freeze workaround\n");
+                        pci_read_config_byte(pdev, 0x53, &tmp);
+                        pci_write_config_byte(pdev, 0x53, tmp | (1<<3));
                 }
                 break;
         case PCI_VENDOR_ID_NETMOS: