More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
/* $NetBSD: ohci.c,v 1.64 2000/01/19 00:23:58 augustss Exp $ */
|
1999-01-13 00:50:02 +00:00
|
|
|
/* $FreeBSD$ */
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
|
|
* by Lennart Augustsson (augustss@carlstedt.se) at
|
|
|
|
* Carlstedt Research & Technology.
|
|
|
|
*
|
|
|
|
* 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 the NetBSD
|
|
|
|
* Foundation, Inc. and its contributors.
|
|
|
|
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 THE FOUNDATION 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* USB Open Host Controller driver.
|
|
|
|
*
|
1999-08-28 20:10:46 +00:00
|
|
|
* OHCI spec: ftp://ftp.compaq.com/pub/supportinformation/papers/hcir1_0a.exe
|
|
|
|
* USB spec: http://www.usb.org/developers/data/usb11.pdf
|
1998-12-09 23:28:43 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/malloc.h>
|
1999-10-07 19:26:38 +00:00
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
1999-11-17 22:33:51 +00:00
|
|
|
#include <sys/kernel.h>
|
1998-12-09 23:28:43 +00:00
|
|
|
#include <sys/device.h>
|
1999-11-08 21:06:21 +00:00
|
|
|
#include <sys/select.h>
|
1998-12-09 23:28:43 +00:00
|
|
|
#elif defined(__FreeBSD__)
|
|
|
|
#include <sys/module.h>
|
|
|
|
#include <sys/bus.h>
|
1999-04-16 21:22:55 +00:00
|
|
|
#include <machine/bus_pio.h>
|
|
|
|
#include <machine/bus_memio.h>
|
1999-11-28 21:01:06 +00:00
|
|
|
#if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__)
|
1999-11-17 22:33:51 +00:00
|
|
|
#include <machine/cpu.h>
|
|
|
|
#endif
|
1999-04-16 21:22:55 +00:00
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
#include <sys/proc.h>
|
|
|
|
#include <sys/queue.h>
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
#include <machine/bus.h>
|
1999-01-07 23:07:57 +00:00
|
|
|
#include <machine/endian.h>
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
#include <dev/usb/usb.h>
|
|
|
|
#include <dev/usb/usbdi.h>
|
|
|
|
#include <dev/usb/usbdivar.h>
|
|
|
|
#include <dev/usb/usb_mem.h>
|
1999-10-07 19:26:38 +00:00
|
|
|
#include <dev/usb/usb_quirks.h>
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
#include <dev/usb/ohcireg.h>
|
|
|
|
#include <dev/usb/ohcivar.h>
|
|
|
|
|
|
|
|
#if defined(__FreeBSD__)
|
|
|
|
#include <machine/clock.h>
|
|
|
|
|
|
|
|
#define delay(d) DELAY(d)
|
1999-04-11 20:50:33 +00:00
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
#if defined(__OpenBSD__)
|
|
|
|
struct cfdriver ohci_cd = {
|
|
|
|
NULL, "ohci", DV_DULL
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
1999-04-11 20:50:33 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
|
|
|
#define DPRINTF(x) if (ohcidebug) logprintf x
|
|
|
|
#define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x
|
1999-11-28 21:01:06 +00:00
|
|
|
int ohcidebug = 0;
|
1999-04-11 20:50:33 +00:00
|
|
|
#else
|
|
|
|
#define DPRINTF(x)
|
|
|
|
#define DPRINTFN(n,x)
|
1998-12-09 23:28:43 +00:00
|
|
|
#endif
|
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
/*
|
|
|
|
* The OHCI controller is little endian, so on big endian machines
|
|
|
|
* the data strored in memory needs to be swapped.
|
|
|
|
*/
|
|
|
|
#if BYTE_ORDER == BIG_ENDIAN
|
|
|
|
#define LE(x) (bswap32(x))
|
|
|
|
#else
|
|
|
|
#define LE(x) (x)
|
|
|
|
#endif
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
struct ohci_pipe;
|
|
|
|
|
1999-11-28 21:01:06 +00:00
|
|
|
static ohci_soft_ed_t *ohci_alloc_sed __P((ohci_softc_t *));
|
1999-11-17 22:33:51 +00:00
|
|
|
static void ohci_free_sed __P((ohci_softc_t *, ohci_soft_ed_t *));
|
|
|
|
|
1999-11-28 21:01:06 +00:00
|
|
|
static ohci_soft_td_t *ohci_alloc_std __P((ohci_softc_t *));
|
1999-11-17 22:33:51 +00:00
|
|
|
static void ohci_free_std __P((ohci_softc_t *, ohci_soft_td_t *));
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
static ohci_soft_itd_t *ohci_alloc_sitd __P((ohci_softc_t *));
|
|
|
|
static void ohci_free_sitd __P((ohci_softc_t *,ohci_soft_itd_t *));
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
#if 0
|
|
|
|
static void ohci_free_std_chain __P((ohci_softc_t *,
|
|
|
|
ohci_soft_td_t *, ohci_soft_td_t *));
|
|
|
|
#endif
|
|
|
|
static usbd_status ohci_alloc_std_chain __P((struct ohci_pipe *,
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_softc_t *, int, int, u_int16_t, usb_dma_t *,
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *, ohci_soft_td_t **));
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
static void ohci_shutdown __P((void *v));
|
1999-11-17 22:33:51 +00:00
|
|
|
static void ohci_power __P((int, void *));
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status ohci_open __P((usbd_pipe_handle));
|
|
|
|
static void ohci_poll __P((struct usbd_bus *));
|
|
|
|
static void ohci_waitintr __P((ohci_softc_t *,
|
|
|
|
usbd_xfer_handle));
|
|
|
|
static void ohci_rhsc __P((ohci_softc_t *, usbd_xfer_handle));
|
|
|
|
static void ohci_process_done __P((ohci_softc_t *,
|
|
|
|
ohci_physaddr_t));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_request __P((usbd_xfer_handle xfer));
|
|
|
|
static void ohci_add_ed __P((ohci_soft_ed_t *, ohci_soft_ed_t *));
|
|
|
|
static void ohci_rem_ed __P((ohci_soft_ed_t *, ohci_soft_ed_t *));
|
1999-11-28 21:01:06 +00:00
|
|
|
static void ohci_hash_add_td __P((ohci_softc_t *,
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *));
|
|
|
|
static void ohci_hash_rem_td __P((ohci_softc_t *,
|
|
|
|
ohci_soft_td_t *));
|
1999-11-28 21:01:06 +00:00
|
|
|
static ohci_soft_td_t *ohci_hash_find_td __P((ohci_softc_t *,
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_physaddr_t));
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
static usbd_status ohci_setup_isoc __P((usbd_pipe_handle pipe));
|
|
|
|
static void ohci_device_isoc_enter __P((usbd_xfer_handle));
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status ohci_allocm __P((struct usbd_bus *, usb_dma_t *,
|
|
|
|
u_int32_t));
|
|
|
|
static void ohci_freem __P((struct usbd_bus *, usb_dma_t *));
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
static usbd_xfer_handle ohci_allocx __P((struct usbd_bus *));
|
|
|
|
static void ohci_freex __P((struct usbd_bus *, usbd_xfer_handle));
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status ohci_root_ctrl_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_root_ctrl_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_root_ctrl_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_root_ctrl_close __P((usbd_pipe_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_root_intr_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_root_intr_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_root_intr_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_root_intr_close __P((usbd_pipe_handle));
|
|
|
|
static void ohci_root_intr_done __P((usbd_xfer_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_ctrl_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_device_ctrl_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_ctrl_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_ctrl_close __P((usbd_pipe_handle));
|
|
|
|
static void ohci_device_ctrl_done __P((usbd_xfer_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_bulk_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_device_bulk_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_bulk_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_bulk_close __P((usbd_pipe_handle));
|
|
|
|
static void ohci_device_bulk_done __P((usbd_xfer_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_intr_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_device_intr_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_intr_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_intr_close __P((usbd_pipe_handle));
|
|
|
|
static void ohci_device_intr_done __P((usbd_xfer_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_isoc_transfer __P((usbd_xfer_handle));
|
|
|
|
static usbd_status ohci_device_isoc_start __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_isoc_abort __P((usbd_xfer_handle));
|
|
|
|
static void ohci_device_isoc_close __P((usbd_pipe_handle));
|
|
|
|
static void ohci_device_isoc_done __P((usbd_xfer_handle));
|
|
|
|
|
|
|
|
static usbd_status ohci_device_setintr __P((ohci_softc_t *sc,
|
|
|
|
struct ohci_pipe *pipe, int ival));
|
|
|
|
|
|
|
|
static int ohci_str __P((usb_string_descriptor_t *, int, char *));
|
|
|
|
|
|
|
|
static void ohci_timeout __P((void *));
|
|
|
|
static void ohci_rhsc_able __P((ohci_softc_t *, int));
|
|
|
|
|
|
|
|
static void ohci_close_pipe __P((usbd_pipe_handle pipe,
|
|
|
|
ohci_soft_ed_t *head));
|
1999-11-28 21:01:06 +00:00
|
|
|
static void ohci_abort_xfer __P((usbd_xfer_handle xfer,
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status status));
|
1999-11-28 21:01:06 +00:00
|
|
|
static void ohci_abort_xfer_end __P((void *));
|
1999-11-17 22:33:51 +00:00
|
|
|
|
|
|
|
static void ohci_device_clear_toggle __P((usbd_pipe_handle pipe));
|
|
|
|
static void ohci_noop __P((usbd_pipe_handle pipe));
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1999-11-17 22:33:51 +00:00
|
|
|
static void ohci_dumpregs __P((ohci_softc_t *));
|
|
|
|
static void ohci_dump_tds __P((ohci_soft_td_t *));
|
|
|
|
static void ohci_dump_td __P((ohci_soft_td_t *));
|
|
|
|
static void ohci_dump_ed __P((ohci_soft_ed_t *));
|
1998-12-09 23:28:43 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#define OWRITE4(sc, r, x) bus_space_write_4((sc)->iot, (sc)->ioh, (r), (x))
|
|
|
|
#define OREAD4(sc, r) bus_space_read_4((sc)->iot, (sc)->ioh, (r))
|
|
|
|
#define OREAD2(sc, r) bus_space_read_2((sc)->iot, (sc)->ioh, (r))
|
|
|
|
|
|
|
|
/* Reverse the bits in a value 0 .. 31 */
|
|
|
|
static u_int8_t revbits[OHCI_NO_INTRS] =
|
|
|
|
{ 0x00, 0x10, 0x08, 0x18, 0x04, 0x14, 0x0c, 0x1c,
|
|
|
|
0x02, 0x12, 0x0a, 0x1a, 0x06, 0x16, 0x0e, 0x1e,
|
|
|
|
0x01, 0x11, 0x09, 0x19, 0x05, 0x15, 0x0d, 0x1d,
|
|
|
|
0x03, 0x13, 0x0b, 0x1b, 0x07, 0x17, 0x0f, 0x1f };
|
|
|
|
|
|
|
|
struct ohci_pipe {
|
|
|
|
struct usbd_pipe pipe;
|
|
|
|
ohci_soft_ed_t *sed;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
union {
|
|
|
|
ohci_soft_td_t *td;
|
|
|
|
ohci_soft_itd_t *itd;
|
|
|
|
} tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
/* Info needed for different pipe kinds. */
|
|
|
|
union {
|
|
|
|
/* Control pipe */
|
|
|
|
struct {
|
|
|
|
usb_dma_t reqdma;
|
|
|
|
u_int length;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *setup, *data, *stat;
|
1998-12-09 23:28:43 +00:00
|
|
|
} ctl;
|
|
|
|
/* Interrupt pipe */
|
|
|
|
struct {
|
|
|
|
int nslots;
|
|
|
|
int pos;
|
|
|
|
} intr;
|
|
|
|
/* Bulk pipe */
|
|
|
|
struct {
|
|
|
|
u_int length;
|
1999-10-07 19:26:38 +00:00
|
|
|
int isread;
|
1998-12-09 23:28:43 +00:00
|
|
|
} bulk;
|
1999-10-07 19:26:38 +00:00
|
|
|
/* Iso pipe */
|
|
|
|
struct iso {
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
int next, inuse;
|
1999-10-07 19:26:38 +00:00
|
|
|
} iso;
|
1998-12-09 23:28:43 +00:00
|
|
|
} u;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define OHCI_INTR_ENDPT 1
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_bus_methods ohci_bus_methods = {
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_open,
|
|
|
|
ohci_poll,
|
|
|
|
ohci_allocm,
|
|
|
|
ohci_freem,
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_allocx,
|
|
|
|
ohci_freex,
|
1999-10-07 19:26:38 +00:00
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_root_ctrl_methods = {
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_ctrl_transfer,
|
1999-01-07 23:07:57 +00:00
|
|
|
ohci_root_ctrl_start,
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_ctrl_abort,
|
|
|
|
ohci_root_ctrl_close,
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_noop,
|
1998-12-09 23:28:43 +00:00
|
|
|
0,
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_root_intr_methods = {
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_intr_transfer,
|
1999-01-07 23:07:57 +00:00
|
|
|
ohci_root_intr_start,
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_intr_abort,
|
|
|
|
ohci_root_intr_close,
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_noop,
|
|
|
|
ohci_root_intr_done,
|
1998-12-09 23:28:43 +00:00
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_device_ctrl_methods = {
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_ctrl_transfer,
|
1999-01-07 23:07:57 +00:00
|
|
|
ohci_device_ctrl_start,
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_ctrl_abort,
|
|
|
|
ohci_device_ctrl_close,
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_noop,
|
|
|
|
ohci_device_ctrl_done,
|
1998-12-09 23:28:43 +00:00
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_device_intr_methods = {
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_intr_transfer,
|
1999-01-07 23:07:57 +00:00
|
|
|
ohci_device_intr_start,
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_intr_abort,
|
|
|
|
ohci_device_intr_close,
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_device_clear_toggle,
|
|
|
|
ohci_device_intr_done,
|
1998-12-09 23:28:43 +00:00
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_device_bulk_methods = {
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_bulk_transfer,
|
1999-01-07 23:07:57 +00:00
|
|
|
ohci_device_bulk_start,
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_bulk_abort,
|
|
|
|
ohci_device_bulk_close,
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_device_clear_toggle,
|
|
|
|
ohci_device_bulk_done,
|
1998-12-09 23:28:43 +00:00
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static struct usbd_pipe_methods ohci_device_isoc_methods = {
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_device_isoc_transfer,
|
|
|
|
ohci_device_isoc_start,
|
|
|
|
ohci_device_isoc_abort,
|
|
|
|
ohci_device_isoc_close,
|
|
|
|
ohci_noop,
|
|
|
|
ohci_device_isoc_done,
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
int
|
|
|
|
ohci_activate(self, act)
|
|
|
|
device_ptr_t self;
|
|
|
|
enum devact act;
|
|
|
|
{
|
|
|
|
struct ohci_softc *sc = (struct ohci_softc *)self;
|
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
switch (act) {
|
|
|
|
case DVACT_ACTIVATE:
|
|
|
|
return (EOPNOTSUPP);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DVACT_DEACTIVATE:
|
|
|
|
if (sc->sc_child != NULL)
|
|
|
|
rv = config_deactivate(sc->sc_child);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return (rv);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
ohci_detach(sc, flags)
|
|
|
|
struct ohci_softc *sc;
|
|
|
|
int flags;
|
|
|
|
{
|
|
|
|
int rv = 0;
|
|
|
|
|
|
|
|
if (sc->sc_child != NULL)
|
|
|
|
rv = config_detach(sc->sc_child, flags);
|
|
|
|
|
|
|
|
if (rv != 0)
|
|
|
|
return (rv);
|
|
|
|
|
|
|
|
powerhook_disestablish(sc->sc_powerhook);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
shutdownhook_disestablish(sc->sc_shutdownhook);
|
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
/* free data structures XXX */
|
|
|
|
|
|
|
|
return (rv);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_soft_ed_t *
|
|
|
|
ohci_alloc_sed(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
|
|
|
ohci_soft_ed_t *sed;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
int i, offs;
|
|
|
|
usb_dma_t dma;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sc->sc_freeeds == NULL) {
|
1998-12-09 23:28:43 +00:00
|
|
|
DPRINTFN(2, ("ohci_alloc_sed: allocating chunk\n"));
|
1999-11-17 22:33:51 +00:00
|
|
|
err = usb_allocmem(&sc->sc_bus, OHCI_SED_SIZE * OHCI_SED_CHUNK,
|
|
|
|
OHCI_ED_ALIGN, &dma);
|
|
|
|
if (err)
|
1999-10-07 19:26:38 +00:00
|
|
|
return (0);
|
|
|
|
for(i = 0; i < OHCI_SED_CHUNK; i++) {
|
|
|
|
offs = i * OHCI_SED_SIZE;
|
|
|
|
sed = (ohci_soft_ed_t *)((char *)KERNADDR(&dma) +offs);
|
1998-12-09 23:28:43 +00:00
|
|
|
sed->physaddr = DMAADDR(&dma) + offs;
|
|
|
|
sed->next = sc->sc_freeeds;
|
|
|
|
sc->sc_freeeds = sed;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sed = sc->sc_freeeds;
|
|
|
|
sc->sc_freeeds = sed->next;
|
1999-10-07 19:26:38 +00:00
|
|
|
memset(&sed->ed, 0, sizeof(ohci_ed_t));
|
1998-12-09 23:28:43 +00:00
|
|
|
sed->next = 0;
|
1999-10-07 19:26:38 +00:00
|
|
|
return (sed);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_free_sed(sc, sed)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
{
|
|
|
|
sed->next = sc->sc_freeeds;
|
|
|
|
sc->sc_freeeds = sed;
|
|
|
|
}
|
|
|
|
|
|
|
|
ohci_soft_td_t *
|
|
|
|
ohci_alloc_std(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
|
|
|
ohci_soft_td_t *std;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
int i, offs;
|
|
|
|
usb_dma_t dma;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sc->sc_freetds == NULL) {
|
1998-12-09 23:28:43 +00:00
|
|
|
DPRINTFN(2, ("ohci_alloc_std: allocating chunk\n"));
|
1999-11-17 22:33:51 +00:00
|
|
|
err = usb_allocmem(&sc->sc_bus, OHCI_STD_SIZE * OHCI_STD_CHUNK,
|
|
|
|
OHCI_TD_ALIGN, &dma);
|
|
|
|
if (err)
|
1999-10-07 19:26:38 +00:00
|
|
|
return (0);
|
|
|
|
for(i = 0; i < OHCI_STD_CHUNK; i++) {
|
|
|
|
offs = i * OHCI_STD_SIZE;
|
|
|
|
std = (ohci_soft_td_t *)((char *)KERNADDR(&dma) +offs);
|
1998-12-09 23:28:43 +00:00
|
|
|
std->physaddr = DMAADDR(&dma) + offs;
|
|
|
|
std->nexttd = sc->sc_freetds;
|
|
|
|
sc->sc_freetds = std;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
std = sc->sc_freetds;
|
|
|
|
sc->sc_freetds = std->nexttd;
|
1999-10-07 19:26:38 +00:00
|
|
|
memset(&std->td, 0, sizeof(ohci_td_t));
|
2000-01-29 14:18:31 +00:00
|
|
|
std->nexttd = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
return (std);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_free_std(sc, std)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
{
|
|
|
|
std->nexttd = sc->sc_freetds;
|
|
|
|
sc->sc_freetds = std;
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_alloc_std_chain(opipe, sc, len, rd, flags, dma, sp, ep)
|
|
|
|
struct ohci_pipe *opipe;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_softc_t *sc;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
int len, rd;
|
|
|
|
u_int16_t flags;
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_dma_t *dma;
|
|
|
|
ohci_soft_td_t *sp, **ep;
|
|
|
|
{
|
|
|
|
ohci_soft_td_t *next, *cur;
|
|
|
|
ohci_physaddr_t dataphys, dataphysend;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
u_int32_t intr, tdflags;
|
1999-11-17 22:33:51 +00:00
|
|
|
int curlen;
|
|
|
|
|
|
|
|
DPRINTFN(len < 4096,("ohci_alloc_std_chain: start len=%d\n", len));
|
|
|
|
cur = sp;
|
|
|
|
dataphys = DMAADDR(dma);
|
|
|
|
dataphysend = OHCI_PAGE(dataphys + len - 1);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
tdflags =
|
|
|
|
(rd ? OHCI_TD_IN : OHCI_TD_OUT) |
|
|
|
|
OHCI_TD_NOCC | OHCI_TD_TOGGLE_CARRY |
|
|
|
|
(flags & USBD_SHORT_XFER_OK ? OHCI_TD_R : 0);
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
for (;;) {
|
|
|
|
next = ohci_alloc_std(sc);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
if (next == 0)
|
|
|
|
goto nomem;
|
1999-11-17 22:33:51 +00:00
|
|
|
|
|
|
|
/* The OHCI hardware can handle at most one page crossing. */
|
|
|
|
if (OHCI_PAGE(dataphys) == dataphysend ||
|
|
|
|
OHCI_PAGE(dataphys) + OHCI_PAGE_SIZE == dataphysend) {
|
|
|
|
/* we can handle it in this TD */
|
|
|
|
curlen = len;
|
|
|
|
} else {
|
|
|
|
/* must use multiple TDs, fill as much as possible. */
|
|
|
|
curlen = 2 * OHCI_PAGE_SIZE -
|
|
|
|
(dataphys & (OHCI_PAGE_SIZE-1));
|
|
|
|
}
|
|
|
|
DPRINTFN(4,("ohci_alloc_std_chain: dataphys=0x%08x "
|
|
|
|
"dataphysend=0x%08x len=%d curlen=%d\n",
|
|
|
|
dataphys, dataphysend,
|
|
|
|
len, curlen));
|
|
|
|
len -= curlen;
|
|
|
|
|
|
|
|
intr = len == 0 ? OHCI_TD_SET_DI(1) : OHCI_TD_NOINTR;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
cur->td.td_flags = LE(tdflags | intr);
|
1999-11-17 22:33:51 +00:00
|
|
|
cur->td.td_cbp = LE(dataphys);
|
|
|
|
cur->nexttd = next;
|
|
|
|
cur->td.td_nexttd = LE(next->physaddr);
|
|
|
|
cur->td.td_be = LE(dataphys + curlen - 1);
|
|
|
|
cur->len = curlen;
|
|
|
|
cur->flags = OHCI_ADD_LEN;
|
|
|
|
DPRINTFN(10,("ohci_alloc_std_chain: cbp=0x%08x be=0x%08x\n",
|
|
|
|
dataphys, dataphys + curlen - 1));
|
|
|
|
if (len == 0)
|
|
|
|
break;
|
|
|
|
DPRINTFN(10,("ohci_alloc_std_chain: extend chain\n"));
|
|
|
|
dataphys += curlen;
|
|
|
|
cur = next;
|
|
|
|
}
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
if ((flags & USBD_FORCE_SHORT_XFER) &&
|
|
|
|
len % UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize) == 0) {
|
|
|
|
/* Force a 0 length transfer at the end. */
|
|
|
|
next = ohci_alloc_std(sc);
|
|
|
|
if (next == 0)
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
cur->td.td_flags = LE(tdflags | OHCI_TD_SET_DI(1));
|
|
|
|
cur->td.td_cbp = 0; /* indicate 0 length packet */
|
|
|
|
cur->nexttd = next;
|
|
|
|
cur->td.td_nexttd = LE(next->physaddr);
|
|
|
|
cur->td.td_be = LE(dataphys - 1);
|
|
|
|
cur->len = 0;
|
|
|
|
cur->flags = 0;
|
|
|
|
cur = next;
|
|
|
|
DPRINTFN(2,("ohci_alloc_std_chain: add 0 xfer\n"));
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
cur->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
|
|
|
|
*ep = next;
|
|
|
|
|
|
|
|
return (USBD_NORMAL_COMPLETION);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
|
|
|
|
nomem:
|
|
|
|
/* XXX free chain */
|
|
|
|
return (USBD_NOMEM);
|
1999-11-17 22:33:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
static void
|
|
|
|
ohci_free_std_chain(sc, std, stdend)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
ohci_soft_td_t *stdend;
|
|
|
|
{
|
|
|
|
ohci_soft_td_t *p;
|
|
|
|
|
|
|
|
for (; std != stdend; std = p) {
|
|
|
|
p = std->nexttd;
|
|
|
|
ohci_free_std(sc, std);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_soft_itd_t *
|
|
|
|
ohci_alloc_sitd(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
|
|
|
ohci_soft_itd_t *sitd;
|
|
|
|
usbd_status err;
|
|
|
|
int i, offs;
|
|
|
|
usb_dma_t dma;
|
|
|
|
|
|
|
|
if (sc->sc_freeitds == NULL) {
|
|
|
|
DPRINTFN(2, ("ohci_alloc_sitd: allocating chunk\n"));
|
|
|
|
err = usb_allocmem(&sc->sc_bus, OHCI_STD_SIZE * OHCI_STD_CHUNK,
|
|
|
|
OHCI_TD_ALIGN, &dma);
|
|
|
|
if (err)
|
|
|
|
return (0);
|
|
|
|
for(i = 0; i < OHCI_STD_CHUNK; i++) {
|
|
|
|
offs = i * OHCI_STD_SIZE;
|
|
|
|
sitd = (ohci_soft_itd_t *)((char*)KERNADDR(&dma)+offs);
|
|
|
|
sitd->physaddr = DMAADDR(&dma) + offs;
|
|
|
|
sitd->nextitd = sc->sc_freeitds;
|
|
|
|
sc->sc_freeitds = sitd;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sitd = sc->sc_freeitds;
|
|
|
|
sc->sc_freeitds = sitd->nextitd;
|
|
|
|
memset(&sitd->itd, 0, sizeof(ohci_itd_t));
|
|
|
|
sitd->nextitd = 0;
|
|
|
|
return (sitd);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_free_sitd(sc, sitd)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_itd_t *sitd;
|
|
|
|
{
|
|
|
|
sitd->nextitd = sc->sc_freeitds;
|
|
|
|
sc->sc_freeitds = sitd;
|
|
|
|
}
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
usbd_status
|
|
|
|
ohci_init(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
|
|
|
ohci_soft_ed_t *sed, *psed;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
int i;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
u_int32_t s, ctl, ival, hcr, fm, per, rev;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
DPRINTF(("ohci_init: start\n"));
|
1999-10-07 19:26:38 +00:00
|
|
|
#if defined(__OpenBSD__)
|
1999-11-17 22:33:51 +00:00
|
|
|
printf(",");
|
1999-10-07 19:26:38 +00:00
|
|
|
#else
|
1999-11-28 21:01:06 +00:00
|
|
|
printf("%s:", USBDEVNAME(sc->sc_bus.bdev));
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1999-11-28 21:01:06 +00:00
|
|
|
rev = OREAD4(sc, OHCI_REVISION);
|
1999-11-17 22:33:51 +00:00
|
|
|
printf(" OHCI version %d.%d%s\n", OHCI_REV_HI(rev), OHCI_REV_LO(rev),
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_REV_LEGACY(rev) ? ", legacy support" : "");
|
1999-11-17 22:33:51 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
|
1999-01-07 23:07:57 +00:00
|
|
|
printf("%s: unsupported OHCI revision\n",
|
|
|
|
USBDEVNAME(sc->sc_bus.bdev));
|
1999-11-28 21:01:06 +00:00
|
|
|
sc->sc_bus.usbrev = USBREV_UNKNOWN;
|
1998-12-09 23:28:43 +00:00
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
1999-11-28 21:01:06 +00:00
|
|
|
sc->sc_bus.usbrev = USBREV_1_0;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
for (i = 0; i < OHCI_HASH_SIZE; i++)
|
|
|
|
LIST_INIT(&sc->sc_hash_tds[i]);
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
SIMPLEQ_INIT(&sc->sc_free_xfers);
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/* Allocate the HCCA area. */
|
1999-11-17 22:33:51 +00:00
|
|
|
err = usb_allocmem(&sc->sc_bus, OHCI_HCCA_SIZE,
|
1999-11-28 21:01:06 +00:00
|
|
|
OHCI_HCCA_ALIGN, &sc->sc_hccadma);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (err)
|
|
|
|
return (err);
|
1998-12-09 23:28:43 +00:00
|
|
|
sc->sc_hcca = (struct ohci_hcca *)KERNADDR(&sc->sc_hccadma);
|
|
|
|
memset(sc->sc_hcca, 0, OHCI_HCCA_SIZE);
|
|
|
|
|
|
|
|
sc->sc_eintrs = OHCI_NORMAL_INTRS;
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
/* Allocate dummy ED that starts the control list. */
|
1998-12-09 23:28:43 +00:00
|
|
|
sc->sc_ctrl_head = ohci_alloc_sed(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sc->sc_ctrl_head == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad1;
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
sc->sc_ctrl_head->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
/* Allocate dummy ED that starts the bulk list. */
|
1998-12-09 23:28:43 +00:00
|
|
|
sc->sc_bulk_head = ohci_alloc_sed(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sc->sc_bulk_head == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad2;
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
sc->sc_bulk_head->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
1998-12-09 23:28:43 +00:00
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
/* Allocate dummy ED that starts the isochronous list. */
|
|
|
|
sc->sc_isoc_head = ohci_alloc_sed(sc);
|
|
|
|
if (sc->sc_isoc_head == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
|
|
|
goto bad3;
|
|
|
|
}
|
|
|
|
sc->sc_isoc_head->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/* Allocate all the dummy EDs that make up the interrupt tree. */
|
|
|
|
for (i = 0; i < OHCI_NO_EDS; i++) {
|
|
|
|
sed = ohci_alloc_sed(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sed == NULL) {
|
1998-12-09 23:28:43 +00:00
|
|
|
while (--i >= 0)
|
|
|
|
ohci_free_sed(sc, sc->sc_eds[i]);
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_NOMEM;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
goto bad4;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
/* All ED fields are set to 0. */
|
|
|
|
sc->sc_eds[i] = sed;
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
if (i != 0)
|
1998-12-09 23:28:43 +00:00
|
|
|
psed = sc->sc_eds[(i-1) / 2];
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
else
|
|
|
|
psed= sc->sc_isoc_head;
|
|
|
|
sed->next = psed;
|
|
|
|
sed->ed.ed_nexted = LE(psed->physaddr);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Fill HCCA interrupt table. The bit reversal is to get
|
|
|
|
* the tree set up properly to spread the interrupts.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < OHCI_NO_INTRS; i++)
|
|
|
|
sc->sc_hcca->hcca_interrupt_table[revbits[i]] =
|
1999-01-07 23:07:57 +00:00
|
|
|
LE(sc->sc_eds[OHCI_NO_EDS-OHCI_NO_INTRS+i]->physaddr);
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/* Determine in what context we are running. */
|
|
|
|
ctl = OREAD4(sc, OHCI_CONTROL);
|
|
|
|
if (ctl & OHCI_IR) {
|
|
|
|
/* SMM active, request change */
|
|
|
|
DPRINTF(("ohci_init: SMM active, request owner change\n"));
|
|
|
|
s = OREAD4(sc, OHCI_COMMAND_STATUS);
|
|
|
|
OWRITE4(sc, OHCI_COMMAND_STATUS, s | OHCI_OCR);
|
|
|
|
for (i = 0; i < 100 && (ctl & OHCI_IR); i++) {
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 1);
|
1998-12-09 23:28:43 +00:00
|
|
|
ctl = OREAD4(sc, OHCI_CONTROL);
|
|
|
|
}
|
|
|
|
if ((ctl & OHCI_IR) == 0) {
|
1999-01-07 23:07:57 +00:00
|
|
|
printf("%s: SMM does not respond, resetting\n",
|
|
|
|
USBDEVNAME(sc->sc_bus.bdev));
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
|
|
|
|
goto reset;
|
|
|
|
}
|
|
|
|
} else if ((ctl & OHCI_HCFS_MASK) != OHCI_HCFS_RESET) {
|
|
|
|
/* BIOS started controller. */
|
|
|
|
DPRINTF(("ohci_init: BIOS active\n"));
|
|
|
|
if ((ctl & OHCI_HCFS_MASK) != OHCI_HCFS_OPERATIONAL) {
|
|
|
|
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_OPERATIONAL);
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, USB_RESUME_DELAY);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
DPRINTF(("ohci_init: cold started\n"));
|
|
|
|
reset:
|
|
|
|
/* Controller was cold started. */
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
/*
|
|
|
|
* This reset should not be necessary according to the OHCI spec, but
|
|
|
|
* without it some controllers do not start.
|
|
|
|
*/
|
|
|
|
DPRINTF(("%s: resetting\n", USBDEVNAME(sc->sc_bus.bdev)));
|
|
|
|
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY);
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/* We now own the host controller and the bus has been reset. */
|
|
|
|
ival = OHCI_GET_IVAL(OREAD4(sc, OHCI_FM_INTERVAL));
|
|
|
|
|
|
|
|
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_HCR); /* Reset HC */
|
|
|
|
/* Nominal time for a reset is 10 us. */
|
|
|
|
for (i = 0; i < 10; i++) {
|
|
|
|
delay(10);
|
|
|
|
hcr = OREAD4(sc, OHCI_COMMAND_STATUS) & OHCI_HCR;
|
|
|
|
if (!hcr)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (hcr) {
|
1999-01-07 23:07:57 +00:00
|
|
|
printf("%s: reset timeout\n", USBDEVNAME(sc->sc_bus.bdev));
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
goto bad5;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
if (ohcidebug > 15)
|
|
|
|
ohci_dumpregs(sc);
|
|
|
|
#endif
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
/* The controller is now in SUSPEND state, we have 2ms to finish. */
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/* Set up HC registers. */
|
|
|
|
OWRITE4(sc, OHCI_HCCA, DMAADDR(&sc->sc_hccadma));
|
|
|
|
OWRITE4(sc, OHCI_CONTROL_HEAD_ED, sc->sc_ctrl_head->physaddr);
|
|
|
|
OWRITE4(sc, OHCI_BULK_HEAD_ED, sc->sc_bulk_head->physaddr);
|
1999-11-17 22:33:51 +00:00
|
|
|
/* disable all interrupts and then switch on all desired interrupts */
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS);
|
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_ENABLE, sc->sc_eintrs | OHCI_MIE);
|
1999-11-17 22:33:51 +00:00
|
|
|
/* switch on desired functional features */
|
1998-12-09 23:28:43 +00:00
|
|
|
ctl = OREAD4(sc, OHCI_CONTROL);
|
|
|
|
ctl &= ~(OHCI_CBSR_MASK | OHCI_LES | OHCI_HCFS_MASK | OHCI_IR);
|
|
|
|
ctl |= OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE |
|
|
|
|
OHCI_RATIO_1_4 | OHCI_HCFS_OPERATIONAL;
|
|
|
|
/* And finally start it! */
|
|
|
|
OWRITE4(sc, OHCI_CONTROL, ctl);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The controller is now OPERATIONAL. Set a some final
|
|
|
|
* registers that should be set earlier, but that the
|
|
|
|
* controller ignores when in the SUSPEND state.
|
|
|
|
*/
|
|
|
|
fm = (OREAD4(sc, OHCI_FM_INTERVAL) & OHCI_FIT) ^ OHCI_FIT;
|
|
|
|
fm |= OHCI_FSMPS(ival) | ival;
|
|
|
|
OWRITE4(sc, OHCI_FM_INTERVAL, fm);
|
|
|
|
per = OHCI_PERIODIC(ival); /* 90% periodic */
|
|
|
|
OWRITE4(sc, OHCI_PERIODIC_START, per);
|
|
|
|
|
|
|
|
OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */
|
|
|
|
|
|
|
|
sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A));
|
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
if (ohcidebug > 5)
|
|
|
|
ohci_dumpregs(sc);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Set up the bus struct. */
|
1999-10-07 19:26:38 +00:00
|
|
|
sc->sc_bus.methods = &ohci_bus_methods;
|
1998-12-09 23:28:43 +00:00
|
|
|
sc->sc_bus.pipe_size = sizeof(struct ohci_pipe);
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
sc->sc_powerhook = powerhook_establish(ohci_power, sc);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
sc->sc_shutdownhook = shutdownhook_establish(ohci_shutdown, sc);
|
|
|
|
#endif
|
2000-01-27 23:25:58 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
return (USBD_NORMAL_COMPLETION);
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
bad5:
|
|
|
|
for (i = 0; i < OHCI_NO_EDS; i++)
|
|
|
|
ohci_free_sed(sc, sc->sc_eds[i]);
|
|
|
|
bad4:
|
|
|
|
ohci_free_sed(sc, sc->sc_isoc_head);
|
1998-12-09 23:28:43 +00:00
|
|
|
bad3:
|
|
|
|
ohci_free_sed(sc, sc->sc_ctrl_head);
|
|
|
|
bad2:
|
|
|
|
ohci_free_sed(sc, sc->sc_bulk_head);
|
|
|
|
bad1:
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_freemem(&sc->sc_bus, &sc->sc_hccadma);
|
|
|
|
return (err);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
usbd_status
|
|
|
|
ohci_allocm(bus, dma, size)
|
|
|
|
struct usbd_bus *bus;
|
|
|
|
usb_dma_t *dma;
|
|
|
|
u_int32_t size;
|
|
|
|
{
|
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
struct ohci_softc *sc = (struct ohci_softc *)bus;
|
|
|
|
#endif
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
return (usb_allocmem(&sc->sc_bus, size, 0, dma));
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_freem(bus, dma)
|
|
|
|
struct usbd_bus *bus;
|
|
|
|
usb_dma_t *dma;
|
|
|
|
{
|
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
struct ohci_softc *sc = (struct ohci_softc *)bus;
|
|
|
|
#endif
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_freemem(&sc->sc_bus, dma);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
usbd_xfer_handle
|
|
|
|
ohci_allocx(bus)
|
|
|
|
struct usbd_bus *bus;
|
|
|
|
{
|
|
|
|
struct ohci_softc *sc = (struct ohci_softc *)bus;
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
|
|
|
|
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
|
|
|
|
if (xfer != NULL)
|
|
|
|
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, xfer, next);
|
|
|
|
else
|
|
|
|
xfer = malloc(sizeof(*xfer), M_USB, M_NOWAIT);
|
|
|
|
if (xfer != NULL)
|
|
|
|
memset(xfer, 0, sizeof *xfer);
|
|
|
|
return (xfer);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_freex(bus, xfer)
|
|
|
|
struct usbd_bus *bus;
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
struct ohci_softc *sc = (struct ohci_softc *)bus;
|
|
|
|
|
|
|
|
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Shut down the controller when the system is going down.
|
|
|
|
*/
|
|
|
|
#if defined(__NetBSD__) || defined(__OpenBSD__)
|
|
|
|
void
|
|
|
|
ohci_shutdown(v)
|
|
|
|
void *v;
|
|
|
|
{
|
|
|
|
ohci_softc_t *sc = v;
|
|
|
|
|
|
|
|
DPRINTF(("ohci_shutdown: stopping the HC\n"));
|
|
|
|
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Handle suspend/resume.
|
|
|
|
*
|
|
|
|
* We need to switch to polling mode here, because this routine is
|
|
|
|
* called from an intterupt context. This is all right since we
|
|
|
|
* are almost suspended anyway.
|
|
|
|
*/
|
1999-10-07 19:26:38 +00:00
|
|
|
void
|
|
|
|
ohci_power(why, v)
|
|
|
|
int why;
|
|
|
|
void *v;
|
|
|
|
{
|
|
|
|
#ifdef OHCI_DEBUG
|
|
|
|
ohci_softc_t *sc = v;
|
|
|
|
|
|
|
|
DPRINTF(("ohci_power: sc=%p, why=%d\n", sc, why));
|
|
|
|
/* XXX should suspend/resume */
|
|
|
|
ohci_dumpregs(sc);
|
|
|
|
#endif
|
|
|
|
}
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#endif
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
void
|
|
|
|
ohci_dumpregs(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_dumpregs: rev=0x%08x control=0x%08x command=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_REVISION),
|
|
|
|
OREAD4(sc, OHCI_CONTROL),
|
|
|
|
OREAD4(sc, OHCI_COMMAND_STATUS)));
|
|
|
|
DPRINTF((" intrstat=0x%08x intre=0x%08x intrd=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_INTERRUPT_STATUS),
|
|
|
|
OREAD4(sc, OHCI_INTERRUPT_ENABLE),
|
|
|
|
OREAD4(sc, OHCI_INTERRUPT_DISABLE)));
|
|
|
|
DPRINTF((" hcca=0x%08x percur=0x%08x ctrlhd=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_HCCA),
|
|
|
|
OREAD4(sc, OHCI_PERIOD_CURRENT_ED),
|
|
|
|
OREAD4(sc, OHCI_CONTROL_HEAD_ED)));
|
|
|
|
DPRINTF((" ctrlcur=0x%08x bulkhd=0x%08x bulkcur=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_CONTROL_CURRENT_ED),
|
|
|
|
OREAD4(sc, OHCI_BULK_HEAD_ED),
|
|
|
|
OREAD4(sc, OHCI_BULK_CURRENT_ED)));
|
|
|
|
DPRINTF((" done=0x%08x fmival=0x%08x fmrem=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_DONE_HEAD),
|
|
|
|
OREAD4(sc, OHCI_FM_INTERVAL),
|
|
|
|
OREAD4(sc, OHCI_FM_REMAINING)));
|
|
|
|
DPRINTF((" fmnum=0x%08x perst=0x%08x lsthrs=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_FM_NUMBER),
|
|
|
|
OREAD4(sc, OHCI_PERIODIC_START),
|
|
|
|
OREAD4(sc, OHCI_LS_THRESHOLD)));
|
|
|
|
DPRINTF((" desca=0x%08x descb=0x%08x stat=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_RH_DESCRIPTOR_A),
|
|
|
|
OREAD4(sc, OHCI_RH_DESCRIPTOR_B),
|
|
|
|
OREAD4(sc, OHCI_RH_STATUS)));
|
|
|
|
DPRINTF((" port1=0x%08x port2=0x%08x\n",
|
|
|
|
OREAD4(sc, OHCI_RH_PORT_STATUS(1)),
|
|
|
|
OREAD4(sc, OHCI_RH_PORT_STATUS(2))));
|
|
|
|
DPRINTF((" HCCA: frame_number=0x%04x done_head=0x%08x\n",
|
|
|
|
LE(sc->sc_hcca->hcca_frame_number),
|
|
|
|
LE(sc->sc_hcca->hcca_done_head)));
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static int ohci_intr1 __P((ohci_softc_t *));
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
int
|
|
|
|
ohci_intr(p)
|
|
|
|
void *p;
|
|
|
|
{
|
|
|
|
ohci_softc_t *sc = p;
|
1999-11-17 22:33:51 +00:00
|
|
|
|
|
|
|
/* If we get an interrupt while polling, then just ignore it. */
|
2000-01-10 22:33:43 +00:00
|
|
|
if (sc->sc_bus.use_polling) {
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("ohci_intr: ignored interrupt while polling\n");
|
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
return (0);
|
2000-01-10 22:33:43 +00:00
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
|
1999-11-28 21:01:06 +00:00
|
|
|
return (ohci_intr1(sc));
|
1999-11-17 22:33:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ohci_intr1(sc)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
{
|
1999-01-22 00:51:12 +00:00
|
|
|
u_int32_t intrs, eintrs;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_physaddr_t done;
|
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
/* In case the interrupt occurs before initialization has completed. */
|
1999-10-07 19:26:38 +00:00
|
|
|
if (sc == NULL || sc->sc_hcca == NULL) {
|
1999-01-07 23:07:57 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
printf("ohci_intr: sc->sc_hcca == NULL\n");
|
|
|
|
#endif
|
1998-12-11 06:02:06 +00:00
|
|
|
return (0);
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
1998-12-11 06:02:06 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
intrs = 0;
|
1999-01-07 23:07:57 +00:00
|
|
|
done = LE(sc->sc_hcca->hcca_done_head);
|
2000-01-26 08:46:41 +00:00
|
|
|
|
|
|
|
/* The LSb of done is used to inform the HC Driver that an interrupt
|
|
|
|
* condition exists for both the Done list and for another event
|
|
|
|
* recorded in HcInterruptStatus. On an interrupt from the HC, the HC
|
|
|
|
* Driver checks the HccaDoneHead Value. If this value is 0, then the
|
|
|
|
* interrupt was caused by other than the HccaDoneHead update and the
|
|
|
|
* HcInterruptStatus register needs to be accessed to determine that
|
|
|
|
* exact interrupt cause. If HccaDoneHead is nonzero, then a Done list
|
|
|
|
* update interrupt is indicated and if the LSb of done is nonzero,
|
|
|
|
* then an additional interrupt event is indicated and
|
|
|
|
* HcInterruptStatus should be checked to determine its cause.
|
|
|
|
*/
|
1998-12-09 23:28:43 +00:00
|
|
|
if (done != 0) {
|
1999-01-13 00:50:02 +00:00
|
|
|
sc->sc_hcca->hcca_done_head = 0;
|
|
|
|
if (done & ~OHCI_DONE_INTRS)
|
|
|
|
intrs = OHCI_WDH;
|
2000-01-26 08:46:41 +00:00
|
|
|
if (done & OHCI_DONE_INTRS) {
|
1998-12-09 23:28:43 +00:00
|
|
|
intrs |= OREAD4(sc, OHCI_INTERRUPT_STATUS);
|
2000-01-26 08:46:41 +00:00
|
|
|
done &= ~OHCI_DONE_INTRS;
|
|
|
|
}
|
|
|
|
} else {
|
1998-12-09 23:28:43 +00:00
|
|
|
intrs = OREAD4(sc, OHCI_INTERRUPT_STATUS);
|
2000-01-26 08:46:41 +00:00
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
|
2000-01-26 08:46:41 +00:00
|
|
|
if (intrs == 0) {
|
|
|
|
/* nothing to be done ?! */
|
1998-12-09 23:28:43 +00:00
|
|
|
return (0);
|
2000-01-26 08:46:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
intrs &= ~OHCI_MIE; /* mask out Master Interrupt Enable */
|
|
|
|
|
|
|
|
/* Acknowledge any interrupts that have happened */
|
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_STATUS, intrs);
|
1999-11-17 22:33:51 +00:00
|
|
|
|
2000-01-26 08:46:41 +00:00
|
|
|
/* Any interrupts we had enabled? */
|
1998-12-09 23:28:43 +00:00
|
|
|
eintrs = intrs & sc->sc_eintrs;
|
|
|
|
if (!eintrs)
|
|
|
|
return (0);
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
sc->sc_bus.intr_context++;
|
|
|
|
sc->sc_bus.no_intrs++;
|
1998-12-09 23:28:43 +00:00
|
|
|
DPRINTFN(7, ("ohci_intr: sc=%p intrs=%x(%x) eintr=%x\n",
|
|
|
|
sc, (u_int)intrs, OREAD4(sc, OHCI_INTERRUPT_STATUS),
|
|
|
|
(u_int)eintrs));
|
|
|
|
|
|
|
|
if (eintrs & OHCI_SO) {
|
1999-01-07 23:07:57 +00:00
|
|
|
printf("%s: scheduling overrun\n",USBDEVNAME(sc->sc_bus.bdev));
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX do what */
|
|
|
|
intrs &= ~OHCI_SO;
|
|
|
|
}
|
|
|
|
if (eintrs & OHCI_WDH) {
|
2000-01-26 08:46:41 +00:00
|
|
|
ohci_process_done(sc, done);
|
1998-12-09 23:28:43 +00:00
|
|
|
intrs &= ~OHCI_WDH;
|
|
|
|
}
|
|
|
|
if (eintrs & OHCI_RD) {
|
1999-10-07 19:26:38 +00:00
|
|
|
printf("%s: resume detect\n", USBDEVNAME(sc->sc_bus.bdev));
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX process resume detect */
|
|
|
|
}
|
|
|
|
if (eintrs & OHCI_UE) {
|
1999-01-07 23:07:57 +00:00
|
|
|
printf("%s: unrecoverable error, controller halted\n",
|
|
|
|
USBDEVNAME(sc->sc_bus.bdev));
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
|
|
|
|
/* XXX what else */
|
|
|
|
}
|
|
|
|
if (eintrs & OHCI_RHSC) {
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_rhsc(sc, sc->sc_intrxfer);
|
1998-12-09 23:28:43 +00:00
|
|
|
intrs &= ~OHCI_RHSC;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable RHSC interrupt for now, because it will be
|
|
|
|
* on until the port has been reset.
|
|
|
|
*/
|
|
|
|
ohci_rhsc_able(sc, 0);
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
sc->sc_bus.intr_context--;
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/* Block unprocessed interrupts. XXX */
|
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, intrs);
|
|
|
|
sc->sc_eintrs &= ~intrs;
|
|
|
|
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_rhsc_able(sc, on)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
int on;
|
|
|
|
{
|
|
|
|
DPRINTFN(4, ("ohci_rhsc_able: on=%d\n", on));
|
|
|
|
if (on) {
|
|
|
|
sc->sc_eintrs |= OHCI_RHSC;
|
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_ENABLE, OHCI_RHSC);
|
|
|
|
} else {
|
|
|
|
sc->sc_eintrs &= ~OHCI_RHSC;
|
|
|
|
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_RHSC);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1999-01-07 23:07:57 +00:00
|
|
|
char *ohci_cc_strs[] = {
|
|
|
|
"NO_ERROR",
|
|
|
|
"CRC",
|
|
|
|
"BIT_STUFFING",
|
|
|
|
"DATA_TOGGLE_MISMATCH",
|
|
|
|
"STALL",
|
|
|
|
"DEVICE_NOT_RESPONDING",
|
|
|
|
"PID_CHECK_FAILURE",
|
|
|
|
"UNEXPECTED_PID",
|
|
|
|
"DATA_OVERRUN",
|
|
|
|
"DATA_UNDERRUN",
|
|
|
|
"BUFFER_OVERRUN",
|
|
|
|
"BUFFER_UNDERRUN",
|
2000-01-28 13:05:26 +00:00
|
|
|
"reserved",
|
|
|
|
"reserved",
|
1999-01-07 23:07:57 +00:00
|
|
|
"NOT_ACCESSED",
|
2000-01-28 13:05:26 +00:00
|
|
|
"NOT_ACCESSED"
|
1999-01-07 23:07:57 +00:00
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
void
|
|
|
|
ohci_process_done(sc, done)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_physaddr_t done;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *std, *sdone, *stdnext;
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
int len, cc;
|
|
|
|
|
|
|
|
DPRINTFN(10,("ohci_process_done: done=0x%08lx\n", (u_long)done));
|
|
|
|
|
|
|
|
/* Reverse the done list. */
|
1999-10-07 19:26:38 +00:00
|
|
|
for (sdone = 0; done; done = LE(std->td.td_nexttd)) {
|
1998-12-09 23:28:43 +00:00
|
|
|
std = ohci_hash_find_td(sc, done);
|
|
|
|
std->dnext = sdone;
|
|
|
|
sdone = std;
|
|
|
|
}
|
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1999-10-07 19:26:38 +00:00
|
|
|
if (ohcidebug > 10) {
|
|
|
|
DPRINTF(("ohci_process_done: TD done:\n"));
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_dump_tds(sdone);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
for (std = sdone; std; std = stdnext) {
|
1999-11-28 21:01:06 +00:00
|
|
|
xfer = std->xfer;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
stdnext = std->dnext;
|
2000-01-27 23:25:58 +00:00
|
|
|
DPRINTFN(5, ("ohci_process_done: std=%p xfer=%p hcpriv=%p\n",
|
1999-11-17 22:33:51 +00:00
|
|
|
std, xfer, xfer->hcpriv));
|
1999-10-07 19:26:38 +00:00
|
|
|
cc = OHCI_TD_GET_CC(LE(std->td.td_flags));
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
usb_untimeout(ohci_timeout, xfer, xfer->timo_handle);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->status == USBD_CANCELLED ||
|
|
|
|
xfer->status == USBD_TIMEOUT) {
|
2000-01-29 14:41:48 +00:00
|
|
|
DPRINTF(("ohci_process_done: cancel/timeout, xfer=%p\n",
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer));
|
1999-10-07 19:26:38 +00:00
|
|
|
/* Handled by abort routine. */
|
|
|
|
} else if (cc == OHCI_CC_NO_ERROR) {
|
2000-01-29 14:41:48 +00:00
|
|
|
DPRINTF(("ohci_process_done: no error, xfer=%p\n",
|
|
|
|
xfer));
|
1999-10-07 19:26:38 +00:00
|
|
|
len = std->len;
|
|
|
|
if (std->td.td_cbp != 0)
|
|
|
|
len -= LE(std->td.td_be) -
|
|
|
|
LE(std->td.td_cbp) + 1;
|
1999-11-17 22:33:51 +00:00
|
|
|
if (std->flags & OHCI_ADD_LEN)
|
|
|
|
xfer->actlen += len;
|
1999-10-07 19:26:38 +00:00
|
|
|
if (std->flags & OHCI_CALL_DONE) {
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = USBD_NORMAL_COMPLETION;
|
|
|
|
usb_transfer_complete(xfer);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_hash_rem_td(sc, std);
|
|
|
|
ohci_free_std(sc, std);
|
1998-12-09 23:28:43 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Endpoint is halted. First unlink all the TDs
|
|
|
|
* belonging to the failed transfer, and then restart
|
|
|
|
* the endpoint.
|
|
|
|
*/
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *p, *n;
|
|
|
|
struct ohci_pipe *opipe =
|
|
|
|
(struct ohci_pipe *)xfer->pipe;
|
|
|
|
|
2000-01-29 14:41:48 +00:00
|
|
|
DPRINTF(("ohci_process_done: err cc=%d (%s), xfer=%p\n",
|
1999-11-17 22:33:51 +00:00
|
|
|
OHCI_TD_GET_CC(LE(std->td.td_flags)),
|
2000-01-29 14:41:48 +00:00
|
|
|
ohci_cc_strs[OHCI_TD_GET_CC(LE(std->td.td_flags))],
|
|
|
|
xfer));
|
1999-11-17 22:33:51 +00:00
|
|
|
|
|
|
|
/* remove TDs */
|
|
|
|
for (p = std; p->xfer == xfer; p = n) {
|
1998-12-09 23:28:43 +00:00
|
|
|
n = p->nexttd;
|
2000-01-29 14:41:48 +00:00
|
|
|
ohci_hash_rem_td(sc, p);
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_free_std(sc, p);
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
/* clear halt */
|
1999-10-07 19:26:38 +00:00
|
|
|
opipe->sed->ed.ed_headp = LE(p->physaddr);
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
|
1999-11-17 22:33:51 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
if (cc == OHCI_CC_STALL)
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = USBD_STALLED;
|
1998-12-09 23:28:43 +00:00
|
|
|
else
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = USBD_IOERROR;
|
2000-01-29 14:41:48 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_transfer_complete(xfer);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_device_ctrl_done(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTFN(10,("ohci_ctrl_done: xfer=%p\n", xfer));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (!(xfer->rqflags & URQ_REQUEST)) {
|
1998-12-09 23:28:43 +00:00
|
|
|
panic("ohci_ctrl_done: not a request\n");
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->hcpriv = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_device_intr_done(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)opipe->pipe.device->bus;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_soft_ed_t *sed = opipe->sed;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *data, *tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTFN(10,("ohci_intr_done: xfer=%p, actlen=%d\n",
|
|
|
|
xfer, xfer->actlen));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->hcpriv = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->pipe->repeat) {
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
data = opipe->tail.td;
|
1998-12-09 23:28:43 +00:00
|
|
|
tail = ohci_alloc_std(sc); /* XXX should reuse TD */
|
1999-11-17 22:33:51 +00:00
|
|
|
if (tail == NULL) {
|
|
|
|
xfer->status = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
return;
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
tail->xfer = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
data->td.td_flags = LE(
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_TD_IN | OHCI_TD_NOCC |
|
|
|
|
OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->flags & USBD_SHORT_XFER_OK)
|
|
|
|
data->td.td_flags |= LE(OHCI_TD_R);
|
|
|
|
data->td.td_cbp = LE(DMAADDR(&xfer->dmabuf));
|
|
|
|
data->nexttd = tail;
|
|
|
|
data->td.td_nexttd = LE(tail->physaddr);
|
|
|
|
data->td.td_be = LE(LE(data->td.td_cbp) + xfer->length - 1);
|
|
|
|
data->len = xfer->length;
|
|
|
|
data->xfer = xfer;
|
|
|
|
data->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
|
|
|
|
xfer->hcpriv = data;
|
|
|
|
xfer->actlen = 0;
|
|
|
|
|
|
|
|
ohci_hash_add_td(sc, data);
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_tailp = LE(tail->physaddr);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
opipe->tail.td = tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_device_bulk_done(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTFN(10,("ohci_bulk_done: xfer=%p, actlen=%d\n",
|
|
|
|
xfer, xfer->actlen));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->hcpriv = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_rhsc(sc, xfer)
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_softc_t *sc;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
struct ohci_pipe *opipe;
|
|
|
|
u_char *p;
|
|
|
|
int i, m;
|
|
|
|
int hstatus;
|
|
|
|
|
|
|
|
hstatus = OREAD4(sc, OHCI_RH_STATUS);
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTF(("ohci_rhsc: sc=%p xfer=%p hstatus=0x%08x\n",
|
|
|
|
sc, xfer, hstatus));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer == NULL) {
|
1998-12-09 23:28:43 +00:00
|
|
|
/* Just ignore the change. */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
pipe = xfer->pipe;
|
1998-12-09 23:28:43 +00:00
|
|
|
opipe = (struct ohci_pipe *)pipe;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
p = KERNADDR(&xfer->dmabuf);
|
|
|
|
m = min(sc->sc_noport, xfer->length * 8 - 1);
|
|
|
|
memset(p, 0, xfer->length);
|
1998-12-09 23:28:43 +00:00
|
|
|
for (i = 1; i <= m; i++) {
|
|
|
|
if (OREAD4(sc, OHCI_RH_PORT_STATUS(i)) >> 16)
|
|
|
|
p[i/8] |= 1 << (i%8);
|
|
|
|
}
|
|
|
|
DPRINTF(("ohci_rhsc: change=0x%02x\n", *p));
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->actlen = xfer->length;
|
|
|
|
xfer->status = USBD_NORMAL_COMPLETION;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_transfer_complete(xfer);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_root_intr_done(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-10-07 19:26:38 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->hcpriv = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait here until controller claims to have an interrupt.
|
|
|
|
* Then call ohci_intr and return. Use timeout to avoid waiting
|
|
|
|
* too long.
|
|
|
|
*/
|
|
|
|
void
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_waitintr(sc, xfer)
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_softc_t *sc;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
int timo = xfer->timeout;
|
1998-12-09 23:28:43 +00:00
|
|
|
int usecs;
|
|
|
|
u_int32_t intrs;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = USBD_IN_PROGRESS;
|
1998-12-09 23:28:43 +00:00
|
|
|
for (usecs = timo * 1000000 / hz; usecs > 0; usecs -= 1000) {
|
1999-01-07 23:07:57 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 1);
|
1998-12-09 23:28:43 +00:00
|
|
|
intrs = OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs;
|
1999-01-13 00:50:02 +00:00
|
|
|
DPRINTFN(15,("ohci_waitintr: 0x%04x\n", intrs));
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
if (ohcidebug > 15)
|
|
|
|
ohci_dumpregs(sc);
|
|
|
|
#endif
|
|
|
|
if (intrs) {
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_intr1(sc);
|
|
|
|
if (xfer->status != USBD_IN_PROGRESS)
|
1998-12-09 23:28:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
1999-01-07 23:07:57 +00:00
|
|
|
|
|
|
|
/* Timeout */
|
1998-12-09 23:28:43 +00:00
|
|
|
DPRINTF(("ohci_waitintr: timeout\n"));
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = USBD_TIMEOUT;
|
|
|
|
usb_transfer_complete(xfer);
|
1999-01-07 23:07:57 +00:00
|
|
|
/* XXX should free TD */
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_poll(bus)
|
|
|
|
struct usbd_bus *bus;
|
|
|
|
{
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)bus;
|
|
|
|
|
|
|
|
if (OREAD4(sc, OHCI_INTERRUPT_STATUS) & sc->sc_eintrs)
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_intr1(sc);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
usbd_status
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_device_request(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
|
|
|
usb_device_request_t *req = &xfer->request;
|
1998-12-09 23:28:43 +00:00
|
|
|
usbd_device_handle dev = opipe->pipe.device;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)dev->bus;
|
|
|
|
int addr = dev->address;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *setup, *data = 0, *stat, *next, *tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
int isread;
|
|
|
|
int len;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
int s;
|
|
|
|
|
|
|
|
isread = req->bmRequestType & UT_READ;
|
|
|
|
len = UGETW(req->wLength);
|
|
|
|
|
1999-01-07 23:07:57 +00:00
|
|
|
DPRINTFN(3,("ohci_device_control type=0x%02x, request=0x%02x, "
|
|
|
|
"wValue=0x%04x, wIndex=0x%04x len=%d, addr=%d, endpt=%d\n",
|
1998-12-09 23:28:43 +00:00
|
|
|
req->bmRequestType, req->bRequest, UGETW(req->wValue),
|
|
|
|
UGETW(req->wIndex), len, addr,
|
|
|
|
opipe->pipe.endpoint->edesc->bEndpointAddress));
|
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
setup = opipe->tail.td;
|
1998-12-09 23:28:43 +00:00
|
|
|
stat = ohci_alloc_std(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (stat == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad1;
|
|
|
|
}
|
|
|
|
tail = ohci_alloc_std(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (tail == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad2;
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
tail->xfer = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
sed = opipe->sed;
|
|
|
|
opipe->u.ctl.length = len;
|
|
|
|
|
|
|
|
/* Update device address and length since they may have changed. */
|
|
|
|
/* XXX This only needs to be done once, but it's too early in open. */
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags = LE(
|
|
|
|
(LE(sed->ed.ed_flags) & ~(OHCI_ED_ADDRMASK | OHCI_ED_MAXPMASK)) |
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_ED_SET_FA(addr) |
|
|
|
|
OHCI_ED_SET_MAXP(UGETW(opipe->pipe.endpoint->edesc->wMaxPacketSize)));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/* Set up data transaction */
|
|
|
|
if (len != 0) {
|
1999-11-17 22:33:51 +00:00
|
|
|
data = ohci_alloc_std(sc);
|
|
|
|
if (data == NULL) {
|
|
|
|
err = USBD_NOMEM;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad3;
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
data->td.td_flags = LE(
|
1998-12-09 23:28:43 +00:00
|
|
|
(isread ? OHCI_TD_IN : OHCI_TD_OUT) | OHCI_TD_NOCC |
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_TD_TOGGLE_1 | OHCI_TD_NOINTR |
|
1999-11-17 22:33:51 +00:00
|
|
|
(xfer->flags & USBD_SHORT_XFER_OK ? OHCI_TD_R : 0));
|
|
|
|
data->td.td_cbp = LE(DMAADDR(&xfer->dmabuf));
|
|
|
|
data->nexttd = stat;
|
|
|
|
data->td.td_nexttd = LE(stat->physaddr);
|
|
|
|
data->td.td_be = LE(LE(data->td.td_cbp) + len - 1);
|
|
|
|
data->len = len;
|
|
|
|
data->xfer = xfer;
|
|
|
|
data->flags = OHCI_ADD_LEN;
|
|
|
|
|
|
|
|
next = data;
|
1999-10-07 19:26:38 +00:00
|
|
|
stat->flags = OHCI_CALL_DONE;
|
|
|
|
} else {
|
1998-12-09 23:28:43 +00:00
|
|
|
next = stat;
|
1999-11-17 22:33:51 +00:00
|
|
|
/* XXX ADD_LEN? */
|
|
|
|
stat->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
memcpy(KERNADDR(&opipe->u.ctl.reqdma), req, sizeof *req);
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
setup->td.td_flags = LE(OHCI_TD_SETUP | OHCI_TD_NOCC |
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR);
|
1999-10-07 19:26:38 +00:00
|
|
|
setup->td.td_cbp = LE(DMAADDR(&opipe->u.ctl.reqdma));
|
1998-12-09 23:28:43 +00:00
|
|
|
setup->nexttd = next;
|
1999-10-07 19:26:38 +00:00
|
|
|
setup->td.td_nexttd = LE(next->physaddr);
|
|
|
|
setup->td.td_be = LE(LE(setup->td.td_cbp) + sizeof *req - 1);
|
1998-12-09 23:28:43 +00:00
|
|
|
setup->len = 0; /* XXX The number of byte we count */
|
1999-11-17 22:33:51 +00:00
|
|
|
setup->xfer = xfer;
|
1999-10-07 19:26:38 +00:00
|
|
|
setup->flags = 0;
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->hcpriv = setup;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
stat->td.td_flags = LE(
|
1998-12-09 23:28:43 +00:00
|
|
|
(isread ? OHCI_TD_OUT : OHCI_TD_IN) | OHCI_TD_NOCC |
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DI(1));
|
1999-10-07 19:26:38 +00:00
|
|
|
stat->td.td_cbp = 0;
|
1998-12-09 23:28:43 +00:00
|
|
|
stat->nexttd = tail;
|
1999-10-07 19:26:38 +00:00
|
|
|
stat->td.td_nexttd = LE(tail->physaddr);
|
|
|
|
stat->td.td_be = 0;
|
1998-12-09 23:28:43 +00:00
|
|
|
stat->len = 0;
|
1999-11-17 22:33:51 +00:00
|
|
|
stat->xfer = xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-05-03 23:11:41 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
if (ohcidebug > 5) {
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_request:\n"));
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_dump_ed(sed);
|
|
|
|
ohci_dump_tds(setup);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Insert ED in schedule */
|
|
|
|
s = splusb();
|
|
|
|
ohci_hash_add_td(sc, setup);
|
|
|
|
if (len != 0)
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_hash_add_td(sc, data);
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_hash_add_td(sc, stat);
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_tailp = LE(tail->physaddr);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
opipe->tail.td = tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_CLF);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->timeout && !sc->sc_bus.use_polling) {
|
|
|
|
usb_timeout(ohci_timeout, xfer,
|
|
|
|
MS_TO_TICKS(xfer->timeout), xfer->timo_handle);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
splx(s);
|
|
|
|
|
1999-05-03 23:11:41 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
2000-01-29 14:41:48 +00:00
|
|
|
if (ohcidebug > 25) {
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 5);
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_request: status=%x\n",
|
|
|
|
OREAD4(sc, OHCI_COMMAND_STATUS)));
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_dump_ed(sed);
|
|
|
|
ohci_dump_tds(setup);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return (USBD_NORMAL_COMPLETION);
|
|
|
|
|
|
|
|
bad3:
|
|
|
|
ohci_free_std(sc, tail);
|
|
|
|
bad2:
|
|
|
|
ohci_free_std(sc, stat);
|
|
|
|
bad1:
|
1999-11-17 22:33:51 +00:00
|
|
|
return (err);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add an ED to the schedule. Called at splusb().
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ohci_add_ed(sed, head)
|
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
ohci_soft_ed_t *head;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
SPLUSBCHECK;
|
1998-12-09 23:28:43 +00:00
|
|
|
sed->next = head->next;
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_nexted = head->ed.ed_nexted;
|
1998-12-09 23:28:43 +00:00
|
|
|
head->next = sed;
|
1999-10-07 19:26:38 +00:00
|
|
|
head->ed.ed_nexted = LE(sed->physaddr);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remove an ED from the schedule. Called at splusb().
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ohci_rem_ed(sed, head)
|
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
ohci_soft_ed_t *head;
|
|
|
|
{
|
|
|
|
ohci_soft_ed_t *p;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
SPLUSBCHECK;
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX */
|
1999-11-17 22:33:51 +00:00
|
|
|
for (p = head; p == NULL && p->next != sed; p = p->next)
|
1998-12-09 23:28:43 +00:00
|
|
|
;
|
1999-11-17 22:33:51 +00:00
|
|
|
if (p == NULL)
|
1998-12-09 23:28:43 +00:00
|
|
|
panic("ohci_rem_ed: ED not found\n");
|
|
|
|
p->next = sed->next;
|
1999-10-07 19:26:38 +00:00
|
|
|
p->ed.ed_nexted = sed->ed.ed_nexted;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When a transfer is completed the TD is added to the done queue by
|
|
|
|
* the host controller. This queue is the processed by software.
|
|
|
|
* Unfortunately the queue contains the physical address of the TD
|
|
|
|
* and we have no simple way to translate this back to a kernel address.
|
|
|
|
* To make the translation possible (and fast) we use a hash table of
|
|
|
|
* TDs currently in the schedule. The physical address is used as the
|
|
|
|
* hash value.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define HASH(a) (((a) >> 4) % OHCI_HASH_SIZE)
|
|
|
|
/* Called at splusb() */
|
|
|
|
void
|
|
|
|
ohci_hash_add_td(sc, std)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
{
|
|
|
|
int h = HASH(std->physaddr);
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
SPLUSBCHECK;
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
LIST_INSERT_HEAD(&sc->sc_hash_tds[h], std, hnext);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Called at splusb() */
|
|
|
|
void
|
|
|
|
ohci_hash_rem_td(sc, std)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
SPLUSBCHECK;
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
LIST_REMOVE(std, hnext);
|
|
|
|
}
|
|
|
|
|
|
|
|
ohci_soft_td_t *
|
|
|
|
ohci_hash_find_td(sc, a)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
ohci_physaddr_t a;
|
|
|
|
{
|
|
|
|
int h = HASH(a);
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
|
2000-01-29 14:41:48 +00:00
|
|
|
/* if these are present they should be masked out at an earlier
|
|
|
|
* stage.
|
|
|
|
*/
|
2000-01-29 11:50:44 +00:00
|
|
|
KASSERT(a&LE(TAILMASK) == 0, ("%s: 0x%b has lower bits set\n",
|
|
|
|
USBDEVNAME(sc->sc_bus.bdev),
|
|
|
|
(int) a, "\20\1HALT\2TOGGLE"));
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
for (std = LIST_FIRST(&sc->sc_hash_tds[h]);
|
1999-11-28 21:01:06 +00:00
|
|
|
std != NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
std = LIST_NEXT(std, hnext))
|
|
|
|
if (std->physaddr == a)
|
|
|
|
return (std);
|
2000-01-27 23:25:58 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
panic("ohci_hash_find_td: addr 0x%08lx not found\n", (u_long)a);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_timeout(addr)
|
|
|
|
void *addr;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_xfer_handle xfer = addr;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
DPRINTF(("ohci_timeout: xfer=%p\n", xfer));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
s = splusb();
|
|
|
|
xfer->device->bus->intr_context++;
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer(xfer, USBD_TIMEOUT);
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->device->bus->intr_context--;
|
|
|
|
splx(s);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
1999-04-17 21:48:03 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
void
|
|
|
|
ohci_dump_tds(std)
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
{
|
|
|
|
for (; std; std = std->nexttd)
|
|
|
|
ohci_dump_td(std);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_dump_td(std)
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
{
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("TD(%p) at %08lx: %b delay=%d ec=%d cc=%d\ncbp=0x%08lx "
|
|
|
|
"nexttd=0x%08lx be=0x%08lx\n",
|
|
|
|
std, (u_long)std->physaddr,
|
|
|
|
(int)LE(std->td.td_flags),
|
|
|
|
"\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE",
|
|
|
|
OHCI_TD_GET_DI(LE(std->td.td_flags)),
|
|
|
|
OHCI_TD_GET_EC(LE(std->td.td_flags)),
|
|
|
|
OHCI_TD_GET_CC(LE(std->td.td_flags)),
|
|
|
|
(u_long)LE(std->td.td_cbp),
|
|
|
|
(u_long)LE(std->td.td_nexttd), (u_long)LE(std->td.td_be)));
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_dump_ed(sed)
|
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
{
|
2000-01-29 14:41:48 +00:00
|
|
|
DPRINTF(("ED(%p) at %08lx: addr=%d endpt=%d maxp=%d %b\n"
|
|
|
|
"tailp=0x%8b headp=0x%8b nexted=0x%08lx\n",
|
1999-10-07 19:26:38 +00:00
|
|
|
sed, (u_long)sed->physaddr,
|
|
|
|
OHCI_ED_GET_FA(LE(sed->ed.ed_flags)),
|
|
|
|
OHCI_ED_GET_EN(LE(sed->ed.ed_flags)),
|
|
|
|
OHCI_ED_GET_MAXP(LE(sed->ed.ed_flags)),
|
|
|
|
(int)LE(sed->ed.ed_flags),
|
|
|
|
"\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO",
|
2000-01-29 14:41:48 +00:00
|
|
|
(int)(uintptr_t)LE(sed->ed.ed_tailp),
|
|
|
|
"\20\1BIT1\2BIT2",
|
2000-01-23 19:25:29 +00:00
|
|
|
(int)(uintptr_t)LE(sed->ed.ed_headp),
|
1999-10-07 19:26:38 +00:00
|
|
|
"\20\1HALT\2CARRY",
|
|
|
|
(u_long)LE(sed->ed.ed_nexted)));
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
usbd_status
|
|
|
|
ohci_open(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
usbd_device_handle dev = pipe->device;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)dev->bus;
|
|
|
|
usb_endpoint_descriptor_t *ed = pipe->endpoint->edesc;
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
u_int8_t addr = dev->address;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
u_int8_t xfertype = ed->bmAttributes & UE_XFERTYPE;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_soft_ed_t *sed;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_soft_td_t *std = NULL;
|
|
|
|
ohci_soft_itd_t *sitd;
|
|
|
|
ohci_physaddr_t tdphys;
|
|
|
|
u_int32_t fmt;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
int s;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
int ival;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
DPRINTFN(1, ("ohci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
|
|
|
|
pipe, addr, ed->bEndpointAddress, sc->sc_addr));
|
|
|
|
if (addr == sc->sc_addr) {
|
|
|
|
switch (ed->bEndpointAddress) {
|
|
|
|
case USB_CONTROL_ENDPOINT:
|
|
|
|
pipe->methods = &ohci_root_ctrl_methods;
|
|
|
|
break;
|
1999-10-07 19:26:38 +00:00
|
|
|
case UE_DIR_IN | OHCI_INTR_ENDPT:
|
1998-12-09 23:28:43 +00:00
|
|
|
pipe->methods = &ohci_root_intr_methods;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sed = ohci_alloc_sed(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (sed == NULL)
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad0;
|
|
|
|
opipe->sed = sed;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
if (xfertype == UE_ISOCHRONOUS) {
|
|
|
|
sitd = ohci_alloc_sitd(sc);
|
|
|
|
if (sitd == NULL) {
|
|
|
|
ohci_free_sitd(sc, sitd);
|
|
|
|
goto bad1;
|
|
|
|
}
|
|
|
|
opipe->tail.itd = sitd;
|
|
|
|
tdphys = LE(sitd->physaddr);
|
|
|
|
fmt = OHCI_ED_FORMAT_ISO;
|
|
|
|
} else {
|
|
|
|
std = ohci_alloc_std(sc);
|
|
|
|
if (std == NULL) {
|
|
|
|
ohci_free_std(sc, std);
|
|
|
|
goto bad1;
|
|
|
|
}
|
|
|
|
opipe->tail.td = std;
|
|
|
|
tdphys = LE(std->physaddr);
|
|
|
|
fmt = OHCI_ED_FORMAT_GEN;
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags = LE(
|
1998-12-09 23:28:43 +00:00
|
|
|
OHCI_ED_SET_FA(addr) |
|
|
|
|
OHCI_ED_SET_EN(ed->bEndpointAddress) |
|
|
|
|
OHCI_ED_DIR_TD |
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
(dev->lowspeed ? OHCI_ED_SPEED : 0) | fmt |
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_ED_SET_MAXP(UGETW(ed->wMaxPacketSize)));
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
sed->ed.ed_headp = sed->ed.ed_tailp = tdphys;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
switch (xfertype) {
|
1998-12-09 23:28:43 +00:00
|
|
|
case UE_CONTROL:
|
|
|
|
pipe->methods = &ohci_device_ctrl_methods;
|
1999-11-17 22:33:51 +00:00
|
|
|
err = usb_allocmem(&sc->sc_bus,
|
|
|
|
sizeof(usb_device_request_t),
|
|
|
|
0, &opipe->u.ctl.reqdma);
|
|
|
|
if (err)
|
1998-12-09 23:28:43 +00:00
|
|
|
goto bad;
|
|
|
|
s = splusb();
|
|
|
|
ohci_add_ed(sed, sc->sc_ctrl_head);
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
case UE_INTERRUPT:
|
|
|
|
pipe->methods = &ohci_device_intr_methods;
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ival = pipe->interval;
|
|
|
|
if (ival == USBD_DEFAULT_INTERVAL)
|
|
|
|
ival = ed->bInterval;
|
|
|
|
return (ohci_device_setintr(sc, opipe, ival));
|
1998-12-09 23:28:43 +00:00
|
|
|
case UE_ISOCHRONOUS:
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
pipe->methods = &ohci_device_isoc_methods;
|
|
|
|
return (ohci_setup_isoc(pipe));
|
1998-12-09 23:28:43 +00:00
|
|
|
case UE_BULK:
|
|
|
|
pipe->methods = &ohci_device_bulk_methods;
|
|
|
|
s = splusb();
|
|
|
|
ohci_add_ed(sed, sc->sc_bulk_head);
|
|
|
|
splx(s);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (USBD_NORMAL_COMPLETION);
|
|
|
|
|
|
|
|
bad:
|
|
|
|
ohci_free_std(sc, std);
|
|
|
|
bad1:
|
|
|
|
ohci_free_sed(sc, sed);
|
|
|
|
bad0:
|
|
|
|
return (USBD_NOMEM);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
/*
|
|
|
|
* Close a reqular pipe.
|
|
|
|
* Assumes that there are no pending transactions.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
ohci_close_pipe(pipe, head)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
ohci_soft_ed_t *head;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
ohci_soft_ed_t *sed = opipe->sed;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
s = splusb();
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
sed->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
2000-01-29 11:59:31 +00:00
|
|
|
if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK))
|
|
|
|
!= (sed->ed.ed_headp & LE(OHCI_HEADMASK))) {
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_physaddr_t td = sed->ed.ed_headp;
|
|
|
|
ohci_soft_td_t *std;
|
|
|
|
for (std = LIST_FIRST(&sc->sc_hash_tds[HASH(td)]);
|
1999-11-28 21:01:06 +00:00
|
|
|
std != NULL;
|
1999-10-07 19:26:38 +00:00
|
|
|
std = LIST_NEXT(std, hnext))
|
|
|
|
if (std->physaddr == td)
|
|
|
|
break;
|
|
|
|
printf("ohci_close_pipe: pipe not empty sed=%p hd=0x%x "
|
|
|
|
"tl=0x%x pipe=%p, std=%p\n", sed,
|
|
|
|
(int)LE(sed->ed.ed_headp), (int)LE(sed->ed.ed_tailp),
|
|
|
|
pipe, std);
|
|
|
|
usb_delay_ms(&sc->sc_bus, 2);
|
2000-01-29 11:59:31 +00:00
|
|
|
if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK))
|
|
|
|
!= (sed->ed.ed_headp & LE(OHCI_HEADMASK)))
|
1999-10-07 19:26:38 +00:00
|
|
|
printf("ohci_close_pipe: pipe still not empty\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
ohci_rem_ed(sed, head);
|
|
|
|
splx(s);
|
|
|
|
ohci_free_sed(sc, opipe->sed);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Abort a device request.
|
|
|
|
* If this routine is called at splusb() it guarantees that the request
|
|
|
|
* will be removed from the hardware scheduling and that the callback
|
|
|
|
* for it will be called with USBD_CANCELLED status.
|
|
|
|
* It's impossible to guarantee that the requested transfer will not
|
|
|
|
* have happened since the hardware runs concurrently.
|
|
|
|
* If the transaction has already happened we rely on the ordinary
|
|
|
|
* interrupt processing to process it.
|
|
|
|
*/
|
|
|
|
void
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer(xfer, status)
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_xfer_handle xfer;
|
1999-10-07 19:26:38 +00:00
|
|
|
usbd_status status;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
|
1999-11-28 21:01:06 +00:00
|
|
|
DPRINTF(("ohci_abort_xfer: xfer=%p pipe=%p\n", xfer, opipe));
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = status;
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_untimeout(ohci_timeout, xfer, xfer->timo_handle);
|
1999-10-07 19:26:38 +00:00
|
|
|
|
|
|
|
sed = opipe->sed;
|
|
|
|
sed->ed.ed_flags |= LE(OHCI_ED_SKIP); /* force hardware skip */
|
2000-01-29 14:41:48 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
|
|
|
DPRINTFN(1,("ohci_abort_xfer: stop ed=%p\n", sed));
|
|
|
|
ohci_dump_ed(sed);
|
|
|
|
#endif
|
1999-10-07 19:26:38 +00:00
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#if 1
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->device->bus->intr_context) {
|
|
|
|
/* We have no process context, so we can't use tsleep(). */
|
1999-11-28 21:01:06 +00:00
|
|
|
timeout(ohci_abort_xfer_end, xfer, hz / USB_FRAMES_PER_SECOND);
|
1999-10-07 19:26:38 +00:00
|
|
|
} else {
|
1999-11-28 21:01:06 +00:00
|
|
|
#if defined(DIAGNOSTIC) && defined(__i386__) && defined(__FreeBSD__)
|
1999-11-17 22:33:51 +00:00
|
|
|
KASSERT(intr_nesting_level == 0,
|
|
|
|
("ohci_abort_req in interrupt context"));
|
|
|
|
#endif
|
|
|
|
usb_delay_ms(opipe->pipe.device->bus, 1);
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer_end(xfer);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
#else
|
|
|
|
delay(1000);
|
|
|
|
ohci_abort_xfer_end(xfer);
|
|
|
|
#endif
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer_end(v)
|
1999-10-07 19:26:38 +00:00
|
|
|
void *v;
|
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_xfer_handle xfer = v;
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)opipe->pipe.device->bus;
|
|
|
|
ohci_soft_ed_t *sed;
|
|
|
|
ohci_soft_td_t *p, *n;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
s = splusb();
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
p = xfer->hcpriv;
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (p == NULL) {
|
1999-11-28 21:01:06 +00:00
|
|
|
printf("ohci_abort_xfer: hcpriv==0\n");
|
2000-01-27 23:25:58 +00:00
|
|
|
splx(s);
|
1999-10-07 19:26:38 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
for (; p->xfer == xfer; p = n) {
|
1999-10-07 19:26:38 +00:00
|
|
|
n = p->nexttd;
|
|
|
|
ohci_hash_rem_td(sc, p);
|
|
|
|
ohci_free_std(sc, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
sed = opipe->sed;
|
1999-11-28 21:01:06 +00:00
|
|
|
DPRINTFN(2,("ohci_abort_xfer: set hd=%x, tl=%x\n",
|
1999-10-07 19:26:38 +00:00
|
|
|
(int)LE(p->physaddr), (int)LE(sed->ed.ed_tailp)));
|
|
|
|
sed->ed.ed_headp = p->physaddr; /* unlink TDs */
|
|
|
|
sed->ed.ed_flags &= LE(~OHCI_ED_SKIP); /* remove hardware skip */
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_transfer_complete(xfer);
|
1999-10-07 19:26:38 +00:00
|
|
|
|
|
|
|
splx(s);
|
|
|
|
}
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
/*
|
|
|
|
* Data structures and routines to emulate the root hub.
|
|
|
|
*/
|
1999-11-17 22:33:51 +00:00
|
|
|
static usb_device_descriptor_t ohci_devd = {
|
1998-12-09 23:28:43 +00:00
|
|
|
USB_DEVICE_DESCRIPTOR_SIZE,
|
|
|
|
UDESC_DEVICE, /* type */
|
|
|
|
{0x00, 0x01}, /* USB version */
|
|
|
|
UCLASS_HUB, /* class */
|
|
|
|
USUBCLASS_HUB, /* subclass */
|
|
|
|
0, /* protocol */
|
|
|
|
64, /* max packet */
|
|
|
|
{0},{0},{0x00,0x01}, /* device id */
|
|
|
|
1,2,0, /* string indicies */
|
|
|
|
1 /* # of configurations */
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usb_config_descriptor_t ohci_confd = {
|
1998-12-09 23:28:43 +00:00
|
|
|
USB_CONFIG_DESCRIPTOR_SIZE,
|
|
|
|
UDESC_CONFIG,
|
|
|
|
{USB_CONFIG_DESCRIPTOR_SIZE +
|
|
|
|
USB_INTERFACE_DESCRIPTOR_SIZE +
|
|
|
|
USB_ENDPOINT_DESCRIPTOR_SIZE},
|
|
|
|
1,
|
|
|
|
1,
|
|
|
|
0,
|
|
|
|
UC_SELF_POWERED,
|
|
|
|
0 /* max power */
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usb_interface_descriptor_t ohci_ifcd = {
|
1998-12-09 23:28:43 +00:00
|
|
|
USB_INTERFACE_DESCRIPTOR_SIZE,
|
|
|
|
UDESC_INTERFACE,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
1,
|
|
|
|
UCLASS_HUB,
|
|
|
|
USUBCLASS_HUB,
|
|
|
|
0,
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usb_endpoint_descriptor_t ohci_endpd = {
|
1998-12-09 23:28:43 +00:00
|
|
|
USB_ENDPOINT_DESCRIPTOR_SIZE,
|
|
|
|
UDESC_ENDPOINT,
|
1999-10-07 19:26:38 +00:00
|
|
|
UE_DIR_IN | OHCI_INTR_ENDPT,
|
1998-12-09 23:28:43 +00:00
|
|
|
UE_INTERRUPT,
|
|
|
|
{8, 0}, /* max packet */
|
|
|
|
255
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usb_hub_descriptor_t ohci_hubd = {
|
1998-12-09 23:28:43 +00:00
|
|
|
USB_HUB_DESCRIPTOR_SIZE,
|
|
|
|
UDESC_HUB,
|
|
|
|
0,
|
|
|
|
{0,0},
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
{0},
|
|
|
|
};
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static int
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_str(p, l, s)
|
|
|
|
usb_string_descriptor_t *p;
|
|
|
|
int l;
|
|
|
|
char *s;
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (l == 0)
|
|
|
|
return (0);
|
|
|
|
p->bLength = 2 * strlen(s) + 2;
|
|
|
|
if (l == 1)
|
|
|
|
return (1);
|
|
|
|
p->bDescriptorType = UDESC_STRING;
|
|
|
|
l -= 2;
|
|
|
|
for (i = 0; s[i] && l > 1; i++, l -= 2)
|
|
|
|
USETW2(p->bString[i], 0, s[i]);
|
|
|
|
return (2*i+2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Simulate a hardware hub by handling all the necessary requests.
|
|
|
|
*/
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_root_ctrl_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-01-07 23:07:57 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
|
|
|
|
|
|
|
/* Insert last in queue. */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Pipe isn't running, start first */
|
|
|
|
return (ohci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_root_ctrl_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)xfer->pipe->device->bus;
|
1998-12-09 23:28:43 +00:00
|
|
|
usb_device_request_t *req;
|
1999-10-07 19:26:38 +00:00
|
|
|
void *buf = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
int port, i;
|
1999-11-17 22:33:51 +00:00
|
|
|
int s, len, value, index, l, totlen = 0;
|
1998-12-09 23:28:43 +00:00
|
|
|
usb_port_status_t ps;
|
|
|
|
usb_hub_descriptor_t hubd;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
u_int32_t v;
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (!(xfer->rqflags & URQ_REQUEST))
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX panic */
|
|
|
|
return (USBD_INVAL);
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1999-11-17 22:33:51 +00:00
|
|
|
req = &xfer->request;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
DPRINTFN(4,("ohci_root_ctrl_control type=0x%02x request=%02x\n",
|
|
|
|
req->bmRequestType, req->bRequest));
|
|
|
|
|
|
|
|
len = UGETW(req->wLength);
|
|
|
|
value = UGETW(req->wValue);
|
|
|
|
index = UGETW(req->wIndex);
|
1999-10-07 19:26:38 +00:00
|
|
|
|
|
|
|
if (len != 0)
|
1999-11-17 22:33:51 +00:00
|
|
|
buf = KERNADDR(&xfer->dmabuf);
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
#define C(x,y) ((x) | ((y) << 8))
|
|
|
|
switch(C(req->bRequest, req->bmRequestType)) {
|
|
|
|
case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE):
|
|
|
|
case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE):
|
|
|
|
case C(UR_CLEAR_FEATURE, UT_WRITE_ENDPOINT):
|
|
|
|
/*
|
1999-01-07 23:07:57 +00:00
|
|
|
* DEVICE_REMOTE_WAKEUP and ENDPOINT_HALT are no-ops
|
1998-12-09 23:28:43 +00:00
|
|
|
* for the integrated root hub.
|
|
|
|
*/
|
|
|
|
break;
|
|
|
|
case C(UR_GET_CONFIG, UT_READ_DEVICE):
|
|
|
|
if (len > 0) {
|
|
|
|
*(u_int8_t *)buf = sc->sc_conf;
|
|
|
|
totlen = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_GET_DESCRIPTOR, UT_READ_DEVICE):
|
|
|
|
DPRINTFN(8,("ohci_root_ctrl_control wValue=0x%04x\n", value));
|
|
|
|
switch(value >> 8) {
|
|
|
|
case UDESC_DEVICE:
|
|
|
|
if ((value & 0xff) != 0) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
totlen = l = min(len, USB_DEVICE_DESCRIPTOR_SIZE);
|
1999-10-07 19:26:38 +00:00
|
|
|
USETW(ohci_devd.idVendor, sc->sc_id_vendor);
|
1998-12-09 23:28:43 +00:00
|
|
|
memcpy(buf, &ohci_devd, l);
|
|
|
|
break;
|
|
|
|
case UDESC_CONFIG:
|
|
|
|
if ((value & 0xff) != 0) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
totlen = l = min(len, USB_CONFIG_DESCRIPTOR_SIZE);
|
|
|
|
memcpy(buf, &ohci_confd, l);
|
|
|
|
buf = (char *)buf + l;
|
|
|
|
len -= l;
|
|
|
|
l = min(len, USB_INTERFACE_DESCRIPTOR_SIZE);
|
|
|
|
totlen += l;
|
|
|
|
memcpy(buf, &ohci_ifcd, l);
|
|
|
|
buf = (char *)buf + l;
|
|
|
|
len -= l;
|
|
|
|
l = min(len, USB_ENDPOINT_DESCRIPTOR_SIZE);
|
|
|
|
totlen += l;
|
|
|
|
memcpy(buf, &ohci_endpd, l);
|
|
|
|
break;
|
|
|
|
case UDESC_STRING:
|
|
|
|
if (len == 0)
|
|
|
|
break;
|
|
|
|
*(u_int8_t *)buf = 0;
|
|
|
|
totlen = 1;
|
|
|
|
switch (value & 0xff) {
|
|
|
|
case 1: /* Vendor */
|
|
|
|
totlen = ohci_str(buf, len, sc->sc_vendor);
|
|
|
|
break;
|
|
|
|
case 2: /* Product */
|
|
|
|
totlen = ohci_str(buf, len, "OHCI root hub");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_GET_INTERFACE, UT_READ_INTERFACE):
|
|
|
|
if (len > 0) {
|
|
|
|
*(u_int8_t *)buf = 0;
|
|
|
|
totlen = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_GET_STATUS, UT_READ_DEVICE):
|
|
|
|
if (len > 1) {
|
|
|
|
USETW(((usb_status_t *)buf)->wStatus,UDS_SELF_POWERED);
|
|
|
|
totlen = 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_GET_STATUS, UT_READ_INTERFACE):
|
|
|
|
case C(UR_GET_STATUS, UT_READ_ENDPOINT):
|
|
|
|
if (len > 1) {
|
|
|
|
USETW(((usb_status_t *)buf)->wStatus, 0);
|
|
|
|
totlen = 2;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_SET_ADDRESS, UT_WRITE_DEVICE):
|
|
|
|
if (value >= USB_MAX_DEVICES) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
sc->sc_addr = value;
|
|
|
|
break;
|
|
|
|
case C(UR_SET_CONFIG, UT_WRITE_DEVICE):
|
|
|
|
if (value != 0 && value != 1) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
sc->sc_conf = value;
|
|
|
|
break;
|
|
|
|
case C(UR_SET_DESCRIPTOR, UT_WRITE_DEVICE):
|
|
|
|
break;
|
|
|
|
case C(UR_SET_FEATURE, UT_WRITE_DEVICE):
|
|
|
|
case C(UR_SET_FEATURE, UT_WRITE_INTERFACE):
|
|
|
|
case C(UR_SET_FEATURE, UT_WRITE_ENDPOINT):
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
case C(UR_SET_INTERFACE, UT_WRITE_INTERFACE):
|
|
|
|
break;
|
|
|
|
case C(UR_SYNCH_FRAME, UT_WRITE_ENDPOINT):
|
|
|
|
break;
|
|
|
|
/* Hub requests */
|
|
|
|
case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_DEVICE):
|
|
|
|
break;
|
|
|
|
case C(UR_CLEAR_FEATURE, UT_WRITE_CLASS_OTHER):
|
1999-01-07 23:07:57 +00:00
|
|
|
DPRINTFN(8, ("ohci_root_ctrl_control: UR_CLEAR_PORT_FEATURE "
|
|
|
|
"port=%d feature=%d\n",
|
1998-12-09 23:28:43 +00:00
|
|
|
index, value));
|
|
|
|
if (index < 1 || index > sc->sc_noport) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
port = OHCI_RH_PORT_STATUS(index);
|
|
|
|
switch(value) {
|
|
|
|
case UHF_PORT_ENABLE:
|
|
|
|
OWRITE4(sc, port, UPS_CURRENT_CONNECT_STATUS);
|
|
|
|
break;
|
|
|
|
case UHF_PORT_SUSPEND:
|
|
|
|
OWRITE4(sc, port, UPS_OVERCURRENT_INDICATOR);
|
|
|
|
break;
|
|
|
|
case UHF_PORT_POWER:
|
|
|
|
OWRITE4(sc, port, UPS_LOW_SPEED);
|
|
|
|
break;
|
|
|
|
case UHF_C_PORT_CONNECTION:
|
|
|
|
OWRITE4(sc, port, UPS_C_CONNECT_STATUS << 16);
|
|
|
|
break;
|
|
|
|
case UHF_C_PORT_ENABLE:
|
|
|
|
OWRITE4(sc, port, UPS_C_PORT_ENABLED << 16);
|
|
|
|
break;
|
|
|
|
case UHF_C_PORT_SUSPEND:
|
|
|
|
OWRITE4(sc, port, UPS_C_SUSPEND << 16);
|
|
|
|
break;
|
|
|
|
case UHF_C_PORT_OVER_CURRENT:
|
|
|
|
OWRITE4(sc, port, UPS_C_OVERCURRENT_INDICATOR << 16);
|
|
|
|
break;
|
|
|
|
case UHF_C_PORT_RESET:
|
|
|
|
OWRITE4(sc, port, UPS_C_PORT_RESET << 16);
|
|
|
|
break;
|
|
|
|
default:
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
switch(value) {
|
|
|
|
case UHF_C_PORT_CONNECTION:
|
|
|
|
case UHF_C_PORT_ENABLE:
|
|
|
|
case UHF_C_PORT_SUSPEND:
|
|
|
|
case UHF_C_PORT_OVER_CURRENT:
|
|
|
|
case UHF_C_PORT_RESET:
|
|
|
|
/* Enable RHSC interrupt if condition is cleared. */
|
|
|
|
if ((OREAD4(sc, port) >> 16) == 0)
|
|
|
|
ohci_rhsc_able(sc, 1);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
|
|
|
|
if (value != 0) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
v = OREAD4(sc, OHCI_RH_DESCRIPTOR_A);
|
|
|
|
hubd = ohci_hubd;
|
|
|
|
hubd.bNbrPorts = sc->sc_noport;
|
1999-01-07 23:07:57 +00:00
|
|
|
USETW(hubd.wHubCharacteristics,
|
1998-12-09 23:28:43 +00:00
|
|
|
(v & OHCI_NPS ? UHD_PWR_NO_SWITCH :
|
|
|
|
v & OHCI_PSM ? UHD_PWR_GANGED : UHD_PWR_INDIVIDUAL)
|
|
|
|
/* XXX overcurrent */
|
|
|
|
);
|
|
|
|
hubd.bPwrOn2PwrGood = OHCI_GET_POTPGT(v);
|
|
|
|
v = OREAD4(sc, OHCI_RH_DESCRIPTOR_B);
|
1999-01-07 23:07:57 +00:00
|
|
|
for (i = 0, l = sc->sc_noport; l > 0; i++, l -= 8, v >>= 8)
|
|
|
|
hubd.DeviceRemovable[i++] = (u_int8_t)v;
|
|
|
|
hubd.bDescLength = USB_HUB_DESCRIPTOR_SIZE + i;
|
1998-12-09 23:28:43 +00:00
|
|
|
l = min(len, hubd.bDescLength);
|
|
|
|
totlen = l;
|
|
|
|
memcpy(buf, &hubd, l);
|
|
|
|
break;
|
|
|
|
case C(UR_GET_STATUS, UT_READ_CLASS_DEVICE):
|
|
|
|
if (len != 4) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
memset(buf, 0, len); /* ? XXX */
|
|
|
|
totlen = len;
|
|
|
|
break;
|
|
|
|
case C(UR_GET_STATUS, UT_READ_CLASS_OTHER):
|
|
|
|
DPRINTFN(8,("ohci_root_ctrl_transfer: get port status i=%d\n",
|
|
|
|
index));
|
|
|
|
if (index < 1 || index > sc->sc_noport) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
if (len != 4) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
v = OREAD4(sc, OHCI_RH_PORT_STATUS(index));
|
|
|
|
DPRINTFN(8,("ohci_root_ctrl_transfer: port status=0x%04x\n",
|
|
|
|
v));
|
|
|
|
USETW(ps.wPortStatus, v);
|
|
|
|
USETW(ps.wPortChange, v >> 16);
|
|
|
|
l = min(len, sizeof ps);
|
|
|
|
memcpy(buf, &ps, l);
|
|
|
|
totlen = l;
|
|
|
|
break;
|
|
|
|
case C(UR_SET_DESCRIPTOR, UT_WRITE_CLASS_DEVICE):
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
case C(UR_SET_FEATURE, UT_WRITE_CLASS_DEVICE):
|
|
|
|
break;
|
|
|
|
case C(UR_SET_FEATURE, UT_WRITE_CLASS_OTHER):
|
|
|
|
if (index < 1 || index > sc->sc_noport) {
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
port = OHCI_RH_PORT_STATUS(index);
|
|
|
|
switch(value) {
|
|
|
|
case UHF_PORT_ENABLE:
|
|
|
|
OWRITE4(sc, port, UPS_PORT_ENABLED);
|
|
|
|
break;
|
|
|
|
case UHF_PORT_SUSPEND:
|
|
|
|
OWRITE4(sc, port, UPS_SUSPEND);
|
|
|
|
break;
|
|
|
|
case UHF_PORT_RESET:
|
1999-01-07 23:07:57 +00:00
|
|
|
DPRINTFN(5,("ohci_root_ctrl_transfer: reset port %d\n",
|
|
|
|
index));
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, port, UPS_RESET);
|
|
|
|
for (i = 0; i < 10; i++) {
|
1999-01-07 23:07:57 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 10);
|
1998-12-09 23:28:43 +00:00
|
|
|
if ((OREAD4(sc, port) & UPS_RESET) == 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
DPRINTFN(8,("ohci port %d reset, status = 0x%04x\n",
|
|
|
|
index, OREAD4(sc, port)));
|
|
|
|
break;
|
|
|
|
case UHF_PORT_POWER:
|
1999-01-07 23:07:57 +00:00
|
|
|
DPRINTFN(2,("ohci_root_ctrl_transfer: set port power "
|
|
|
|
"%d\n", index));
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, port, UPS_PORT_POWER);
|
|
|
|
break;
|
|
|
|
default:
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
1999-11-17 22:33:51 +00:00
|
|
|
err = USBD_IOERROR;
|
1998-12-09 23:28:43 +00:00
|
|
|
goto ret;
|
|
|
|
}
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->actlen = totlen;
|
|
|
|
err = USBD_NORMAL_COMPLETION;
|
1998-12-09 23:28:43 +00:00
|
|
|
ret:
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->status = err;
|
|
|
|
s = splusb();
|
|
|
|
usb_transfer_complete(xfer);
|
|
|
|
splx(s);
|
1998-12-09 23:28:43 +00:00
|
|
|
return (USBD_IN_PROGRESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Abort a root control request. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
|
|
|
ohci_root_ctrl_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
|
|
|
/* Nothing to do, all transfers are synchronous. */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Close the root pipe. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_ctrl_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
DPRINTF(("ohci_root_ctrl_close\n"));
|
1999-10-07 19:26:38 +00:00
|
|
|
/* Nothing to do. */
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_root_intr_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-01-07 23:07:57 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
|
|
|
|
|
|
|
/* Insert last in queue. */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Pipe isn't running, start first */
|
|
|
|
return (ohci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_root_intr_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_pipe_handle pipe = xfer->pipe;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
sc->sc_intrxfer = xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
return (USBD_IN_PROGRESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Abort a root interrupt request. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
|
|
|
ohci_root_intr_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
int s;
|
|
|
|
|
|
|
|
if (xfer->pipe->intrxfer == xfer) {
|
|
|
|
DPRINTF(("ohci_root_intr_abort: remove\n"));
|
|
|
|
xfer->pipe->intrxfer = NULL;
|
|
|
|
}
|
|
|
|
xfer->status = USBD_CANCELLED;
|
|
|
|
s = splusb();
|
|
|
|
usb_transfer_complete(xfer);
|
|
|
|
splx(s);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Close the root pipe. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_root_intr_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
|
|
|
|
DPRINTF(("ohci_root_intr_close\n"));
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
sc->sc_intrxfer = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************/
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_ctrl_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-01-07 23:07:57 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Insert last in queue. */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
/* Pipe isn't running, start first */
|
|
|
|
return (ohci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_ctrl_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)xfer->pipe->device->bus;
|
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (!(xfer->rqflags & URQ_REQUEST)) {
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX panic */
|
|
|
|
printf("ohci_device_ctrl_transfer: not a request\n");
|
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
err = ohci_device_request(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
if (sc->sc_bus.use_polling)
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_waitintr(sc, xfer);
|
1998-12-09 23:28:43 +00:00
|
|
|
return (USBD_IN_PROGRESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Abort a device control request. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
|
|
|
ohci_device_ctrl_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTF(("ohci_device_ctrl_abort: xfer=%p\n", xfer));
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer(xfer, USBD_CANCELLED);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Close a device control pipe. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_ctrl_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_ctrl_close: pipe=%p\n", pipe));
|
|
|
|
ohci_close_pipe(pipe, sc->sc_ctrl_head);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_free_std(sc, opipe->tail.td);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************/
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_device_clear_toggle(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
|
2000-01-29 14:18:31 +00:00
|
|
|
opipe->sed->ed.ed_headp &= LE(~OHCI_TOGGLECARRY);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_noop(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_bulk_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-01-07 23:07:57 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Insert last in queue. */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
/* Pipe isn't running, start first */
|
|
|
|
return (ohci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_bulk_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
1998-12-09 23:28:43 +00:00
|
|
|
usbd_device_handle dev = opipe->pipe.device;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)dev->bus;
|
|
|
|
int addr = dev->address;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *data, *tail, *tdp;
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_soft_ed_t *sed;
|
1999-10-07 19:26:38 +00:00
|
|
|
int s, len, isread, endpt;
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->rqflags & URQ_REQUEST) {
|
1998-12-09 23:28:43 +00:00
|
|
|
/* XXX panic */
|
1999-10-07 19:26:38 +00:00
|
|
|
printf("ohci_device_bulk_start: a request\n");
|
1998-12-09 23:28:43 +00:00
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
len = xfer->length;
|
|
|
|
endpt = xfer->pipe->endpoint->edesc->bEndpointAddress;
|
1999-10-07 19:26:38 +00:00
|
|
|
isread = UE_GET_DIR(endpt) == UE_DIR_IN;
|
1998-12-09 23:28:43 +00:00
|
|
|
sed = opipe->sed;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTFN(4,("ohci_device_bulk_start: xfer=%p len=%d isread=%d "
|
|
|
|
"flags=%d endpt=%d\n", xfer, len, isread, xfer->flags,
|
1999-10-07 19:26:38 +00:00
|
|
|
endpt));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
opipe->u.bulk.isread = isread;
|
|
|
|
opipe->u.bulk.length = len;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/* Update device address */
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags = LE(
|
|
|
|
(LE(sed->ed.ed_flags) & ~OHCI_ED_ADDRMASK) |
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_ED_SET_FA(addr));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Allocate a chain of new TDs (including a new tail). */
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
data = opipe->tail.td;
|
|
|
|
err = ohci_alloc_std_chain(opipe, sc, len, isread, xfer->flags,
|
1999-11-17 22:33:51 +00:00
|
|
|
&xfer->dmabuf, data, &tail);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
tail->xfer = NULL;
|
|
|
|
xfer->hcpriv = data;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTFN(4,("ohci_device_bulk_start: ed_flags=0x%08x td_flags=0x%08x "
|
|
|
|
"td_cbp=0x%08x td_be=0x%08x\n",
|
1999-11-17 22:33:51 +00:00
|
|
|
(int)LE(sed->ed.ed_flags), (int)LE(data->td.td_flags),
|
|
|
|
(int)LE(data->td.td_cbp), (int)LE(data->td.td_be)));
|
1999-10-07 19:26:38 +00:00
|
|
|
|
|
|
|
#ifdef OHCI_DEBUG
|
|
|
|
if (ohcidebug > 4) {
|
|
|
|
ohci_dump_ed(sed);
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_dump_tds(data);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
/* Insert ED in schedule */
|
|
|
|
s = splusb();
|
1999-11-17 22:33:51 +00:00
|
|
|
for (tdp = data; tdp != tail; tdp = tdp->nexttd) {
|
|
|
|
tdp->xfer = xfer;
|
|
|
|
ohci_hash_add_td(sc, tdp);
|
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_tailp = LE(tail->physaddr);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
opipe->tail.td = tail;
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags &= LE(~OHCI_ED_SKIP);
|
1998-12-09 23:28:43 +00:00
|
|
|
OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->timeout && !sc->sc_bus.use_polling) {
|
|
|
|
usb_timeout(ohci_timeout, xfer,
|
|
|
|
MS_TO_TICKS(xfer->timeout), xfer->timo_handle);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
1999-10-07 19:26:38 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
#if 0
|
|
|
|
/* This goes wrong if we are too slow. */
|
1999-10-07 19:26:38 +00:00
|
|
|
if (ohcidebug > 5) {
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 5);
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_intr_transfer: status=%x\n",
|
|
|
|
OREAD4(sc, OHCI_COMMAND_STATUS)));
|
|
|
|
ohci_dump_ed(sed);
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_dump_tds(data);
|
1999-10-07 19:26:38 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-12-09 23:28:43 +00:00
|
|
|
splx(s);
|
|
|
|
|
|
|
|
return (USBD_IN_PROGRESS);
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
|
|
|
ohci_device_bulk_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTF(("ohci_device_bulk_abort: xfer=%p\n", xfer));
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer(xfer, USBD_CANCELLED);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
/*
|
|
|
|
* Close a device bulk pipe.
|
|
|
|
*/
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_bulk_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
1999-10-07 19:26:38 +00:00
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_bulk_close: pipe=%p\n", pipe));
|
|
|
|
ohci_close_pipe(pipe, sc->sc_bulk_head);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_free_std(sc, opipe->tail.td);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/************************/
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_intr_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1999-01-07 23:07:57 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
usbd_status err;
|
1999-01-07 23:07:57 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
/* Insert last in queue. */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
if (err)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
/* Pipe isn't running, start first */
|
|
|
|
return (ohci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
|
1999-01-07 23:07:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
|
|
|
ohci_device_intr_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
1998-12-09 23:28:43 +00:00
|
|
|
usbd_device_handle dev = opipe->pipe.device;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)dev->bus;
|
|
|
|
ohci_soft_ed_t *sed = opipe->sed;
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_soft_td_t *data, *tail;
|
1998-12-09 23:28:43 +00:00
|
|
|
int len;
|
|
|
|
int s;
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
DPRINTFN(3, ("ohci_device_intr_transfer: xfer=%p len=%d "
|
1999-01-07 23:07:57 +00:00
|
|
|
"flags=%d priv=%p\n",
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer, xfer->length, xfer->flags, xfer->priv));
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-10-07 19:26:38 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->rqflags & URQ_REQUEST)
|
1998-12-09 23:28:43 +00:00
|
|
|
panic("ohci_device_intr_transfer: a request\n");
|
1999-10-07 19:26:38 +00:00
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
len = xfer->length;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
data = opipe->tail.td;
|
1998-12-09 23:28:43 +00:00
|
|
|
tail = ohci_alloc_std(sc);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (tail == NULL)
|
1999-10-07 19:26:38 +00:00
|
|
|
return (USBD_NOMEM);
|
1999-11-17 22:33:51 +00:00
|
|
|
tail->xfer = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
data->td.td_flags = LE(
|
1999-01-07 23:07:57 +00:00
|
|
|
OHCI_TD_IN | OHCI_TD_NOCC |
|
|
|
|
OHCI_TD_SET_DI(1) | OHCI_TD_TOGGLE_CARRY);
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->flags & USBD_SHORT_XFER_OK)
|
|
|
|
data->td.td_flags |= LE(OHCI_TD_R);
|
|
|
|
data->td.td_cbp = LE(DMAADDR(&xfer->dmabuf));
|
|
|
|
data->nexttd = tail;
|
|
|
|
data->td.td_nexttd = LE(tail->physaddr);
|
|
|
|
data->td.td_be = LE(LE(data->td.td_cbp) + len - 1);
|
|
|
|
data->len = len;
|
|
|
|
data->xfer = xfer;
|
|
|
|
data->flags = OHCI_CALL_DONE | OHCI_ADD_LEN;
|
|
|
|
xfer->hcpriv = data;
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-05-03 23:11:41 +00:00
|
|
|
#ifdef OHCI_DEBUG
|
1998-12-09 23:28:43 +00:00
|
|
|
if (ohcidebug > 5) {
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_intr_transfer:\n"));
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_dump_ed(sed);
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_dump_tds(data);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Insert ED in schedule */
|
|
|
|
s = splusb();
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_hash_add_td(sc, data);
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_tailp = LE(tail->physaddr);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
opipe->tail.td = tail;
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags &= LE(~OHCI_ED_SKIP);
|
1998-12-09 23:28:43 +00:00
|
|
|
|
1999-05-03 23:11:41 +00:00
|
|
|
#if 0
|
1999-11-17 22:33:51 +00:00
|
|
|
/*
|
|
|
|
* This goes horribly wrong, printing thousands of descriptors,
|
|
|
|
* because false references are followed due to the fact that the
|
|
|
|
* TD is gone.
|
|
|
|
*/
|
1999-10-07 19:26:38 +00:00
|
|
|
if (ohcidebug > 5) {
|
1999-11-17 22:33:51 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 5);
|
1999-10-07 19:26:38 +00:00
|
|
|
DPRINTF(("ohci_device_intr_transfer: status=%x\n",
|
|
|
|
OREAD4(sc, OHCI_COMMAND_STATUS)));
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_dump_ed(sed);
|
1999-11-17 22:33:51 +00:00
|
|
|
ohci_dump_tds(data);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
#endif
|
1999-01-13 00:50:02 +00:00
|
|
|
splx(s);
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
return (USBD_IN_PROGRESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Abort a device control request. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
|
|
|
ohci_device_intr_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
1998-12-09 23:28:43 +00:00
|
|
|
{
|
1999-11-17 22:33:51 +00:00
|
|
|
if (xfer->pipe->intrxfer == xfer) {
|
1998-12-09 23:28:43 +00:00
|
|
|
DPRINTF(("ohci_device_intr_abort: remove\n"));
|
1999-11-17 22:33:51 +00:00
|
|
|
xfer->pipe->intrxfer = NULL;
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
1999-11-28 21:01:06 +00:00
|
|
|
ohci_abort_xfer(xfer, USBD_CANCELLED);
|
1998-12-09 23:28:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Close a device interrupt pipe. */
|
1999-11-17 22:33:51 +00:00
|
|
|
static void
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_intr_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
int nslots = opipe->u.intr.nslots;
|
|
|
|
int pos = opipe->u.intr.pos;
|
|
|
|
int j;
|
|
|
|
ohci_soft_ed_t *p, *sed = opipe->sed;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
DPRINTFN(1,("ohci_device_intr_close: pipe=%p nslots=%d pos=%d\n",
|
|
|
|
pipe, nslots, pos));
|
|
|
|
s = splusb();
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_flags |= LE(OHCI_ED_SKIP);
|
2000-01-29 11:59:31 +00:00
|
|
|
if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK))
|
|
|
|
!= (sed->ed.ed_headp & LE(OHCI_HEADMASK)))
|
1999-01-07 23:07:57 +00:00
|
|
|
usb_delay_ms(&sc->sc_bus, 2);
|
2000-01-27 23:25:58 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
2000-01-29 11:59:31 +00:00
|
|
|
if ((sed->ed.ed_tailp & LE(OHCI_TAILMASK))
|
|
|
|
!= (sed->ed.ed_headp & LE(OHCI_HEADMASK)))
|
2000-01-27 23:25:58 +00:00
|
|
|
panic("%s: Intr pipe %p still has TDs queued\n",
|
|
|
|
USBDEVNAME(sc->sc_bus.bdev), pipe);
|
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
|
|
|
|
for (p = sc->sc_eds[pos]; p && p->next != sed; p = p->next)
|
|
|
|
;
|
1999-11-17 22:33:51 +00:00
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
if (p == NULL)
|
1998-12-09 23:28:43 +00:00
|
|
|
panic("ohci_device_intr_close: ED not found\n");
|
1999-11-17 22:33:51 +00:00
|
|
|
#endif
|
1998-12-09 23:28:43 +00:00
|
|
|
p->next = sed->next;
|
1999-10-07 19:26:38 +00:00
|
|
|
p->ed.ed_nexted = sed->ed.ed_nexted;
|
1998-12-09 23:28:43 +00:00
|
|
|
splx(s);
|
|
|
|
|
|
|
|
for (j = 0; j < nslots; j++)
|
1999-10-07 19:26:38 +00:00
|
|
|
--sc->sc_bws[(pos * nslots + j) % OHCI_NO_INTRS];
|
1998-12-09 23:28:43 +00:00
|
|
|
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
ohci_free_std(sc, opipe->tail.td);
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_free_sed(sc, opipe->sed);
|
|
|
|
}
|
|
|
|
|
1999-11-17 22:33:51 +00:00
|
|
|
static usbd_status
|
1998-12-09 23:28:43 +00:00
|
|
|
ohci_device_setintr(sc, opipe, ival)
|
|
|
|
ohci_softc_t *sc;
|
|
|
|
struct ohci_pipe *opipe;
|
|
|
|
int ival;
|
|
|
|
{
|
|
|
|
int i, j, s, best;
|
|
|
|
u_int npoll, slow, shigh, nslots;
|
|
|
|
u_int bestbw, bw;
|
|
|
|
ohci_soft_ed_t *hsed, *sed = opipe->sed;
|
|
|
|
|
|
|
|
DPRINTFN(2, ("ohci_setintr: pipe=%p\n", opipe));
|
|
|
|
if (ival == 0) {
|
|
|
|
printf("ohci_setintr: 0 interval\n");
|
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
npoll = OHCI_NO_INTRS;
|
|
|
|
while (npoll > ival)
|
|
|
|
npoll /= 2;
|
|
|
|
DPRINTFN(2, ("ohci_setintr: ival=%d npoll=%d\n", ival, npoll));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We now know which level in the tree the ED must go into.
|
|
|
|
* Figure out which slot has most bandwidth left over.
|
|
|
|
* Slots to examine:
|
|
|
|
* npoll
|
|
|
|
* 1 0
|
|
|
|
* 2 1 2
|
|
|
|
* 4 3 4 5 6
|
|
|
|
* 8 7 8 9 10 11 12 13 14
|
|
|
|
* N (N-1) .. (N-1+N-1)
|
|
|
|
*/
|
|
|
|
slow = npoll-1;
|
|
|
|
shigh = slow + npoll;
|
|
|
|
nslots = OHCI_NO_INTRS / npoll;
|
|
|
|
for (best = i = slow, bestbw = ~0; i < shigh; i++) {
|
|
|
|
bw = 0;
|
|
|
|
for (j = 0; j < nslots; j++)
|
1999-10-07 19:26:38 +00:00
|
|
|
bw += sc->sc_bws[(i * nslots + j) % OHCI_NO_INTRS];
|
1998-12-09 23:28:43 +00:00
|
|
|
if (bw < bestbw) {
|
|
|
|
best = i;
|
|
|
|
bestbw = bw;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DPRINTFN(2, ("ohci_setintr: best=%d(%d..%d) bestbw=%d\n",
|
|
|
|
best, slow, shigh, bestbw));
|
|
|
|
|
|
|
|
s = splusb();
|
|
|
|
hsed = sc->sc_eds[best];
|
|
|
|
sed->next = hsed->next;
|
1999-10-07 19:26:38 +00:00
|
|
|
sed->ed.ed_nexted = hsed->ed.ed_nexted;
|
1998-12-09 23:28:43 +00:00
|
|
|
hsed->next = sed;
|
1999-10-07 19:26:38 +00:00
|
|
|
hsed->ed.ed_nexted = LE(sed->physaddr);
|
1998-12-09 23:28:43 +00:00
|
|
|
splx(s);
|
|
|
|
|
|
|
|
for (j = 0; j < nslots; j++)
|
1999-10-07 19:26:38 +00:00
|
|
|
++sc->sc_bws[(best * nslots + j) % OHCI_NO_INTRS];
|
1998-12-09 23:28:43 +00:00
|
|
|
opipe->u.intr.nslots = nslots;
|
|
|
|
opipe->u.intr.pos = best;
|
|
|
|
|
|
|
|
DPRINTFN(5, ("ohci_setintr: returns %p\n", opipe));
|
|
|
|
return (USBD_NORMAL_COMPLETION);
|
|
|
|
}
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
|
|
|
|
/***********************/
|
|
|
|
|
|
|
|
usbd_status
|
|
|
|
ohci_device_isoc_transfer(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
usbd_status err;
|
|
|
|
|
|
|
|
DPRINTFN(5,("ohci_device_isoc_transfer: xfer=%p\n", xfer));
|
|
|
|
|
|
|
|
/* Put it on our queue, */
|
|
|
|
err = usb_insert_transfer(xfer);
|
|
|
|
|
|
|
|
/* bail out on error, */
|
|
|
|
if (err && err != USBD_IN_PROGRESS)
|
|
|
|
return (err);
|
|
|
|
|
|
|
|
/* XXX should check inuse here */
|
|
|
|
|
|
|
|
/* insert into schedule, */
|
|
|
|
ohci_device_isoc_enter(xfer);
|
|
|
|
|
|
|
|
/* and put on interrupt list if the pipe wasn't running */
|
|
|
|
if (!err)
|
|
|
|
ohci_device_isoc_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
|
|
|
|
|
|
|
|
return (err);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_device_isoc_enter(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)xfer->pipe;
|
|
|
|
usbd_device_handle dev = opipe->pipe.device;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)dev->bus;
|
|
|
|
ohci_soft_ed_t *sed = opipe->sed;
|
|
|
|
struct iso *iso = &opipe->u.iso;
|
|
|
|
ohci_soft_itd_t *sitd, *nsitd;
|
|
|
|
ohci_physaddr_t buf, offs;
|
|
|
|
int i, ncur, nframes;
|
|
|
|
int ncross = 0;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
s = splusb();
|
|
|
|
sitd = opipe->tail.itd;
|
|
|
|
buf = DMAADDR(&xfer->dmabuf);
|
|
|
|
sitd->itd.itd_bp0 = LE(buf & OHCI_ITD_PAGE_MASK);
|
|
|
|
nframes = xfer->nframes;
|
|
|
|
offs = buf & OHCI_ITD_OFFSET_MASK;
|
|
|
|
for (i = ncur = 0; i < nframes; i++, ncur++) {
|
|
|
|
if (ncur == OHCI_ITD_NOFFSET || /* all offsets used */
|
|
|
|
ncross > 1) { /* too many page crossings */
|
|
|
|
|
|
|
|
nsitd = ohci_alloc_sitd(sc);
|
|
|
|
if (nsitd == NULL) {
|
|
|
|
/* XXX what now? */
|
2000-01-27 23:25:58 +00:00
|
|
|
splx(s);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
sitd->nextitd = nsitd;
|
|
|
|
sitd->itd.itd_nextitd = LE(nsitd->physaddr);
|
|
|
|
sitd->itd.itd_flags = LE(
|
|
|
|
OHCI_ITD_NOCC |
|
|
|
|
OHCI_ITD_SET_SF(iso->next) |
|
|
|
|
OHCI_ITD_NOINTR |
|
|
|
|
OHCI_ITD_SET_FC(OHCI_ITD_NOFFSET));
|
|
|
|
sitd->itd.itd_be = LE(LE(sitd->itd.itd_bp0) + offs - 1);
|
|
|
|
nsitd->itd.itd_bp0 = LE((buf + offs) & OHCI_ITD_PAGE_MASK);
|
|
|
|
sitd = nsitd;
|
|
|
|
iso->next = iso->next + ncur;
|
|
|
|
ncur = 0;
|
|
|
|
ncross = 0;
|
|
|
|
}
|
|
|
|
/* XXX byte order */
|
|
|
|
sitd->itd.itd_offset[i] =
|
|
|
|
offs | (ncross == 1 ? OHCI_ITD_PAGE_SELECT : 0);
|
|
|
|
offs += xfer->frlengths[i];
|
|
|
|
/* XXX update ncross */
|
|
|
|
}
|
|
|
|
nsitd = ohci_alloc_sitd(sc);
|
|
|
|
if (nsitd == NULL) {
|
|
|
|
/* XXX what now? */
|
2000-01-27 23:25:58 +00:00
|
|
|
splx(s);
|
More USB ethernet tweaks:
- Sync ohci, uhci and usbdi modules with NetBSD in order to obtain the
following improvements:
o New USBD_NO_TSLEEP flag can be used in place of UQ_NO_TSLEEP
quirk. This allows drivers to specify busy waiting only for
certain transfers (namely control transfers for reading/writing
registers and stuff).
o New USBD_FORCE_SHORT_XFER flag can be used to deal with
devices like the ADMtek Pegasus that sense the end of bulk OUT
transfers in a special way (if a transfer is exactly a multiple
of 64 bytes in size, you need to send an extra empty packet
to terminate the transfer).
o usbd_open_pipe_intr() now accepts an interval argument which
can be used to change the rate at which the interrupt callback
routine is invoked. Specifying USBD_DEFAULT_INTERVAL uses the
value specified in the device's config data, but drivers can
override it if needed.
- Change if_aue to use USBD_FORCE_SHORT_XFER for packet transmissions.
- Change if_aue, if_kue and if_cue to use USBD_NO_TSLEEP for all
control transfers. We no longer force the non-tsleep hack for
bulk transfers since these are done asynchronously anyway.
- Removed quirk entry fiddling from if_aue and if_kue since we don't
need it anymore now that we have the USBD_NO_TSLEEP flag.
- Tweak ulpt, uhid, ums and ukbd drivers to use the new arg to
usbd_open_pipe_intr().
- Add a flag to the softc struct in the ethernet drivers to indicate
when a device has been detached, and use this flag to perform
tests to prevent the drivers from trying to do control transfers
if this is the case. This is necessary because calling if_detach()
with INET6 enabled will eventually result in a call to the driver's
ioctl() routine to delete the multicast groups on the interface,
which will result in attempts to perform control transfers. (It's
possible this also happens even without INET6 support enabled.) This
is pointless since we know that if the detach method has been called,
the hardware has been unplugged.
- Changed watchdog timeout routines to just call the driver init routines
to initialize the device states without trying to close and re-open the
pipes. This is partly because we don't want to frob things at interrupt
context, but also because this doesn't seem to work right and I don't
want to panic the system just because a USB device may have stopped
responding.
- Fix aue_rxeof() to be a little smarter about detecting when a double
transfer is needed. Unfortunately, the design of the chip makes it hard
to get this exactly right. Hopefully, this will go away once either
Nick or Lennart finds the bug in the uhci driver that makes this ugly
hack necessary.
- Also sync usbdevs with NetBSD.
2000-01-20 07:38:33 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
sitd->nextitd = nsitd;
|
|
|
|
sitd->itd.itd_nextitd = LE(nsitd->physaddr);
|
|
|
|
sitd->itd.itd_flags = LE(
|
|
|
|
OHCI_ITD_NOCC |
|
|
|
|
OHCI_ITD_SET_SF(iso->next) |
|
|
|
|
OHCI_ITD_SET_DI(0) |
|
|
|
|
OHCI_ITD_SET_FC(ncur));
|
|
|
|
sitd->itd.itd_be = LE(LE(sitd->itd.itd_bp0) + offs - 1);
|
|
|
|
iso->next = iso->next + ncur;
|
|
|
|
|
|
|
|
opipe->tail.itd = nsitd;
|
|
|
|
sed->ed.ed_tailp = LE(nsitd->physaddr);
|
|
|
|
/* XXX update ED */
|
|
|
|
splx(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
usbd_status
|
|
|
|
ohci_device_isoc_start(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
printf("ohci_device_isoc_start: not implemented\n");
|
|
|
|
return (USBD_INVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_device_isoc_abort(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_device_isoc_done(xfer)
|
|
|
|
usbd_xfer_handle xfer;
|
|
|
|
{
|
|
|
|
printf("ohci_device_isoc_done: not implemented\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
usbd_status
|
|
|
|
ohci_setup_isoc(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
struct iso *iso = &opipe->u.iso;
|
|
|
|
|
|
|
|
iso->next = -1;
|
|
|
|
iso->inuse = 0;
|
|
|
|
|
|
|
|
return (USBD_NORMAL_COMPLETION);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
ohci_device_isoc_close(pipe)
|
|
|
|
usbd_pipe_handle pipe;
|
|
|
|
{
|
|
|
|
struct ohci_pipe *opipe = (struct ohci_pipe *)pipe;
|
|
|
|
ohci_softc_t *sc = (ohci_softc_t *)pipe->device->bus;
|
|
|
|
|
|
|
|
DPRINTF(("ohci_device_isoc_close: pipe=%p\n", pipe));
|
|
|
|
ohci_close_pipe(pipe, sc->sc_isoc_head);
|
|
|
|
ohci_free_sitd(sc, opipe->tail.itd);
|
|
|
|
}
|