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

Commit 0a99e8ac authored by Shane Huang's avatar Shane Huang Committed by Greg Kroah-Hartman
Browse files

USB: fix SB600 USB subsystem hang bug 



This patch is required for all AMD SB600 revisions to avoid USB subsystem hang
symptom. The USB subsystem hang symptom is observed when the system has
multiple USB devices connected to it. In some cases a USB hub may be required
to observe this symptom.

Reported in bugzilla as #11599, the similar patch for SB700 old revision is:
commit b09bc6cb

Reported-by: default avatarraffaele <ralfconn@tele2.it>
Tested-by: default avatarRoman Mamedov <roman@rm.pp.ru>
Signed-off-by: default avatarShane Huang <shane.huang@amd.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 269f0532

drivers/usb/host/ehci-pci.c

+6 −3
Original line number Diff line number Diff line
@@ -169,18 +169,21 @@ static int ehci_pci_setup(struct usb_hcd *hcd) 
		}

		break;

	case PCI_VENDOR_ID_ATI:

		/* SB700 old version has 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.

		 */

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

		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 ((rev == 0x3a) || (rev == 0x3b)) {

			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));

			}