Subject: [PATCH] USB: fix SB600 USB subsystem hang bug
From: Shane Huang <shane.huang@amd.com>
To: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, greg@kroah.com
CC: ralfconn@tele2.it, roman@rm.pp.ru, "Yang, Libin" <Libin.Yang@amd.com>,
       "Xu, Andiry" <Andiry.Xu@amd.com>, "Huang, Shane" <Shane.Huang@amd.com>
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Date: Tue, 25 Nov 2008 15:12:33 +0800
Message-ID: <1227597153.5518.6.camel@chunhao-desktop>
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1802
Lines: 47

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 b09bc6cbae4dd3a2d35722668ef2c502a7b8b093

Reported-by: raffaele <ralfconn@tele2.it>
Tested-by: Roman Mamedov <roman@rm.pp.ru>
Signed-off-by: Shane Huang <shane.huang@amd.com>

diff -ruN a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
--- a/drivers/usb/host/ehci-pci.c	2008-11-25 18:49:51.000000000 +0800
+++ b/drivers/usb/host/ehci-pci.c	2008-11-25 18:49:55.000000000 +0800
@@ -169,18 +169,21 @@
 		}
 		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));
 			}


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/