diff options
| author | Nico Huber <nico.huber@secunet.com> | 2012-05-23 09:21:54 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-06-07 23:14:18 +0200 |
| commit | 1ab6075320f5dc10afd934b100c8116a88ac12fc (patch) | |
| tree | 688f9e3017a913aa7cb9c14faf46373dcc938a4a /payloads/libpayload/drivers/usb/ehci.c | |
| parent | d5d024f3e5f0eb88e459b3a449337c3cd2a49104 (diff) | |
| download | coreboot-1ab6075320f5dc10afd934b100c8116a88ac12fc.tar.xz | |
libpayload: Add support for split transactions in EHCI
With split transactions, the EHCI host controller can handle full- and
low-speed devices on hubs in high-speed mode. This adds support for split
transactions for control and bulk transfers.
Change-Id: I30fa1ce25757f33b1e6ed34207949c9255f05d49
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/1081
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'payloads/libpayload/drivers/usb/ehci.c')
| -rw-r--r-- | payloads/libpayload/drivers/usb/ehci.c | 49 |
1 files changed, 46 insertions, 3 deletions
diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index 9500059590..c8f469e606 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -61,6 +61,30 @@ static void ehci_shutdown (hci_t *controller) enum { EHCI_OUT=0, EHCI_IN=1, EHCI_SETUP=2 }; +/* + * returns the address of the closest USB2.0 hub, which is responsible for + * split transactions, along with the number of the used downstream port + */ +static int closest_usb2_hub(const usbdev_t *dev, int *const addr, int *const port) +{ + const usbdev_t *usb1dev; + do { + usb1dev = dev; + if ((dev->hub > 0) && (dev->hub < 128)) + dev = dev->controller->devices[dev->hub]; + else + dev = NULL; + } while (dev && (dev->speed < 2)); + if (dev) { + *addr = usb1dev->hub; + *port = usb1dev->port; + return 0; + } else { + debug("ehci: Couldn't find closest USB2.0 hub.\n"); + return 1; + } +} + /* returns handled bytes. assumes that the fields it writes are empty on entry */ static int fill_td(qtd_t *td, void* data, int datalen) { @@ -140,6 +164,13 @@ static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) int endp = ep->endpoint & 0xf; int pid = (ep->direction==IN)?EHCI_IN:EHCI_OUT; + int hubaddr = 0, hubport = 0; + if (ep->dev->speed < 2) { + /* we need a split transaction */ + if (closest_usb2_hub(ep->dev, &hubaddr, &hubport)) + return 1; + } + qtd_t *head = memalign(32, sizeof(qtd_t)); qtd_t *cur = head; while (1) { @@ -173,7 +204,9 @@ static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) (1 << QH_RECLAIM_HEAD_SHIFT) | (ep->maxpacketsize << QH_MPS_SHIFT) | (0 << QH_NAK_CNT_SHIFT); - qh->epcaps = 3 << QH_PIPE_MULTIPLIER_SHIFT; + qh->epcaps = (3 << QH_PIPE_MULTIPLIER_SHIFT) | + (hubport << QH_PORT_NUMBER_SHIFT) | + (hubaddr << QH_HUB_ADDRESS_SHIFT); qh->td.next_qtd = virt_to_phys(head); qh->td.token |= (ep->toggle?QTD_TOGGLE_DATA1:0); @@ -209,6 +242,14 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq int mlen = dev->endpoints[0].maxpacketsize; int result = 0; + int hubaddr = 0, hubport = 0, non_hs_ctrl_ep = 0; + if (dev->speed < 2) { + /* we need a split transaction */ + if (closest_usb2_hub(dev, &hubaddr, &hubport)) + return 1; + non_hs_ctrl_ep = 1; + } + /* create qTDs */ qtd_t *head = memalign(32, sizeof(qtd_t)); qtd_t *cur = head; @@ -263,9 +304,11 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq (1 << QH_DTC_SHIFT) | /* ctrl transfers are special: take toggle bit from TD */ (1 << QH_RECLAIM_HEAD_SHIFT) | (mlen << QH_MPS_SHIFT) | - (0 << QH_NON_HS_CTRL_EP_SHIFT) | /* no non-HS device support yet */ + (non_hs_ctrl_ep << QH_NON_HS_CTRL_EP_SHIFT) | (0 << QH_NAK_CNT_SHIFT); - qh->epcaps = 3 << QH_PIPE_MULTIPLIER_SHIFT; + qh->epcaps = (3 << QH_PIPE_MULTIPLIER_SHIFT) | + (hubport << QH_PORT_NUMBER_SHIFT) | + (hubaddr << QH_HUB_ADDRESS_SHIFT); qh->td.next_qtd = virt_to_phys(head); /* hook up QH */ |