Skip to content

Commit

Permalink
usb: PS3 EHCI HC reset work-around
Browse files Browse the repository at this point in the history
PS3 EHCI HC errata fix 316 - The PS3 EHCI HC will reset its
internal INSNREGXX setup regs back to the chip default values
on Host Controller Reset (CMD_RESET) or Light Host Controller
Reset (CMD_LRESET).  The work-around for this is for the HC
driver to re-initialise these regs when ever the HC is reset.

Adds a new helper routine ps3_ehci_setup_insnreg() which is
called from ps3_ehci_hc_reset().

Signed-off-by: Geoff Levand <geoff@infradead.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
  • Loading branch information
Geoff Levand committed Dec 8, 2011
1 parent 876e0df commit 9187bef
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions drivers/usb/host/ehci-ps3.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,34 @@
#include <asm/firmware.h>
#include <asm/ps3.h>

static void ps3_ehci_setup_insnreg(struct ehci_hcd *ehci)
{
/* PS3 HC internal setup register offsets. */

enum ps3_ehci_hc_insnreg {
ps3_ehci_hc_insnreg01 = 0x084,
ps3_ehci_hc_insnreg02 = 0x088,
ps3_ehci_hc_insnreg03 = 0x08c,
};

/* PS3 EHCI HC errata fix 316 - The PS3 EHCI HC will reset its
* internal INSNREGXX setup regs back to the chip default values
* on Host Controller Reset (CMD_RESET) or Light Host Controller
* Reset (CMD_LRESET). The work-around for this is for the HC
* driver to re-initialise these regs when ever the HC is reset.
*/

/* Set burst transfer counts to 256 out, 32 in. */

writel_be(0x01000020, (void __iomem *)ehci->regs +
ps3_ehci_hc_insnreg01);

/* Enable burst transfer counts. */

writel_be(0x00000001, (void __iomem *)ehci->regs +
ps3_ehci_hc_insnreg03);
}

static int ps3_ehci_hc_reset(struct usb_hcd *hcd)
{
int result;
Expand Down Expand Up @@ -49,6 +77,8 @@ static int ps3_ehci_hc_reset(struct usb_hcd *hcd)

ehci_reset(ehci);

ps3_ehci_setup_insnreg(ehci);

return result;
}

Expand Down

0 comments on commit 9187bef

Please sign in to comment.