Date: Mon, 28 Aug 2006 19:25:45 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 105235 for review Message-ID: <200608281925.k7SJPj1c071610@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=105235 Change 105235 by hselasky@hselasky_mini_itx on 2006/08/28 19:25:19 Finished reworking if_cue. Fixed a small bug in the other USB ethernet drivers. Removed my name from some of the copyrights. Please test! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#3 add Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#6 (text+ko) ==== @@ -2,9 +2,6 @@ * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. * - * Copyright (c) 2006 - * Hans Petter Selasky. All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -890,6 +887,10 @@ int error; u_int8_t eaddr[min(ETHER_ADDR_LEN,6)]; + if (cc == NULL) { + return; + } + /* reset the adapter */ aue_cfg_reset(sc); @@ -978,7 +979,7 @@ usbd_config_td_stop(&(sc->sc_config_td)); - __callout_stop(&sc->sc_watchdog); + __callout_stop(&(sc->sc_watchdog)); aue_cfg_stop(sc, NULL, 0); ==== //depot/projects/usb/src/sys/dev/usb/if_auereg.h#5 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#5 (text+ko) ==== @@ -2,9 +2,6 @@ * Copyright (c) 1997, 1998, 1999, 2000-2003 * Bill Paul <wpaul@windriver.com>. All rights reserved. * - * Copyright (c) 2006 - * Hans Petter Selasky. All rights reserved. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -692,6 +689,10 @@ int error; u_int8_t eaddr[min(ETHER_ADDR_LEN,6)]; + if (cc == NULL) { + return; + } + /* set default value */ bzero(eaddr, sizeof(eaddr)); ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#5 (text+ko) ==== @@ -4,7 +4,6 @@ * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> * Copyright (c) 2003-2005 Craig Boston * Copyright (c) 2004 Daniel Hartmeier - * Copyright (c) 2006 Hans Petter Selasky * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#4 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#4 (text+ko) ==== @@ -1,0 +1,1084 @@ +/*- + * Copyright (c) 1997, 1998, 1999, 2000 + * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. + * + * 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. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Bill Paul. + * 4. Neither the name of the author nor the names of any co-contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD + * 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. + */ + +/* + * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate + * adapters and others. + * + * Written by Bill Paul <wpaul@ee.columbia.edu> + * Electrical Engineering Department + * Columbia University, New York City + */ + +/* + * The CATC USB-EL1210A provides USB ethernet support at 10Mbps. The + * RX filter uses a 512-bit multicast hash table, single perfect entry + * for the station address, and promiscuous mode. Unlike the ADMtek + * and KLSI chips, the CATC ASIC supports read and write combining + * mode where multiple packets can be transfered using a single bulk + * transaction, which helps performance a great deal. + */ + +/* + * NOTE: all function names beginning like "cue_cfg_" can only + * be called from within the config thread function ! + */ + +#include <sys/cdefs.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/sockio.h> +#include <sys/mbuf.h> +#include <sys/malloc.h> +#include <sys/kernel.h> +#include <sys/module.h> +#include <sys/socket.h> +#include <sys/endian.h> + +#include <net/if.h> +#include <net/if_arp.h> +#include <net/ethernet.h> +#include <net/if_dl.h> +#include <net/if_types.h> + +#include <net/bpf.h> + +#define usbd_config_td_cc cue_config_copy +#define usbd_config_td_softc cue_softc + +#include <dev/usb/usb_port.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_subr.h> +#include <dev/usb/usb_cdc.h> + +#include "usbdevs.h" + +#include <dev/usb/if_cuereg.h> + +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.61 2005/11/11 16:04:55 ru Exp $"); + +/* + * Various supported device vendors/products. + */ +static struct cue_type cue_devs[] = { + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE }, + { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 }, + { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK }, + { 0, 0 } +}; + +/* prototypes */ + +static device_probe_t cue_probe; +static device_attach_t cue_attach; +static device_detach_t cue_detach; +static device_shutdown_t cue_shutdown; + +static void +cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, + void *data); +static u_int8_t +cue_cfg_csr_read_1(struct cue_softc *sc, u_int16_t reg); + +static u_int16_t +cue_cfg_csr_read_2(struct cue_softc *sc, u_int8_t reg); + +static void +cue_cfg_csr_write_1(struct cue_softc *sc, u_int16_t reg, u_int16_t val); + +static void +cue_cfg_mem(struct cue_softc *sc, u_int8_t cmd, u_int16_t addr, + void *buf, u_int16_t len); +static void +cue_cfg_getmac(struct cue_softc *sc, void *buf); + +static u_int32_t +cue_mchash(const u_int8_t *addr); + +static void +cue_cfg_promisc_upd(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); +static void +cue_config_copy(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); +static void +cue_cfg_reset(struct cue_softc *sc); + +static void +cue_cfg_first_time_setup(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); +static void +cue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer); + +static void +cue_bulk_read_callback(struct usbd_xfer *xfer); + +static void +cue_cfg_tick(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); +static void +cue_start_cb(struct ifnet *ifp); + +static void +cue_start_transfers(struct cue_softc *sc); + +static void +cue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer); + +static void +cue_bulk_write_callback(struct usbd_xfer *xfer); + +static void +cue_init_cb(void *arg); + +static void +cue_cfg_init(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); +static int +cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data); + +static void +cue_watchdog(void *arg); + +static void +cue_cfg_stop(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount); + +#define DPRINTF(...) + +static const struct usbd_config cue_config[CUE_ENDPT_MAX] = { + + [0] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_OUT, + .bufsize = (MCLBYTES + 2), + .flags = (USBD_USE_DMA), + .callback = &cue_bulk_write_callback, + .timeout = 10000, /* 10 seconds */ + }, + + [1] = { + .type = UE_BULK, + .endpoint = -1, /* any */ + .direction = UE_DIR_IN, + .bufsize = (MCLBYTES + 2), + .flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK), + .callback = &cue_bulk_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &cue_bulk_write_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = -1, + .bufsize = sizeof(usb_device_request_t), + .flags = USBD_USE_DMA, + .callback = &cue_bulk_read_clear_stall_callback, + .timeout = 1000, /* 1 second */ + }, +}; + +static device_method_t cue_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, cue_probe), + DEVMETHOD(device_attach, cue_attach), + DEVMETHOD(device_detach, cue_detach), + DEVMETHOD(device_shutdown, cue_shutdown), + + { 0, 0 } +}; + +static driver_t cue_driver = { + "cue", + cue_methods, + sizeof(struct cue_softc) +}; + +static devclass_t cue_devclass; + +DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0); +MODULE_DEPEND(cue, usb, 1, 1, 1); +MODULE_DEPEND(cue, ether, 1, 1, 1); + +static void +cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, + void *data) +{ + u_int16_t length; + usbd_status err; + + if (usbd_config_td_is_gone(&(sc->sc_config_td))) { + goto error; + } + + err = usbd_do_request_flags_mtx(sc->sc_udev, &(sc->sc_mtx), req, + data, 0, NULL, 1000); + + if (err) { + + DPRINTF(sc, 0, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + + error: + length = UGETW(req->wLength); + + if ((req->bmRequestType & UT_READ) && length) { + bzero(data, length); + } + } + return; +} + +#define CUE_CFG_SETBIT(sc, reg, x) \ + cue_cfg_csr_write_1(sc, reg, cue_cfg_csr_read_1(sc, reg) | (x)) + +#define CUE_CFG_CLRBIT(sc, reg, x) \ + cue_cfg_csr_write_1(sc, reg, cue_cfg_csr_read_1(sc, reg) & ~(x)) + +static u_int8_t +cue_cfg_csr_read_1(struct cue_softc *sc, u_int16_t reg) +{ + usb_device_request_t req; + u_int8_t val; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 1); + + cue_cfg_do_request(sc, &req, &val); + return val; +} + +static u_int16_t +cue_cfg_csr_read_2(struct cue_softc *sc, u_int8_t reg) +{ + usb_device_request_t req; + u_int16_t val; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_READREG; + USETW(req.wValue, 0); + USETW(req.wIndex, reg); + USETW(req.wLength, 2); + + cue_cfg_do_request(sc, &req, &val); + return le16toh(val); +} + +static void +cue_cfg_csr_write_1(struct cue_softc *sc, u_int16_t reg, u_int16_t val) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = CUE_CMD_WRITEREG; + USETW(req.wValue, val); + USETW(req.wIndex, reg); + USETW(req.wLength, 0); + + cue_cfg_do_request(sc, &req, NULL); + return; +} + +static void +cue_cfg_mem(struct cue_softc *sc, u_int8_t cmd, u_int16_t addr, + void *buf, u_int16_t len) +{ + usb_device_request_t req; + + if (cmd == CUE_CMD_READSRAM) { + req.bmRequestType = UT_READ_VENDOR_DEVICE; + } else { + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + } + req.bRequest = cmd; + USETW(req.wValue, 0); + USETW(req.wIndex, addr); + USETW(req.wLength, len); + + cue_cfg_do_request(sc, &req, buf); + return; +} + +static void +cue_cfg_getmac(struct cue_softc *sc, void *buf) +{ + usb_device_request_t req; + + req.bmRequestType = UT_READ_VENDOR_DEVICE; + req.bRequest = CUE_CMD_GET_MACADDR; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, ETHER_ADDR_LEN); + + cue_cfg_do_request(sc, &req, buf); + return; +} + +#define CUE_BITS 9 + +static u_int32_t +cue_mchash(const u_int8_t *addr) +{ + u_int32_t crc; + + /* Compute CRC for the address value. */ + crc = ether_crc32_le(addr, ETHER_ADDR_LEN); + + return (crc & ((1 << CUE_BITS) - 1)); +} + +static void +cue_cfg_promisc_upd(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ + if (cc == NULL) { + /* nothing to do */ + return; + } + + /* if we want promiscuous mode, set the allframes bit */ + + if (cc->if_flags & IFF_PROMISC) { + CUE_CFG_SETBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + } else { + CUE_CFG_CLRBIT(sc, CUE_ETHCTL, CUE_ETHCTL_PROMISC); + } + + /* write multicast hash-bits */ + + cue_cfg_mem(sc, CUE_CMD_WRITESRAM, CUE_MCAST_TABLE_ADDR, + cc->if_hash, CUE_MCAST_TABLE_LEN); + return; +} + +static void +cue_config_copy(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ + struct ifnet * ifp = sc->sc_ifp; + struct ifmultiaddr * ifma; + u_int16_t h; + u_int16_t i; + + bzero(cc, sizeof(*cc)); + + if (ifp) { + for (i = 0; i < ETHER_ADDR_LEN; i++) { + cc->if_lladdr[i] = IF_LLADDR(ifp)[i]; + } + + cc->if_flags = ifp->if_flags; + + if ((ifp->if_flags & IFF_ALLMULTI) || + (ifp->if_flags & IFF_PROMISC)) { + for (i = 0; i < CUE_MCAST_TABLE_LEN; i++) { + cc->if_hash[i] = 0xFF; + } + } else { + + /* program new hash bits */ + + IF_ADDR_LOCK(ifp); + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { + if (ifma->ifma_addr->sa_family != AF_LINK) { + continue; + } + h = cue_mchash(LLADDR((struct sockaddr_dl *)(ifma->ifma_addr))); + cc->if_hash[h >> 3] |= 1 << (h & 0x7); + } + IF_ADDR_UNLOCK(ifp); + + /* + * Also include the broadcast address in the filter + * so we can receive broadcast frames. + */ + if (ifp->if_flags & IFF_BROADCAST) { + h = cue_mchash(ifp->if_broadcastaddr); + cc->if_hash[h >> 3] |= 1 << (h & 0x7); + } + } + } + return; +} + +static void +cue_cfg_reset(struct cue_softc *sc) +{ + usb_device_request_t req; + + req.bmRequestType = UT_WRITE_VENDOR_DEVICE; + req.bRequest = CUE_CMD_RESET; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, 0); + + cue_cfg_do_request(sc, &req, NULL); + + /* wait a little while for the chip + * to get its brains in order: + */ + + (void) usbd_config_td_sleep(&(sc->sc_config_td), hz/100); + return; +} + +static int +cue_probe(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct cue_type *t; + + if (uaa->iface != NULL) { + return UMATCH_NONE; + } + + t = cue_devs; + while(t->cue_vid) { + if ((uaa->vendor == t->cue_vid) && + (uaa->product == t->cue_did)) { + return UMATCH_VENDOR_PRODUCT; + } + t++; + } + return UMATCH_NONE; +} + +static int +cue_attach(device_t dev) +{ + struct usb_attach_arg *uaa = device_get_ivars(dev); + struct cue_softc *sc = device_get_softc(dev); + int32_t error; + + if (sc == NULL) { + return ENOMEM; + } + + sc->sc_udev = uaa->device; + sc->sc_dev = dev; + sc->sc_unit = device_get_unit(dev); + + usbd_set_desc(dev, uaa->device); + + mtx_init(&(sc->sc_mtx), "cue lock", NULL, MTX_DEF | MTX_RECURSE); + + __callout_init_mtx(&(sc->sc_watchdog), + &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED); + + error = usbd_set_config_no(uaa->device, CUE_CONFIG_NO, 0); + + if (error) { + device_printf(dev, "setting config " + "number failed!\n"); + goto detach; + } + + error = usbd_transfer_setup(uaa->device, CUE_IFACE_IDX, + sc->sc_xfer, cue_config, CUE_ENDPT_MAX, + sc, &(sc->sc_mtx), &(sc->sc_mem_wait)); + if (error) { + device_printf(dev, "allocating USB " + "transfers failed!\n"); + goto detach; + } + + error = usbd_config_td_setup(&(sc->sc_config_td), sc, &(sc->sc_mtx), + &cue_config_copy, NULL, + sizeof(struct cue_config_copy), 16); + if (error) { + device_printf(dev, "could not setup config " + "thread!\n"); + goto detach; + } + + mtx_lock(&(sc->sc_mtx)); + + /* start setup */ + + usbd_config_td_queue_command + (&(sc->sc_config_td), &cue_cfg_first_time_setup, 0); + + /* start watchdog (will exit mutex) */ + + cue_watchdog(sc); + + return 0; /* success */ + + detach: + cue_detach(dev); + return ENXIO; /* failure */ +} + +static void +cue_cfg_first_time_setup(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ + u_int8_t eaddr[ETHER_ADDR_LEN]; + struct ifnet * ifp; + + if (cc == NULL) { + return; + } +#if 0 + /* Reset the adapter. */ + cue_cfg_reset(sc); +#endif + /* + * Get station address. + */ + cue_cfg_getmac(sc, eaddr); + + mtx_unlock(&(sc->sc_mtx)); + + ifp = if_alloc(IFT_ETHER); + + mtx_lock(&(sc->sc_mtx)); + + if (ifp == NULL) { + printf("cue%d: could not if_alloc()\n", + sc->sc_unit); + goto done; + } + + ifp->if_softc = sc; + if_initname(ifp, "cue", sc->sc_unit); + ifp->if_mtu = ETHERMTU; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; + ifp->if_ioctl = cue_ioctl_cb; + ifp->if_start = cue_start_cb; + ifp->if_watchdog = NULL; + ifp->if_init = cue_init_cb; + ifp->if_baudrate = 10000000; + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + + sc->sc_ifp = ifp; + + ether_ifattach(ifp, eaddr); + done: + return; +} + +static int +cue_detach(device_t dev) +{ + struct cue_softc * sc = device_get_softc(dev); + struct ifnet * ifp; + + mtx_lock(&(sc->sc_mtx)); + + usbd_config_td_stop(&(sc->sc_config_td)); + + __callout_stop(&(sc->sc_watchdog)); + + cue_cfg_stop(sc, NULL, 0); + + ifp = sc->sc_ifp; + + mtx_unlock(&(sc->sc_mtx)); + + /* get rid of any late children */ + bus_generic_detach(dev); + + if (ifp) { + ether_ifdetach(ifp); + if_free(ifp); + } + + usbd_transfer_unsetup(sc->sc_xfer, CUE_ENDPT_MAX); + + usbd_transfer_drain(&(sc->sc_mem_wait), &(sc->sc_mtx)); + + usbd_config_td_unsetup(&(sc->sc_config_td)); + + mtx_destroy(&(sc->sc_mtx)); + + return 0; +} + +static void +cue_bulk_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct cue_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[1]; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + + sc->sc_flags &= ~CUE_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + return; + + tr_error: + /* bomb out */ + sc->sc_flags &= ~CUE_FLAG_READ_STALL; + DPRINTF(sc, 0, "bulk read pipe stopped\n"); + return; +} + +static void +cue_bulk_read_callback(struct usbd_xfer *xfer) +{ + struct cue_softc *sc = xfer->priv_sc; + struct ifnet *ifp = sc->sc_ifp; + struct mbuf *m; + u_int8_t buf[2]; + u_int16_t len; + + USBD_CHECK_STATUS(xfer); + + tr_error: + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= CUE_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + DPRINTF(sc, 0, "bulk read error, %s\n", + usbd_errstr(xfer->error)); + return; + + tr_transferred: + + if (xfer->actlen <= 2) { + ifp->if_ierrors++; + goto tr_setup; + } + + usbd_copy_out(&(xfer->buf_data), 0, buf, 2); + + len = buf[0] | (buf[1] << 8); + + xfer->actlen -= 2; + + m = usbd_ether_get_mbuf(); + + if (m == NULL) { + ifp->if_ierrors++; + goto tr_setup; + } + + xfer->actlen = min(xfer->actlen, m->m_len); + xfer->actlen = min(xfer->actlen, len); + + usbd_copy_out(&(xfer->buf_data), 2, m->m_data, xfer->actlen); + + ifp->if_ipackets++; + m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.len = m->m_len = xfer->actlen; + + (ifp->if_input)(ifp, m); + + tr_setup: + + if (sc->sc_flags & CUE_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + usbd_start_hardware(xfer); + } + return; +} + +static void +cue_cfg_tick(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ + struct ifnet * ifp = sc->sc_ifp; + + if ((cc == NULL) || + (ifp == NULL)) { + /* not ready */ + return; + } + + ifp->if_collisions += cue_cfg_csr_read_2(sc, CUE_TX_SINGLECOLL); + ifp->if_collisions += cue_cfg_csr_read_2(sc, CUE_TX_MULTICOLL); + ifp->if_collisions += cue_cfg_csr_read_2(sc, CUE_TX_EXCESSCOLL); + + if (cue_cfg_csr_read_2(sc, CUE_RX_FRAMEERR)) { + ifp->if_ierrors++; + } + + /* start stopped transfers, if any */ + + cue_start_transfers(sc); + + return; +} + +static void +cue_start_cb(struct ifnet *ifp) +{ + struct cue_softc * sc = ifp->if_softc; + + mtx_lock(&(sc->sc_mtx)); + + cue_start_transfers(sc); + + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static void +cue_start_transfers(struct cue_softc *sc) +{ + if ((sc->sc_flags & CUE_FLAG_LL_READY) && + (sc->sc_flags & CUE_FLAG_HL_READY)) { + + /* start the USB transfers, + * if not already started: + */ + usbd_transfer_start(sc->sc_xfer[1]); + usbd_transfer_start(sc->sc_xfer[0]); + } + return; +} + +static void +cue_bulk_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct cue_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; + + USBD_CHECK_STATUS(xfer); + + tr_setup: + /* start clear stall */ + usbd_clear_stall_tr_setup(xfer, xfer_other); + return; + + tr_transferred: + usbd_clear_stall_tr_transferred(xfer, xfer_other); + + sc->sc_flags &= ~CUE_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + return; + + tr_error: + /* bomb out */ + sc->sc_flags &= ~CUE_FLAG_WRITE_STALL; + DPRINTF(sc, 0, "bulk write pipe stopped\n"); + return; +} + +static void +cue_bulk_write_callback(struct usbd_xfer *xfer) +{ + struct cue_softc *sc = xfer->priv_sc; + struct ifnet *ifp = sc->sc_ifp; + struct mbuf *m; + u_int8_t buf[2]; + + USBD_CHECK_STATUS(xfer); + + tr_error: + DPRINTF(sc, 10, "transfer error, %s\n", + usbd_errstr(xfer->error)); + + if (xfer->error != USBD_CANCELLED) { + /* try to clear stall first */ + sc->sc_flags |= CUE_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + + ifp->if_oerrors++; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + return; + + tr_transferred: + DPRINTF(sc, 10, "transfer complete\n"); + + ifp->if_opackets++; + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + + tr_setup: + + if (sc->sc_flags & CUE_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + goto done; + } + + IF_DEQUEUE(&(ifp->if_snd), m); + + if (m == NULL) { + goto done; + } + + if (m->m_pkthdr.len > MCLBYTES) { + m->m_pkthdr.len = MCLBYTES; + } + + xfer->length = (m->m_pkthdr.len + 2); + + /* the first two bytes are the frame length */ + + buf[0] = (u_int8_t)(m->m_pkthdr.len); + buf[1] = (u_int8_t)(m->m_pkthdr.len >> 8); + + usbd_copy_in(&(xfer->buf_data), 0, buf, 2); + + usbd_m_copy_in(&(xfer->buf_data), 2, + m, 0, m->m_pkthdr.len); + + /* + * if there's a BPF listener, bounce a copy + * of this frame to him: + */ + BPF_MTAP(ifp, m); + + m_freem(m); + + usbd_start_hardware(xfer); + + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + done: + return; +} + +static void +cue_init_cb(void *arg) +{ + struct cue_softc *sc = arg; + + mtx_lock(&(sc->sc_mtx)); + usbd_config_td_queue_command + (&(sc->sc_config_td), &cue_cfg_init, 0); + mtx_unlock(&(sc->sc_mtx)); + + return; +} + +static void +cue_cfg_init(struct cue_softc *sc, + struct cue_config_copy *cc, u_int16_t refcount) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608281925.k7SJPj1c071610>