From owner-p4-projects@FreeBSD.ORG Fri Apr 4 18:49:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771BC1065673; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 392A9106566B for ; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 213D98FC16 for ; Fri, 4 Apr 2008 18:49:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m34Injr8095105 for ; Fri, 4 Apr 2008 18:49:45 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m34InjXi095103 for perforce@freebsd.org; Fri, 4 Apr 2008 18:49:45 GMT (envelope-from raj@freebsd.org) Date: Fri, 4 Apr 2008 18:49:45 GMT Message-Id: <200804041849.m34InjXi095103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Cc: Subject: PERFORCE change 139361 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Apr 2008 18:49:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=139361 Change 139361 by raj@raj_mimi on 2008/04/04 18:49:09 EHCI workarounds for Marvell 88F5XXX integrated USB controller. Obtained from: Marvell, Semihalf Affected files ... .. //depot/projects/arm/src/sys/dev/usb/ehci.c#20 edit .. //depot/projects/arm/src/sys/dev/usb/ehcivar.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/dev/usb/ehci.c#20 (text+ko) ==== @@ -338,8 +338,12 @@ for (i = 0; i < 100; i++) { usb_delay_ms(&sc->sc_bus, 1); hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET; - if (!hcr) + if (!hcr) { + if (sc->sc_flags & EHCI_SCFLG_SETMODE) + EOWRITE4(sc, 0x68, 0x3); + return (USBD_NORMAL_COMPLETION); + } } printf("%s: reset timeout\n", device_get_nameunit(sc->sc_bus.bdev)); return (USBD_IOERROR); @@ -1976,7 +1980,18 @@ v = EOREAD4(sc, EHCI_PORTSC(index)); DPRINTFN(8,("ehci_root_ctrl_start: port status=0x%04x\n", v)); + i = UPS_HIGH_SPEED; + + if (sc->sc_flags & EHCI_SCFLG_FORCESPEED) { + if ((v & 0xc000000) == 0x8000000) + i = UPS_HIGH_SPEED; + else if ((v & 0xc000000) == 0x4000000) + i = UPS_LOW_SPEED; + else + i = 0; + } + if (v & EHCI_PS_CS) i |= UPS_CURRENT_CONNECT_STATUS; if (v & EHCI_PS_PE) i |= UPS_PORT_ENABLED; if (v & EHCI_PS_SUSP) i |= UPS_SUSPEND; @@ -2031,7 +2046,11 @@ goto ret; } /* Terminate reset sequence. */ - EOWRITE4(sc, port, v); + if (sc->sc_flags & EHCI_SCFLG_NORESTERM) + ; + else + EOWRITE4(sc, port, v); + /* Wait for HC to complete reset. */ usb_delay_ms(&sc->sc_bus, EHCI_PORT_RESET_COMPLETE); if (sc->sc_dying) { ==== //depot/projects/arm/src/sys/dev/usb/ehcivar.h#7 (text+ko) ==== @@ -96,6 +96,9 @@ #define EHCI_SCFLG_DONEINIT 0x0001 /* ehci_init() has been called. */ #define EHCI_SCFLG_LOSTINTRBUG 0x0002 /* workaround for VIA / ATI chipsets */ +#define EHCI_SCFLG_SETMODE 0x0004 /* set bridge mode again after init (Marvell) */ +#define EHCI_SCFLG_FORCESPEED 0x0008 /* force speed (Marvell) */ +#define EHCI_SCFLG_NORESTERM 0x0010 /* don't terminate reset sequence (Marvell) */ typedef struct ehci_softc { struct usbd_bus sc_bus; /* base device */