USB: fix PS3 EHCI systems (4f7a67e2) · Commits · 戴 / test

After commit "PS3 EHCI QH read work-around", Terratec Grabby (em28xx) stopped working with AMD Geode LX 800 (USB controller AMD CS5536). Since this is a PS3 only fix, the following patch adds a conditional block around it. Signed-off-by:

Ricardo Martins <rasm@fe.up.pt> Acked-by:

Alan Stern <stern@rowland.harvard.edu> Cc: stable <stable@vger.kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/host/ehci-hcd.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -671,7 +671,9 @@ static int ehci_init(struct usb_hcd *hcd)
	hw = ehci->async->hw;		hw = ehci->async->hw;
	hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);		hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma);
	hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);		hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD);
			#if defined(CONFIG_PPC_PS3)
	hw->hw_info1 \|= cpu_to_hc32(ehci, (1 << 7)); /* I = 1 */		hw->hw_info1 \|= cpu_to_hc32(ehci, (1 << 7)); /* I = 1 */
			#endif
	hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);		hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT);
	hw->hw_qtd_next = EHCI_LIST_END(ehci);		hw->hw_qtd_next = EHCI_LIST_END(ehci);
	ehci->async->qh_state = QH_STATE_LINKED;		ehci->async->qh_state = QH_STATE_LINKED;

Admin message