From owner-svn-src-all@FreeBSD.ORG Tue Oct 14 19:59:45 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BFC21065691 for ; Tue, 14 Oct 2008 19:59:45 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from cpsmtpo-eml06.kpnxchange.com (cpsmtpo-eml06.KPNXCHANGE.COM [213.75.38.155]) by mx1.freebsd.org (Postfix) with ESMTP id 2403F8FC08 for ; Tue, 14 Oct 2008 19:59:44 +0000 (UTC) (envelope-from nick@van-laarhoven.org) Received: from hpsmtp-eml01.kpnxchange.com ([213.75.38.101]) by cpsmtpo-eml06.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 21:47:41 +0200 Received: from uitsmijter.van-laarhoven.org ([81.207.207.222]) by hpsmtp-eml01.kpnxchange.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 14 Oct 2008 21:47:37 +0200 Received: (qmail 63519 invoked by uid 98); 14 Oct 2008 19:47:37 -0000 Received: from 10.66.0.135 (nick@10.66.0.135) by uitsmijter.van-laarhoven.org (envelope-from , uid 82) with qmail-scanner-2.01 (clamdscan: 0.92/5270. f-prot: 4.6.7/3.16.15. spamassassin: 3.2.3. Clear:RC:1(10.66.0.135):. Processed in 0.785328 secs); 14 Oct 2008 19:47:37 -0000 Received: from unknown (HELO van-laarhoven.org) (nick@10.66.0.135) by uitsmijter.van-laarhoven.org with SMTP; 14 Oct 2008 19:47:36 -0000 Received: (nullmailer pid 31205 invoked by uid 1001); Tue, 14 Oct 2008 19:47:35 -0000 From: Nick Hibma To: svn-src-all@freebsd.org Date: Tue, 14 Oct 2008 21:47:33 +0200 User-Agent: KMail/1.9.7 References: <200810140705.m9E75K3x098307@svn.freebsd.org> In-Reply-To: <200810140705.m9E75K3x098307@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200810142147.34555.nick@van-laarhoven.org> X-OriginalArrivalTime: 14 Oct 2008 19:47:37.0262 (UTC) FILETIME=[B5A84CE0:01C92E35] Subject: Re: svn commit: r183866 - head/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Oct 2008 19:59:45 -0000 Should this be added to the ehci module in /sys/modules/ehci? I created those modules not so long ago. Nick > Author: raj > Date: Tue Oct 14 07:05:20 2008 > New Revision: 183866 > URL: http://svn.freebsd.org/changeset/base/183866 > > Log: > Mbus attachment for USB EHCI integrated controller on Marvell chips. > > This includes workarounds required for the ehci(4) to handle some > non-standard behaviour of these devices. > > Obtained from: Marvell, Semihalf > > Added: > head/sys/dev/usb/ehci_mbus.c (contents, props changed) > Modified: > head/sys/dev/usb/ehci.c > head/sys/dev/usb/ehcivar.h > > Modified: head/sys/dev/usb/ehci.c > ========================================================================= >===== --- head/sys/dev/usb/ehci.c Tue Oct 14 04:09:33 2008 (r183865) > +++ head/sys/dev/usb/ehci.c Tue Oct 14 07:05:20 2008 (r183866) > @@ -351,8 +351,12 @@ ehci_hcreset(ehci_softc_t *sc) > 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); > @@ -2194,7 +2198,18 @@ ehci_root_ctrl_start(usbd_xfer_handle xf > 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; > @@ -2249,7 +2264,11 @@ ehci_root_ctrl_start(usbd_xfer_handle xf > 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) { > > Added: head/sys/dev/usb/ehci_mbus.c > ========================================================================= >===== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ > head/sys/dev/usb/ehci_mbus.c Tue Oct 14 07:05:20 2008 (r183866) @@ -0,0 > +1,318 @@ > +/*- > + * Copyright (C) 2008 MARVELL INTERNATIONAL LTD. > + * All rights reserved. > + * > + * Developed by Semihalf. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in > the + * documentation and/or other materials provided with the > distribution. + * 3. Neither the name of MARVELL nor the names of > contributors + * may be used to endorse or promote products derived > from this software + * without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR > PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE > LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR > CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF > SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR > BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, > WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE > OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, > EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. > + */ > + > +/* > + * MBus attachment driver for the USB Enhanced Host Controller. > + */ > + > +#include > +__FBSDID("$FreeBSD$"); > + > +#include "opt_bus.h" > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +#include > +#include > + > +#define EHCI_VENDORID_MRVL 0x1286 > +#define EHCI_HC_DEVSTR "Marvell Integrated USB 2.0 controller" > + > +static device_attach_t ehci_mbus_attach; > +static device_detach_t ehci_mbus_detach; > +static device_shutdown_t ehci_mbus_shutdown; > +static device_suspend_t ehci_mbus_suspend; > +static device_resume_t ehci_mbus_resume; > + > +static int > +ehci_mbus_suspend(device_t self) > +{ > + ehci_softc_t *sc; > + int err; > + > + err = bus_generic_suspend(self); > + if (err) > + return (err); > + > + sc = device_get_softc(self); > + ehci_power(PWR_SUSPEND, sc); > + > + return (0); > +} > + > +static int > +ehci_mbus_resume(device_t self) > +{ > + ehci_softc_t *sc; > + > + sc = device_get_softc(self); > + > + ehci_power(PWR_RESUME, sc); > + bus_generic_resume(self); > + > + return (0); > +} > + > +static int > +ehci_mbus_shutdown(device_t self) > +{ > + ehci_softc_t *sc; > + int err; > + > + err = bus_generic_shutdown(self); > + if (err) > + return (err); > + > + sc = device_get_softc(self); > + ehci_shutdown(sc); > + > + return (0); > +} > + > +static int > +ehci_mbus_probe(device_t self) > +{ > + > + device_set_desc(self, EHCI_HC_DEVSTR); > + > + return (BUS_PROBE_DEFAULT); > +} > + > +static int > +ehci_mbus_attach(device_t self) > +{ > + ehci_softc_t *sc; > + bus_space_handle_t bsh; > + int err, rid; > + > + sc = device_get_softc(self); > + sc->sc_bus.usbrev = USBREV_2_0; > + > + rid = 0; > + sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, > RF_ACTIVE); + if (!sc->io_res) { > + device_printf(self, "Could not map memory\n"); > + return (ENXIO); > + } > + sc->iot = rman_get_bustag(sc->io_res); > + bsh = rman_get_bushandle(sc->io_res); > + > + /* > + * Marvell EHCI host controller registers start at certain offset > within + * the whole USB registers range, so create a subregion for the > host + * mode configuration purposes. > + */ > + if (bus_space_subregion(sc->iot, bsh, MV_USB_HOST_OFST, > + MV_USB_SIZE - MV_USB_HOST_OFST, &sc->ioh) != 0) > + panic("%s: unable to subregion USB host registers", > + device_get_name(self)); > + sc->sc_size = MV_USB_SIZE - MV_USB_HOST_OFST; > + > + /* > + * Notice: Marvell EHCI controller has TWO interrupt lines, so make > sure to + * use the correct rid for the main one (controller interrupt) > -- + * refer to obio_devices[] for the right resource number to use > here. + */ > + rid = 1; > + sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, > + RF_SHAREABLE | RF_ACTIVE); > + if (sc->irq_res == NULL) { > + device_printf(self, "Could not allocate irq\n"); > + ehci_mbus_detach(self); > + return (ENXIO); > + } > + sc->sc_bus.bdev = device_add_child(self, "usb", -1); > + if (!sc->sc_bus.bdev) { > + device_printf(self, "Could not add USB device\n"); > + ehci_mbus_detach(self); > + return (ENOMEM); > + } > + device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); > + > + sprintf(sc->sc_vendor, "Marvell"); > + sc->sc_id_vendor = EHCI_VENDORID_MRVL; > + > + err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, > + NULL, (driver_intr_t*)ehci_intr, sc, &sc->ih); > + if (err) { > + device_printf(self, "Could not setup irq, %d\n", err); > + sc->ih = NULL; > + ehci_mbus_detach(self); > + return (ENXIO); > + } > + > + /* There are no companion USB controllers */ > + sc->sc_ncomp = 0; > + > + /* Allocate a parent dma tag for DMA maps */ > + err = bus_dma_tag_create(bus_get_dma_tag(self), 1, 0, > + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, > + BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, > + NULL, NULL, &sc->sc_bus.parent_dmatag); > + if (err) { > + device_printf(self, "Could not allocate parent DMA tag (%d)\n", > + err); > + ehci_mbus_detach(self); > + return (ENXIO); > + } > + > + /* Allocate a dma tag for transfer buffers */ > + err = bus_dma_tag_create(sc->sc_bus.parent_dmatag, 1, 0, > + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, > + BUS_SPACE_MAXSIZE_32BIT, USB_DMA_NSEG, BUS_SPACE_MAXSIZE_32BIT, 0, > + busdma_lock_mutex, &Giant, &sc->sc_bus.buffer_dmatag); > + if (err) { > + device_printf(self, "Could not allocate buffer DMA tag (%d)\n", > + err); > + ehci_mbus_detach(self); > + return (ENXIO); > + } > + > + /* > + * Workaround for Marvell integrated EHCI controller: reset of > + * the EHCI core clears the USBMODE register, which sets the core in > + * an undefined state (neither host nor agent), so it needs to be set > + * again for proper operation. > + * > + * Refer to errata document MV-S500832-00D.pdf (p. 5.24 GL USB-2) for > + * details. > + */ > + sc->sc_flags |= EHCI_SCFLG_SETMODE; > + if (bootverbose) > + device_printf(self, "5.24 GL USB-2 workaround enabled\n"); > + > + /* XXX all MV chips need it? */ > + sc->sc_flags |= EHCI_SCFLG_FORCESPEED | EHCI_SCFLG_NORESTERM; > + > + err = ehci_init(sc); > + if (!err) { > + sc->sc_flags |= EHCI_SCFLG_DONEINIT; > + err = device_probe_and_attach(sc->sc_bus.bdev); > + } > + > + if (err) { > + device_printf(self, "USB init failed err=%d\n", err); > + ehci_mbus_detach(self); > + return (EIO); > + } > + return (0); > +} > + > +static int > +ehci_mbus_detach(device_t self) > +{ > + ehci_softc_t *sc; > + int err; > + > + sc = device_get_softc(self); > + if (sc->sc_flags & EHCI_SCFLG_DONEINIT) { > + ehci_detach(sc, 0); > + sc->sc_flags &= ~EHCI_SCFLG_DONEINIT; > + } > + > + /* > + * Disable interrupts that might have been switched on in ehci_init() > + */ > + if (sc->iot && sc->ioh) > + bus_space_write_4(sc->iot, sc->ioh, EHCI_USBINTR, 0); > + if (sc->sc_bus.parent_dmatag != NULL) > + bus_dma_tag_destroy(sc->sc_bus.parent_dmatag); > + if (sc->sc_bus.buffer_dmatag != NULL) > + bus_dma_tag_destroy(sc->sc_bus.buffer_dmatag); > + > + if (sc->irq_res && sc->ih) { > + err = bus_teardown_intr(self, sc->irq_res, sc->ih); > + > + if (err) > + device_printf(self, "Could not tear down irq, %d\n", > + err); > + sc->ih = NULL; > + } > + if (sc->sc_bus.bdev) { > + device_delete_child(self, sc->sc_bus.bdev); > + sc->sc_bus.bdev = NULL; > + } > + if (sc->irq_res) { > + bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); > + sc->irq_res = NULL; > + } > + if (sc->io_res) { > + bus_release_resource(self, SYS_RES_MEMORY, 0, sc->io_res); > + sc->io_res = NULL; > + sc->iot = 0; > + sc->ioh = 0; > + } > + return (0); > +} > + > +static device_method_t ehci_methods[] = { > + /* Device interface */ > + DEVMETHOD(device_probe, ehci_mbus_probe), > + DEVMETHOD(device_attach, ehci_mbus_attach), > + DEVMETHOD(device_detach, ehci_mbus_detach), > + DEVMETHOD(device_suspend, ehci_mbus_suspend), > + DEVMETHOD(device_resume, ehci_mbus_resume), > + DEVMETHOD(device_shutdown, ehci_mbus_shutdown), > + > + /* Bus interface */ > + DEVMETHOD(bus_print_child, bus_generic_print_child), > + > + {0, 0} > +}; > + > +static driver_t ehci_driver = { > + "ehci", > + ehci_methods, > + sizeof(ehci_softc_t), > +}; > + > +static devclass_t ehci_devclass; > + > +DRIVER_MODULE(ehci, mbus, ehci_driver, ehci_devclass, 0, 0); > > Modified: head/sys/dev/usb/ehcivar.h > ========================================================================= >===== --- head/sys/dev/usb/ehcivar.h Tue Oct 14 04:09:33 2008 (r183865) > +++ head/sys/dev/usb/ehcivar.h Tue Oct 14 07:05:20 2008 (r183866) @@ > -122,6 +122,9 @@ struct ehci_soft_islot { > > #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 */ > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"