Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad145b6 authored by Huang Rui's avatar Huang Rui Committed by Greg Kroah-Hartman
Browse files

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: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cccd3a25

drivers/usb/host/ehci-pci.c

+6 −18
Original line number Original line Diff line number Diff line
@@ -58,8 +58,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
{

{

	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);

	struct ehci_hcd		*ehci = hcd_to_ehci(hcd);

	struct pci_dev		*pdev = to_pci_dev(hcd->self.controller);

	struct pci_dev		*pdev = to_pci_dev(hcd->self.controller);

	struct pci_dev		*p_smbus;

	u8			rev;

	u32			temp;

	u32			temp;

	int			retval;

	int			retval;
@@ -175,23 +173,13 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		/* SB600 and old version of SB700 have a bug in EHCI controller,

		/* SB600 and old version of SB700 have a bug in EHCI controller,

		 * which causes usb devices lose response in some cases.

		 * which causes usb devices lose response in some cases.

		 */

		 */

		if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) {

		if ((pdev->device == 0x4386 || pdev->device == 0x4396) &&

			p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,

				usb_amd_hang_symptom_quirk()) {

						 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;

			u8 tmp;

				ehci_info(ehci, "applying AMD SB600/SB700 USB "

			ehci_info(ehci, "applying AMD SB600/SB700 USB freeze workaround\n");

					"freeze workaround\n");

			pci_read_config_byte(pdev, 0x53, &tmp);

			pci_read_config_byte(pdev, 0x53, &tmp);

			pci_write_config_byte(pdev, 0x53, tmp | (1<<3));

			pci_write_config_byte(pdev, 0x53, tmp | (1<<3));

		}

		}

			pci_dev_put(p_smbus);

		}

		break;

		break;

	case PCI_VENDOR_ID_NETMOS:

	case PCI_VENDOR_ID_NETMOS:

		/* MosChip frame-index-register bug */

		/* MosChip frame-index-register bug */

drivers/usb/host/pci-quirks.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,19 @@ int usb_hcd_amd_remote_wakeup_quirk(struct pci_dev *pdev) 
}

}

EXPORT_SYMBOL_GPL(usb_hcd_amd_remote_wakeup_quirk);

EXPORT_SYMBOL_GPL(usb_hcd_amd_remote_wakeup_quirk);





bool usb_amd_hang_symptom_quirk(void)

{

	u8 rev;



	usb_amd_find_chipset_info();

	rev = amd_chipset.sb_type.rev;

	/* SB600 and old version of SB700 have hang symptom bug */

	return amd_chipset.sb_type.gen == AMD_CHIPSET_SB600 ||

			(amd_chipset.sb_type.gen == AMD_CHIPSET_SB700 &&

			 rev >= 0x3a && rev <= 0x3b);

}

EXPORT_SYMBOL_GPL(usb_amd_hang_symptom_quirk);



/*

/*

 * The hardware normally enables the A-link power management feature, which

 * The hardware normally enables the A-link power management feature, which

 * lets the system lower the power consumption in idle states.

 * lets the system lower the power consumption in idle states.

drivers/usb/host/pci-quirks.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ 
void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);

void uhci_reset_hc(struct pci_dev *pdev, unsigned long base);

int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);

int uhci_check_and_reset_hc(struct pci_dev *pdev, unsigned long base);

int usb_amd_find_chipset_info(void);

int usb_amd_find_chipset_info(void);

bool usb_amd_hang_symptom_quirk(void);

void usb_amd_dev_put(void);

void usb_amd_dev_put(void);

void usb_amd_quirk_pll_disable(void);

void usb_amd_quirk_pll_disable(void);

void usb_amd_quirk_pll_enable(void);

void usb_amd_quirk_pll_enable(void);