Commit a1f17a87 authored by Libin Yang's avatar Libin Yang Committed by Greg Kroah-Hartman

USB: ohci: quirk AMD prefetch for USB 1.1 ISO transfer

The following patch in the driver is required to avoid USB 1.1 device
failures that may occur due to requests from USB OHCI controllers may
be overwritten if the latency for any pending request by the USB
controller is very long (in the range of milliseconds).
Signed-off-by: default avatarLibin Yang <libin.yang@amd.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ac50e950
...@@ -87,6 +87,7 @@ static int ohci_restart (struct ohci_hcd *ohci); ...@@ -87,6 +87,7 @@ static int ohci_restart (struct ohci_hcd *ohci);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static void quirk_amd_pll(int state); static void quirk_amd_pll(int state);
static void amd_iso_dev_put(void); static void amd_iso_dev_put(void);
static void sb800_prefetch(struct ohci_hcd *ohci, int on);
#else #else
static inline void quirk_amd_pll(int state) static inline void quirk_amd_pll(int state)
{ {
...@@ -96,6 +97,10 @@ static inline void amd_iso_dev_put(void) ...@@ -96,6 +97,10 @@ static inline void amd_iso_dev_put(void)
{ {
return; return;
} }
static inline void sb800_prefetch(struct ohci_hcd *ohci, int on)
{
return;
}
#endif #endif
......
...@@ -177,6 +177,13 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd) ...@@ -177,6 +177,13 @@ static int ohci_quirk_amd700(struct usb_hcd *hcd)
return 0; return 0;
pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev); pci_read_config_byte(amd_smbus_dev, PCI_REVISION_ID, &rev);
/* SB800 needs pre-fetch fix */
if ((rev >= 0x40) && (rev <= 0x4f)) {
ohci->flags |= OHCI_QUIRK_AMD_PREFETCH;
ohci_dbg(ohci, "enabled AMD prefetch quirk\n");
}
if ((rev > 0x3b) || (rev < 0x30)) { if ((rev > 0x3b) || (rev < 0x30)) {
pci_dev_put(amd_smbus_dev); pci_dev_put(amd_smbus_dev);
amd_smbus_dev = NULL; amd_smbus_dev = NULL;
...@@ -262,6 +269,19 @@ static void amd_iso_dev_put(void) ...@@ -262,6 +269,19 @@ static void amd_iso_dev_put(void)
} }
static void sb800_prefetch(struct ohci_hcd *ohci, int on)
{
struct pci_dev *pdev;
u16 misc;
pdev = to_pci_dev(ohci_to_hcd(ohci)->self.controller);
pci_read_config_word(pdev, 0x50, &misc);
if (on == 0)
pci_write_config_word(pdev, 0x50, misc & 0xfcff);
else
pci_write_config_word(pdev, 0x50, misc | 0x0300);
}
/* List of quirks for OHCI */ /* List of quirks for OHCI */
static const struct pci_device_id ohci_pci_quirks[] = { static const struct pci_device_id ohci_pci_quirks[] = {
{ {
......
...@@ -49,9 +49,12 @@ __acquires(ohci->lock) ...@@ -49,9 +49,12 @@ __acquires(ohci->lock)
switch (usb_pipetype (urb->pipe)) { switch (usb_pipetype (urb->pipe)) {
case PIPE_ISOCHRONOUS: case PIPE_ISOCHRONOUS:
ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--; ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs--;
if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) {
&& quirk_amdiso(ohci)) if (quirk_amdiso(ohci))
quirk_amd_pll(1); quirk_amd_pll(1);
if (quirk_amdprefetch(ohci))
sb800_prefetch(ohci, 0);
}
break; break;
case PIPE_INTERRUPT: case PIPE_INTERRUPT:
ohci_to_hcd(ohci)->self.bandwidth_int_reqs--; ohci_to_hcd(ohci)->self.bandwidth_int_reqs--;
...@@ -680,9 +683,12 @@ static void td_submit_urb ( ...@@ -680,9 +683,12 @@ static void td_submit_urb (
data + urb->iso_frame_desc [cnt].offset, data + urb->iso_frame_desc [cnt].offset,
urb->iso_frame_desc [cnt].length, urb, cnt); urb->iso_frame_desc [cnt].length, urb, cnt);
} }
if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0 if (ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs == 0) {
&& quirk_amdiso(ohci)) if (quirk_amdiso(ohci))
quirk_amd_pll(0); quirk_amd_pll(0);
if (quirk_amdprefetch(ohci))
sb800_prefetch(ohci, 1);
}
periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0 periodic = ohci_to_hcd(ohci)->self.bandwidth_isoc_reqs++ == 0
&& ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0; && ohci_to_hcd(ohci)->self.bandwidth_int_reqs == 0;
break; break;
......
...@@ -402,6 +402,7 @@ struct ohci_hcd { ...@@ -402,6 +402,7 @@ struct ohci_hcd {
#define OHCI_QUIRK_FRAME_NO 0x80 /* no big endian frame_no shift */ #define OHCI_QUIRK_FRAME_NO 0x80 /* no big endian frame_no shift */
#define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */ #define OHCI_QUIRK_HUB_POWER 0x100 /* distrust firmware power/oc setup */
#define OHCI_QUIRK_AMD_ISO 0x200 /* ISO transfers*/ #define OHCI_QUIRK_AMD_ISO 0x200 /* ISO transfers*/
#define OHCI_QUIRK_AMD_PREFETCH 0x400 /* pre-fetch for ISO transfer */
// there are also chip quirks/bugs in init logic // there are also chip quirks/bugs in init logic
struct work_struct nec_work; /* Worker for NEC quirk */ struct work_struct nec_work; /* Worker for NEC quirk */
...@@ -433,6 +434,10 @@ static inline int quirk_amdiso(struct ohci_hcd *ohci) ...@@ -433,6 +434,10 @@ static inline int quirk_amdiso(struct ohci_hcd *ohci)
{ {
return ohci->flags & OHCI_QUIRK_AMD_ISO; return ohci->flags & OHCI_QUIRK_AMD_ISO;
} }
static inline int quirk_amdprefetch(struct ohci_hcd *ohci)
{
return ohci->flags & OHCI_QUIRK_AMD_PREFETCH;
}
#else #else
static inline int quirk_nec(struct ohci_hcd *ohci) static inline int quirk_nec(struct ohci_hcd *ohci)
{ {
...@@ -446,6 +451,10 @@ static inline int quirk_amdiso(struct ohci_hcd *ohci) ...@@ -446,6 +451,10 @@ static inline int quirk_amdiso(struct ohci_hcd *ohci)
{ {
return 0; return 0;
} }
static inline int quirk_amdprefetch(struct ohci_hcd *ohci)
{
return 0;
}
#endif #endif
/* convert between an hcd pointer and the corresponding ohci_hcd */ /* convert between an hcd pointer and the corresponding ohci_hcd */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment