mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Diff reduction to NetBSD

Browse Source 
Trying to figure out why this only works with SOME EHCI  controllers.

Obtained from:	NetBSD
MFC after:	1 week
This commit is contained in:
Julian Elischer 2004-03-19 07:14:23 +00:00
parent eeb3a05f9a
commit bb841defc0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127194
2 changed files with 57 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
sys/dev/usb/ehci.c
View File

@ -2,6 +2,7 @@
/* Also ported from NetBSD:
* $NetBSD: ehci.c,v 1.50 2003/10/18 04:50:35 simonb Exp $
* $NetBSD: ehci.c,v 1.54 2004/01/17 13:15:05 jdolecek Exp $
*/
/*
@ -58,6 +59,28 @@ __FBSDID("$FreeBSD$");
*
*/
/*
* TODO:
* 1) hold off explorations by companion controllers until ehci has started.
*
* 2) The EHCI driver lacks support for interrupt isochronous transfers, so
* devices using them don't work.
* Interrupt transfers are not difficult, it's just not done.
*
* 3) There might also be some issues with the data toggle, it was not
* completely tested to work properly under all condistions. If wrong
* toggle would be sent/recvd, bulk data transfers would stop working.
*
* 4) The meaty part to implement is the support for USB 2.0 hubs.
* They are quite compolicated since the need to be able to do
* "transaction translation", i.e., converting to/from USB 2 and USB 1.
* So the hub driver needs to handle and schedule these things, to
* assign place in frame where different devices get to go. See chapter
* on hubs in USB 2.0 for details.
*
* 5) command failures are not recovered correctly
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@ -99,6 +122,7 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef USB_DEBUG
#define EHCI_DEBUG USB_DEBUG
#define DPRINTF(x) if (ehcidebug) logprintf x
#define DPRINTFN(n,x) if (ehcidebug>(n)) logprintf x
int ehcidebug = 0;
@ -226,7 +250,7 @@ Static void ehci_sync_hc(ehci_softc_t *);
Static void ehci_close_pipe(usbd_pipe_handle, ehci_soft_qh_t *);
Static void ehci_abort_xfer(usbd_xfer_handle, usbd_status);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
Static void ehci_dump_regs(ehci_softc_t *);
void ehci_dump(void);
Static ehci_softc_t *theehci;
@ -326,7 +350,7 @@ ehci_init(ehci_softc_t *sc)
ehci_soft_qh_t *sqh;
DPRINTF(("ehci_init: start\n"));
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
theehci = sc;
#endif
@ -424,7 +448,7 @@ ehci_init(ehci_softc_t *sc)
sqh->qh.qh_qtd.qtd_altnext = EHCI_NULL;
sqh->qh.qh_qtd.qtd_status = htole32(EHCI_QTD_HALTED);
sqh->sqtd = NULL;
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug) {
ehci_dump_sqh(sqh);
}
@ -617,7 +641,7 @@ void
ehci_softintr(void *v)
{
ehci_softc_t *sc = v;
struct ehci_xfer *ex;
struct ehci_xfer *ex, *nextex;
DPRINTFN(10,("%s: ehci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
sc->sc_bus.intr_context));
@ -630,8 +654,10 @@ ehci_softintr(void *v)
* An interrupt just tells us that something is done, we have no
* clue what, so we need to scan through all active transfers. :-(
*/
for (ex = LIST_FIRST(&sc->sc_intrhead); ex; ex = LIST_NEXT(ex, inext))
for (ex = LIST_FIRST(&sc->sc_intrhead); ex; ex = nextex) {
nextex = LIST_NEXT(ex, inext);
ehci_check_intr(sc, ex);
}
#ifdef USB_USE_SOFTINTR
if (sc->sc_softwake) {
@ -696,7 +722,7 @@ void
ehci_idone(struct ehci_xfer *ex)
{
usbd_xfer_handle xfer = &ex->xfer;
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
struct ehci_pipe *epipe = (struct ehci_pipe *)xfer->pipe;
#endif
ehci_soft_qtd_t *sqtd;
@ -709,7 +735,7 @@ ehci_idone(struct ehci_xfer *ex)
int s = splhigh();
if (ex->isdone) {
splx(s);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
printf("ehci_idone: ex is done!\n ");
ehci_dump_exfer(ex);
#else
@ -728,7 +754,7 @@ ehci_idone(struct ehci_xfer *ex)
return;
}
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
DPRINTFN(/*10*/2, ("ehci_idone: xfer=%p, pipe=%p ready\n", xfer, epipe));
if (ehcidebug > 10)
ehci_dump_sqtds(ex->sqtdstart);
@ -742,6 +768,10 @@ ehci_idone(struct ehci_xfer *ex)
break;
status = nstatus;
/* halt is ok if descriptor is last, and complete */
if (sqtd->qtd.qtd_next == EHCI_NULL &&
EHCI_QTD_GET_BYTES(status) == 0)
status &= ~EHCI_QTD_HALTED;
if (EHCI_QTD_GET_PID(status) != EHCI_QTD_PID_SETUP)
actlen += sqtd->len - EHCI_QTD_GET_BYTES(status);
}
@ -760,7 +790,7 @@ ehci_idone(struct ehci_xfer *ex)
xfer->length, actlen, status));
xfer->actlen = actlen;
if (status != 0) {
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
char sbuf[128];
bitmask_snprintf((u_int32_t)status,
@ -811,7 +841,7 @@ ehci_waitintr(ehci_softc_t *sc, usbd_xfer_handle xfer)
intrs = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS)) &
sc->sc_eintrs;
DPRINTFN(15,("ehci_waitintr: 0x%04x\n", intrs));
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 15)
ehci_dump_regs(sc);
#endif
@ -833,7 +863,7 @@ void
ehci_poll(struct usbd_bus *bus)
{
ehci_softc_t *sc = (ehci_softc_t *)bus;
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
static int last;
int new;
new = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
@ -910,7 +940,7 @@ ehci_power(int why, void *v)
//u_int32_t ctl;
int s;
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
DPRINTF(("ehci_power: sc=%p, why=%d\n", sc, why));
ehci_dump_regs(sc);
#endif
@ -992,7 +1022,7 @@ ehci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size)
usbd_status err;
err = usb_allocmem(bus, size, 0, dma);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (err)
printf("ehci_allocm: usb_allocmem()=%d\n", err);
#endif
@ -1072,7 +1102,7 @@ ehci_noop(usbd_pipe_handle pipe)
{
}
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
void
ehci_dump_regs(ehci_softc_t *sc)
{
@ -1276,7 +1306,7 @@ ehci_open(usbd_pipe_handle pipe)
case UE_CONTROL:
err = usb_allocmem(&sc->sc_bus, sizeof(usb_device_request_t),
0, &epipe->u.ctl.reqdma);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (err)
printf("ehci_open: usb_allocmem()=%d\n", err);
#endif
@ -1323,7 +1353,7 @@ ehci_add_qh(ehci_soft_qh_t *sqh, ehci_soft_qh_t *head)
head->next = sqh;
head->qh.qh_link = htole32(sqh->physaddr | EHCI_LINK_QH);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 5) {
printf("ehci_add_qh:\n");
ehci_dump_sqh(sqh);
@ -1739,7 +1769,7 @@ ehci_root_ctrl_start(usbd_xfer_handle xfer)
#endif
break;
case C(UR_GET_DESCRIPTOR, UT_READ_CLASS_DEVICE):
if (value != 0) {
if ((value & 0xff) != 0) {
err = USBD_IOERROR;
goto ret;
}
@ -2020,7 +2050,7 @@ ehci_alloc_sqh(ehci_softc_t *sc)
DPRINTFN(2, ("ehci_alloc_sqh: allocating chunk\n"));
err = usb_allocmem(&sc->sc_bus, EHCI_SQH_SIZE * EHCI_SQH_CHUNK,
EHCI_PAGE_SIZE, &dma);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (err)
printf("ehci_alloc_sqh: usb_allocmem()=%d\n", err);
#endif
@ -2061,7 +2091,7 @@ ehci_alloc_sqtd(ehci_softc_t *sc)
DPRINTFN(2, ("ehci_alloc_sqtd: allocating chunk\n"));
err = usb_allocmem(&sc->sc_bus, EHCI_SQTD_SIZE*EHCI_SQTD_CHUNK,
EHCI_PAGE_SIZE, &dma);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (err)
printf("ehci_alloc_sqtd: usb_allocmem()=%d\n", err);
#endif
@ -2202,6 +2232,7 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *epipe, ehci_softc_t *sc,
if (i != 0) /* use offset only in first buffer */
a = EHCI_PAGE(a);
cur->qtd.qtd_buffer[i] = htole32(a);
cur->qtd.qtd_buffer_hi[i] = 0;
#ifdef DIAGNOSTIC
if (i >= EHCI_QTD_NBUFFERS) {
printf("ehci_alloc_sqtd_chain: i=%d\n", i);
@ -2587,6 +2618,7 @@ ehci_device_request(usbd_xfer_handle xfer)
EHCI_QTD_SET_BYTES(sizeof *req)
);
setup->qtd.qtd_buffer[0] = htole32(DMAADDR(&epipe->u.ctl.reqdma, 0));
setup->qtd.qtd_buffer_hi[0] = 0;
setup->nextqtd = next;
setup->qtd.qtd_next = setup->qtd.qtd_altnext = htole32(next->physaddr);
setup->xfer = xfer;
@ -2599,12 +2631,13 @@ ehci_device_request(usbd_xfer_handle xfer)
EHCI_QTD_IOC
);
stat->qtd.qtd_buffer[0] = 0; /* XXX not needed? */
stat->qtd.qtd_buffer_hi[0] = 0; /* XXX not needed? */
stat->nextqtd = NULL;
stat->qtd.qtd_next = stat->qtd.qtd_altnext = EHCI_NULL;
stat->xfer = xfer;
stat->len = 0;
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 5) {
DPRINTF(("ehci_device_request:\n"));
ehci_dump_sqh(sqh);
@ -2632,7 +2665,7 @@ ehci_device_request(usbd_xfer_handle xfer)
xfer->status = USBD_IN_PROGRESS;
splx(s);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 10) {
DPRINTF(("ehci_device_request: status=%x\n",
EOREAD4(sc, EHCI_USBSTS)));
@ -2714,7 +2747,7 @@ ehci_device_bulk_start(usbd_xfer_handle xfer)
return (err);
}
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 5) {
DPRINTF(("ehci_device_bulk_transfer: data(1)\n"));
ehci_dump_sqh(sqh);
@ -2742,7 +2775,7 @@ ehci_device_bulk_start(usbd_xfer_handle xfer)
xfer->status = USBD_IN_PROGRESS;
splx(s);
#ifdef USB_DEBUG
#ifdef EHCI_DEBUG
if (ehcidebug > 10) {
DPRINTF(("ehci_device_bulk_transfer: data(2)\n"));
delay(10000);

1
sys/dev/usb/ehcireg.h
View File

@ -235,6 +235,7 @@ typedef struct {
#define EHCI_QTD_GET_TOGGLE(x) (((x) >> 31) & 0x1)
#define EHCI_QTD_TOGGLE 0x80000000
ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
} ehci_qtd_t;
#define EHCI_QTD_ALIGN 32