leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: EHCI: ASPM quirk of ISOC on AMD Hudson

Browse Source 
AMD Hudson also needs the same ASPM quirk as SB800

Signed-off-by: Alex He <alex.he@amd.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alex He 2010-12-21 17:45:46 +08:00 committed by Greg Kroah-Hartman
parent 1e4cba8bd2
commit baab93afc2
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/host/ehci-pci.c
View File

@ -44,28 +44,35 @@ static int ehci_pci_reinit(struct ehci_hcd *ehci, struct pci_dev *pdev)
return 0; return 0;
} }
static int ehci_quirk_amd_SB800(struct ehci_hcd *ehci) static int ehci_quirk_amd_hudson(struct ehci_hcd *ehci)
{ {
struct pci_dev *amd_smbus_dev; struct pci_dev *amd_smbus_dev;
u8 rev = 0; u8 rev = 0;
amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_ATI, 0x4385, NULL); amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_ATI, 0x4385, NULL);
if (!amd_smbus_dev) if (amd_smbus_dev) {
return 0;
pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev); pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
if (rev < 0x40) { if (rev < 0x40) {
pci_dev_put(amd_smbus_dev); pci_dev_put(amd_smbus_dev);
amd_smbus_dev = NULL; amd_smbus_dev = NULL;
return 0; return 0;
} }
} else {
amd_smbus_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x780b, NULL);
if (!amd_smbus_dev)
return 0;
pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
if (rev < 0x11 || rev > 0x18) {
pci_dev_put(amd_smbus_dev);
amd_smbus_dev = NULL;
return 0;
}
}
if (!amd_nb_dev) if (!amd_nb_dev)
amd_nb_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1510, NULL); amd_nb_dev = pci_get_device(PCI_VENDOR_ID_AMD, 0x1510, NULL);
if (!amd_nb_dev)
ehci_err(ehci, "QUIRK: unable to get AMD NB device\n");
ehci_info(ehci, "QUIRK: Enable AMD SB800 L1 fix\n"); ehci_info(ehci, "QUIRK: Enable exception for AMD Hudson ASPM\n");
pci_dev_put(amd_smbus_dev); pci_dev_put(amd_smbus_dev);
amd_smbus_dev = NULL; amd_smbus_dev = NULL;
@ -131,7 +138,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
/* cache this readonly data; minimize chip reads */ /* cache this readonly data; minimize chip reads */
ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params); ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
if (ehci_quirk_amd_SB800(ehci)) if (ehci_quirk_amd_hudson(ehci))
ehci->amd_l1_fix = 1; ehci->amd_l1_fix = 1;
retval = ehci_halt(ehci); retval = ehci_halt(ehci);