coreboot May 2012

coreboot@coreboot.org

31 participants
287 discussions

Patch merged into coreboot/master: 168e361 libpayload: Fix b0b4a52b70f0d7c09241f0f718a179fc55d85179
by gerrit＠coreboot.org 31 May '12

31 May '12

the following patch was just integrated into master: commit 168e3614167b42a356c476942170489d99bc59bf Author: Nico Huber <nico.huber(a)secunet.com> Date: Wed May 16 15:04:27 2012 +0200 libpayload: Fix b0b4a52b70f0d7c09241f0f718a179fc55d85179 The removal of bitfields came with some glitches in the UHCI driver. This fixes it. Change-Id: Iba8ea3b56b03c526eca7b6388c019568e00be6f5 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> Reviewed-By: Patrick Georgi <patrick(a)georgi-clan.de> at Thu May 31 18:42:40 2012, giving +2 See http://review.coreboot.org/1069 for details. -gerrit

1 0

Patch set updated for coreboot: a786a68 Improve parsing of --cpu parameter in abuild script.
by Raymond Danks 31 May '12

31 May '12

Raymond Danks (ray.danks(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1068 -gerrit commit a786a680476fd605f78b11ff60cd074d03f2b57f Author: Raymond Danks <ray.danks(a)se-eng.com> Date: Wed May 30 16:03:48 2012 -0600 Improve parsing of --cpu parameter in abuild script. * -c "" need never be tested if getopt params are handled; fail abuild script when getopt parsing fails * use expr to resolve numeric test fails with -c max * cpus variable may be being passed in the environment. Don't overwrite MAKEFLAGS if it is not. Change-Id: I96236ef719a1a9f942b8e15bfcf015d60068e58a Signed-off-by: Raymond Danks <ray.danks(a)se-eng.com> --- util/abuild/abuild | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/util/abuild/abuild b/util/abuild/abuild index 65d9cea..ecda5c3 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -527,7 +527,7 @@ cmdline="$* -c 1" getoptbrand="`getopt -V`" if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,help,all,target:,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache,blobs -o Vvhat:p:Tc:sJxCl:rP:uyB -- "$@"` + args=`getopt -l version,verbose,help,all,target:,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache,blobs -o Vvhat:p:Tc:sJxCl:rP:uyB -- "$@"` || exit 1 eval set -- $args else # Detected non-GNU getopt @@ -556,10 +556,9 @@ while true ; do -T|--test) shift; hwtest=true;; -c|--cpus) shift export MAKEFLAGS="-j $1" - test "$MAKEFLAGS" == "-j max" && export MAKEFLAGS="-j" - test "$1" == "" && cpuconfig="in parallel" + test "$MAKEFLAGS" == "-j max" && export MAKEFLAGS="-j" && cpuconfig="in parallel" test "$1" == "1" && cpuconfig="on 1 cpu" - test 0$1 -gt 1 && cpuconfig="on $1 cpus in parallel" + expr "$1" : '-\?[0-9]\+$' > /dev/null && test 0$1 -gt 1 && cpuconfig="on $1 cpus in parallel" shift;; -s|--silent) shift; silent="-s";; -ns|--nostackprotect) shift; stackprotect=true;; @@ -608,11 +607,12 @@ if [ "$cpus" != "1" ]; then if [ "$target" = "" ]; then # Test if xargs supports the non-standard -P flag # FIXME: disabled until we managed to eliminate all the make(1) quirks - echo | xargs -P 0$cpus -n 1 echo 2>/dev/null >/dev/null # && USE_XARGS=1 + echo | xargs -P 0$cpus -n 1 echo 2>/dev/null >/dev/null # && USE_XARGS=1 fi fi if [ "$USE_XARGS" = "0" ]; then +test "$MAKEFLAGS" == "" && test "$cpus" != "" && export MAKEFLAGS="-j $cpus" build_all_targets() { for VENDOR in $( vendors ); do

1 0

New patch to review for coreboot: b2718de Enable CONFIG_GFXUMA for roda/rk886ex
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1086 -gerrit commit b2718de7d2812aa391e6c845ef344ed8a35b8f3a Author: Nico Huber <nico.huber(a)secunet.com> Date: Wed May 30 14:50:53 2012 +0200 Enable CONFIG_GFXUMA for roda/rk886ex Without GFXUMA beeing set, MTRR initialization runs out of variable MTRRs. Change-Id: I5d1aa0d5fa2d72f17a0d88cae3fad880b489828c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- src/mainboard/roda/rk886ex/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 929e5e6..ee1dc59 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select BOARD_ROMSIZE_KB_1024 select CHANNEL_XOR_RANDOMIZATION + select GFXUMA config MAINBOARD_DIR string

1 0

New patch to review for coreboot: fe83010 libpayload: fix UHCI timeout
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1085 -gerrit commit fe83010951dbf184cb5665ed375851360073d02b Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue May 29 16:19:19 2012 +0200 libpayload: fix UHCI timeout UHCI commands should have a timeout of 30ms, not 30s! Change-Id: Iebcf338317164eb1e683e1de850ffab5022ca3a1 Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- payloads/libpayload/drivers/usb/uhci.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index 8e6c9ed..78f7aba 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -267,12 +267,12 @@ uhci_stop (hci_t *controller) static td_t * wait_for_completed_qh (hci_t *controller, qh_t *qh) { - int timeout = 1000000; /* max 30 ms. */ + int timeout = 1000; /* max 30 ms. */ void *current = GET_TD (qh->elementlinkptr); while (((qh->elementlinkptr & FLISTP_TERMINATE) == 0) && (timeout-- > 0)) { if (current != GET_TD (qh->elementlinkptr)) { current = GET_TD (qh->elementlinkptr); - timeout = 1000000; + timeout = 1000; } uhci_reg_write16(controller, USBSTS, uhci_reg_read16(controller, USBSTS) | 0); // clear resettable registers

1 0

New patch to review for coreboot: f1f1cbb libpayload: fix OHCI IN commands
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1084 -gerrit commit f1f1cbb111ff7a5b70d6a9baf1c75d28f70bffc1 Author: Mathias Krause <mathias.krause(a)secunet.com> Date: Tue May 29 14:28:26 2012 +0200 libpayload: fix OHCI IN commands Due to operator precedence incomming USB commands were missing some flags. Change-Id: I87ef51590c9db7a6cbc7304e1ccac29895f8a51e Signed-off-by: Mathias Krause <mathias.krause(a)secunet.com> --- payloads/libpayload/drivers/usb/ohci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index 730c540..4b3aa39 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -297,7 +297,7 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen while (pages > 0) { cur++; - cur->config = (dir==IN)?TD_DIRECTION_IN:TD_DIRECTION_OUT | + cur->config = (dir == IN ? TD_DIRECTION_IN : TD_DIRECTION_OUT) | TD_DELAY_INTERRUPT_NODELAY | TD_TOGGLE_FROM_ED | TD_CC_NOACCESS; @@ -324,7 +324,7 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen } cur++; - cur->config = (dir==IN)?TD_DIRECTION_OUT:TD_DIRECTION_IN | + cur->config = (dir == IN ? TD_DIRECTION_OUT : TD_DIRECTION_IN) | TD_DELAY_INTERRUPT_NODELAY | TD_TOGGLE_FROM_TD | TD_TOGGLE_DATA1 | @@ -392,7 +392,7 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize) } for (cur = tds; cur->next_td != 0; cur++) { - cur->config = (ep->direction==IN)?TD_DIRECTION_IN:TD_DIRECTION_OUT | + cur->config = (ep->direction == IN ? TD_DIRECTION_IN : TD_DIRECTION_OUT) | TD_DELAY_INTERRUPT_NODELAY | TD_TOGGLE_FROM_ED | TD_CC_NOACCESS;

1 0

New patch to review for coreboot: 291be8f libpayload: Add support for interrupt transfers in EHCI
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1083 -gerrit commit 291be8f0a7480943e53c60b44d139e21fc9147d1 Author: Nico Huber <nico.huber(a)secunet.com> Date: Fri May 25 10:09:13 2012 +0200 libpayload: Add support for interrupt transfers in EHCI This adds support for usb interrupt transfers in the EHCI driver. Split transactions are supported, so this enables support for HID keyboards devices over hubs in high-speed mode. Change-Id: I9eb08f12b12c67ece10814952cb8651278b02f9d Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ehci.c | 237 +++++++++++++++++++++++- payloads/libpayload/drivers/usb/ehci_private.h | 10 + 2 files changed, 242 insertions(+), 5 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index e1b28bc..1094c78 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -54,8 +54,35 @@ static void ehci_reset (hci_t *controller) } +static int ehci_set_periodic_schedule(ehci_t *ehcic, int enable) +{ + /* Set periodic schedule status. */ + if (enable) + ehcic->operation->usbcmd |= HC_OP_PERIODIC_SCHED_EN; + else + ehcic->operation->usbcmd &= ~HC_OP_PERIODIC_SCHED_EN; + /* Wait for the controller to accept periodic schedule status. + * This shouldn't take too long, but we should timeout nevertheless. + */ + enable = enable ? HC_OP_PERIODIC_SCHED_STAT : 0; + int timeout = 100; /* time out after 100ms */ + while (((ehcic->operation->usbsts & HC_OP_PERIODIC_SCHED_STAT) != enable) + && timeout--) + mdelay(1); + if (timeout < 0) { + debug("ehci periodic schedule status change timed out.\n"); + return 1; + } + return 0; +} + static void ehci_shutdown (hci_t *controller) { + /* Make sure periodic schedule is disabled */ + ehci_set_periodic_schedule(EHCI_INST(controller), 0); + /* Free periodic frame list */ + free(phys_to_virt(EHCI_INST(controller)->operation->periodiclistbase)); + EHCI_INST(controller)->operation->configflag = 0; } @@ -366,18 +393,202 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq return result; } -static void* ehci_create_intr_queue (endpoint_t *ep, int reqsize, int reqcount, int reqtiming) + +typedef struct _intr_qtd_t intr_qtd_t; + +struct _intr_qtd_t { + volatile qtd_t td; + u8 *data; + intr_qtd_t *next; +}; + +typedef struct { + volatile ehci_qh_t qh; + intr_qtd_t *head; + intr_qtd_t *tail; + u8 *data; + endpoint_t *endp; + int reqsize; +} intr_queue_t; + +static void fill_intr_queue_td( + intr_queue_t *const intrq, + intr_qtd_t *const intr_qtd, + u8 *const data) { - return NULL; + const int pid = (intrq->endp->direction == IN) ? EHCI_IN + : (intrq->endp->direction == OUT) ? EHCI_OUT + : EHCI_SETUP; + const int cerr = (intrq->endp->dev->speed < 2) ? 1 : 0; + + memset(intr_qtd, 0, sizeof(*intr_qtd)); + intr_qtd->td.next_qtd = QTD_TERMINATE; + intr_qtd->td.alt_next_qtd = QTD_TERMINATE; + intr_qtd->td.token = QTD_ACTIVE | + (pid << QTD_PID_SHIFT) | + (cerr << QTD_CERR_SHIFT) | + ((intrq->endp->toggle & 1) << QTD_TOGGLE_SHIFT); + fill_td(&intr_qtd->td, data, intrq->reqsize); + intr_qtd->data = data; + intr_qtd->next = NULL; + + intrq->endp->toggle ^= 1; } -static void ehci_destroy_intr_queue (endpoint_t *ep, void *queue) +static void ehci_destroy_intr_queue(endpoint_t *const, void *const); + +static void *ehci_create_intr_queue( + endpoint_t *const ep, + const int reqsize, + int reqcount, + const int reqtiming) { + int i; + + if ((reqsize > (4 * 4096 + 1)) || /* the maximum for arbitrary aligned + data in five 4096 byte pages */ + (reqtiming > 1024)) + return NULL; + if (reqcount < 2) /* we need at least 2: + one for processing, one for the hc to advance to */ + reqcount = 2; + + int hubaddr = 0, hubport = 0; + if (ep->dev->speed < 2) { + /* we need a split transaction */ + if (closest_usb2_hub(ep->dev, &hubaddr, &hubport)) + return NULL; + } + + intr_queue_t *const intrq = + (intr_queue_t *)memalign(32, sizeof(intr_queue_t)); + u8 *data = (u8 *)malloc(reqsize * reqcount); + if (!intrq || !data) + fatal("Not enough memory to create USB interrupt queue.\n"); + intrq->data = data; + intrq->endp = ep; + intrq->reqsize = reqsize; + + /* create #reqcount transfer descriptors (qTDs) */ + intrq->head = (intr_qtd_t *)memalign(32, sizeof(intr_qtd_t)); + intr_qtd_t *cur_td = intrq->head; + for (i = 0; i < reqcount; ++i) { + fill_intr_queue_td(intrq, cur_td, data); + data += reqsize; + if (i < reqcount - 1) { + /* create one more qTD */ + intr_qtd_t *const next_td = + (intr_qtd_t *)memalign(32, sizeof(intr_qtd_t)); + cur_td->td.next_qtd = virt_to_phys(&next_td->td); + cur_td->next = next_td; + cur_td = next_td; + } + } + intrq->tail = cur_td; + + /* initialize QH */ + const int endp = ep->endpoint & 0xf; + memset(&intrq->qh, 0, sizeof(intrq->qh)); + intrq->qh.horiz_link_ptr = PS_TERMINATE; + intrq->qh.epchar = ep->dev->address | + (endp << QH_EP_SHIFT) | + (ep->dev->speed << QH_EPS_SHIFT) | + (1 << QH_DTC_SHIFT) | + (0 << QH_RECLAIM_HEAD_SHIFT) | + (ep->maxpacketsize << QH_MPS_SHIFT) | + (0 << QH_NAK_CNT_SHIFT); + intrq->qh.epcaps = (1 << QH_PIPE_MULTIPLIER_SHIFT) | + (hubport << QH_PORT_NUMBER_SHIFT) | + (hubaddr << QH_HUB_ADDRESS_SHIFT) | + (0xfe << QH_UFRAME_CMASK_SHIFT) | + 1 /* uFrame S-mask */; + intrq->qh.td.next_qtd = virt_to_phys(&intrq->head->td); + + /* insert QH into periodic schedule */ + int nothing_placed = 1; + u32 *const ps = (u32 *)phys_to_virt(EHCI_INST(ep->dev->controller) + ->operation->periodiclistbase); + for (i = 0; i < 1024; i += reqtiming) { + /* advance to the next free position */ + while ((i < 1024) && !(ps[i] & PS_TERMINATE)) ++i; + if (i < 1024) { + ps[i] = virt_to_phys(&intrq->qh) | PS_TYPE_QH; + nothing_placed = 0; + } + } + if (nothing_placed) { + printf("Error: Failed to place ehci interrupt queue head " + "into periodic schedule: no space left\n"); + ehci_destroy_intr_queue(ep, intrq); + return NULL; + } + + return intrq; +} + +static void ehci_destroy_intr_queue(endpoint_t *const ep, void *const queue) +{ + intr_queue_t *const intrq = (intr_queue_t *)queue; + + /* remove QH from periodic schedule */ + int i; + u32 *const ps = (u32 *)phys_to_virt(EHCI_INST( + ep->dev->controller)->operation->periodiclistbase); + for (i = 0; i < 1024; ++i) { + if ((ps[i] & PS_PTR_MASK) == virt_to_phys(&intrq->qh)) + ps[i] = PS_TERMINATE; + } + + /* wait 1ms for frame to end */ + mdelay(1); + + while (intrq->head) { + /* disable qTD and destroy list */ + intrq->head->td.next_qtd = QTD_TERMINATE; + intrq->head->td.token &= ~QTD_ACTIVE; + + /* save and advance head ptr */ + intr_qtd_t *const to_free = intrq->head; + intrq->head = intrq->head->next; + + /* free current interrupt qTD */ + free(to_free); + } + free(intrq->data); + free(intrq); } -static u8* ehci_poll_intr_queue (void *queue) +static u8 *ehci_poll_intr_queue(void *const queue) { - return NULL; + intr_queue_t *const intrq = (intr_queue_t *)queue; + + u8 *ret = NULL; + + /* process if head qTD is inactive AND QH has been moved forward */ + if (!(intrq->head->td.token & QTD_ACTIVE) && + (intrq->qh.current_td_ptr != + virt_to_phys(&intrq->head->td))) { + if (!(intrq->head->td.token & QTD_STATUS_MASK)) + ret = intrq->head->data; + else + debug("ehci_poll_intr_queue: transfer failed, " + "status == 0x%02x\n", + intrq->head->td.token & QTD_STATUS_MASK); + + /* save and advance our head ptr */ + intr_qtd_t *const new_td = intrq->head; + intrq->head = intrq->head->next; + + /* reuse executed qTD */ + fill_intr_queue_td(intrq, new_td, new_td->data); + + /* at last insert reused qTD at the + * end and advance our tail ptr */ + intrq->tail->td.next_qtd = virt_to_phys(&new_td->td); + intrq->tail->next = new_td; + intrq->tail = intrq->tail->next; + } + return ret; } hci_t * @@ -429,6 +640,22 @@ ehci_init (pcidev_t addr) /* take over all ports. USB1 should be blind now */ EHCI_INST(controller)->operation->configflag = 1; + /* Initialize periodic frame list */ + /* 1024 32-bit pointers, 4kb aligned */ + u32 *const periodic_list = (u32 *)memalign(4096, 1024 * sizeof(u32)); + if (!periodic_list) + fatal("Not enough memory creating EHCI periodic frame list.\n"); + for (i = 0; i < 1024; ++i) + periodic_list[i] = PS_TERMINATE; + + /* Make sure periodic schedule is disabled */ + ehci_set_periodic_schedule(EHCI_INST(controller), 0); + /* Set periodic frame list pointer */ + EHCI_INST(controller)->operation->periodiclistbase = + virt_to_phys(periodic_list); + /* Enable use of periodic schedule */ + ehci_set_periodic_schedule(EHCI_INST(controller), 1); + /* TODO lots of stuff missing */ controller->devices[0]->controller = controller; diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h index 29595f8..a97336b 100644 --- a/payloads/libpayload/drivers/usb/ehci_private.h +++ b/payloads/libpayload/drivers/usb/ehci_private.h @@ -61,9 +61,13 @@ typedef volatile struct { typedef volatile struct { u32 usbcmd; #define HC_OP_RS 1 +#define HC_OP_PERIODIC_SCHED_EN_SHIFT 4 +#define HC_OP_PERIODIC_SCHED_EN (1 << HC_OP_PERIODIC_SCHED_EN_SHIFT) #define HC_OP_ASYNC_SCHED_EN_SHIFT 5 #define HC_OP_ASYNC_SCHED_EN (1 << HC_OP_ASYNC_SCHED_EN_SHIFT) u32 usbsts; +#define HC_OP_PERIODIC_SCHED_STAT_SHIFT 14 +#define HC_OP_PERIODIC_SCHED_STAT (1 << HC_OP_PERIODIC_SCHED_STAT_SHIFT) #define HC_OP_ASYNC_SCHED_STAT_SHIFT 15 #define HC_OP_ASYNC_SCHED_STAT (1 << HC_OP_ASYNC_SCHED_STAT_SHIFT) u32 usbintr; @@ -78,6 +82,7 @@ typedef volatile struct { typedef volatile struct { #define QTD_TERMINATE 1 +#define QTD_PTR_MASK ~0x1f u32 next_qtd; u32 alt_next_qtd; u32 token; @@ -116,6 +121,7 @@ typedef volatile struct { #define QH_NON_HS_CTRL_EP_SHIFT 27 #define QH_NAK_CNT_SHIFT 28 u32 epcaps; +#define QH_UFRAME_CMASK_SHIFT 8 #define QH_HUB_ADDRESS_SHIFT 16 #define QH_PORT_NUMBER_SHIFT 23 #define QH_PIPE_MULTIPLIER_SHIFT 30 @@ -128,6 +134,10 @@ typedef struct ehci { hc_op_t *operation; } ehci_t; +#define PS_TERMINATE 1 +#define PS_TYPE_QH 1 << 1 +#define PS_PTR_MASK ~0x1f + #define EHCI_INST(controller) ((ehci_t*)((controller)->instance))

1 0

New patch to review for coreboot: bab3243 libpayload: Free intr queue structure in usb_hid_destroy
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1082 -gerrit commit bab32430f9e8c9588912ff41ce48ede6edd129b4 Author: Nico Huber <nico.huber(a)secunet.com> Date: Fri May 25 09:59:19 2012 +0200 libpayload: Free intr queue structure in usb_hid_destroy The call to destroy_intr_queue was missing in usb_hid_destroy. Change-Id: I51ccc6a79bc005819317263be24a56c51acd5f55 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usbhid.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index 840b298..d5141c6 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -42,12 +42,6 @@ enum { GET_REPORT = 0x1, GET_IDLE = 0x2, GET_PROTOCOL = 0x3, SET_REPORT = 0x9, SET_IDLE = 0xa, SET_PROTOCOL = 0xb }; -static void -usb_hid_destroy (usbdev_t *dev) -{ - free (dev->data); -} - typedef struct { void* queue; hid_descriptor_t *descriptor; @@ -55,6 +49,27 @@ typedef struct { #define HID_INST(dev) ((usbhid_inst_t*)(dev)->data) +static void +usb_hid_destroy (usbdev_t *dev) +{ + if (HID_INST(dev)->queue) { + int i; + for (i = 0; i <= dev->num_endp; i++) { + if (dev->endpoints[i].endpoint == 0) + continue; + if (dev->endpoints[i].type != INTERRUPT) + continue; + if (dev->endpoints[i].direction != IN) + continue; + break; + } + dev->controller->destroy_intr_queue( + &dev->endpoints[i], HID_INST(dev)->queue); + HID_INST(dev)->queue = NULL; + } + free (dev->data); +} + /* keybuffer is global to all USB keyboards */ static int keycount; #define KEYBOARD_BUFFER_SIZE 16

1 0

New patch to review for coreboot: 405fa26 libpayload: Add support for split transactions in EHCI
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1081 -gerrit commit 405fa269240133fc6fdbc8ee6976e923fc68642b Author: Nico Huber <nico.huber(a)secunet.com> Date: Wed May 23 09:21:54 2012 +0200 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(a)secunet.com> --- payloads/libpayload/drivers/usb/ehci.c | 49 ++++++++++++++++++++++- payloads/libpayload/drivers/usb/ehci_private.h | 2 + payloads/libpayload/drivers/usb/usb.c | 12 ++--- payloads/libpayload/include/usb/usb.h | 2 - 4 files changed, 53 insertions(+), 12 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index cd1e867..e1b28bc 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) { @@ -199,6 +223,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) { @@ -232,7 +263,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); @@ -257,6 +290,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; @@ -311,9 +352,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); result = ehci_process_async_schedule( diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h index 8ac15b3..29595f8 100644 --- a/payloads/libpayload/drivers/usb/ehci_private.h +++ b/payloads/libpayload/drivers/usb/ehci_private.h @@ -116,6 +116,8 @@ typedef volatile struct { #define QH_NON_HS_CTRL_EP_SHIFT 27 #define QH_NAK_CNT_SHIFT 28 u32 epcaps; +#define QH_HUB_ADDRESS_SHIFT 16 +#define QH_PORT_NUMBER_SHIFT 23 #define QH_PIPE_MULTIPLIER_SHIFT 30 volatile u32 current_td_ptr; volatile qtd_t td; diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 1e8f248..07735a2 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -245,8 +245,8 @@ get_free_address (hci_t *controller) return -1; // no free address } -int -set_address (hci_t *controller, int speed) +static int +set_address (hci_t *controller, int speed, int hubport, int hubaddr) { int adr = get_free_address (controller); // address to set dev_req_t dr; @@ -266,6 +266,8 @@ set_address (hci_t *controller, int speed) usbdev_t *dev = controller->devices[adr]; // dummy values for registering the address dev->address = 0; + dev->hub = hubaddr; + dev->port = hubport; dev->speed = speed; dev->endpoints[0].dev = dev; dev->endpoints[0].endpoint = 0; @@ -469,14 +471,10 @@ usb_attach_device(hci_t *controller, int hubaddress, int port, int speed) { static const char* speeds[] = { "full", "low", "high" }; debug ("%sspeed device\n", (speed <= 2) ? speeds[speed] : "invalid value - no"); - int newdev = set_address (controller, speed); + int newdev = set_address (controller, speed, port, hubaddress); if (newdev == -1) return -1; usbdev_t *newdev_t = controller->devices[newdev]; - - newdev_t->address = newdev; - newdev_t->hub = hubaddress; - newdev_t->port = port; // determine responsible driver - current done in set_address newdev_t->init (newdev_t); return newdev; diff --git a/payloads/libpayload/include/usb/usb.h b/payloads/libpayload/include/usb/usb.h index 05ced49..ee9c50b 100644 --- a/payloads/libpayload/include/usb/usb.h +++ b/payloads/libpayload/include/usb/usb.h @@ -223,8 +223,6 @@ void usb_hub_init (usbdev_t *dev); void usb_hid_init (usbdev_t *dev); void usb_msc_init (usbdev_t *dev); -int set_address (hci_t *controller, int speed); - u8 *get_descriptor (usbdev_t *dev, unsigned char bmRequestType, int descType, int descIdx, int langID);

1 0

New patch to review for coreboot: 677206d libpayload: Bring USB hub driver to a working state
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1080 -gerrit commit 677206d4a32112759afe93c36b9d4ed9931b0f2b Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 16:20:59 2012 +0200 libpayload: Bring USB hub driver to a working state This adds proper device attachment and detachment detection and port enable- ment to the USB hub driver. Support for split transactions is still missing, so this works only with USB2.0 devices on hubs in USB2.0 mode and USB1.1 devices on hubs in USB1.1 mode. Change-Id: I80bf03f3117116a60382b87a4f84366370649915 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usbhub.c | 76 +++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 21 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbhub.c b/payloads/libpayload/drivers/usb/usbhub.c index 08042a2..09ab9cc 100644 --- a/payloads/libpayload/drivers/usb/usbhub.c +++ b/payloads/libpayload/drivers/usb/usbhub.c @@ -31,8 +31,16 @@ // assume that host_to_device is overwritten if necessary #define DR_PORT gen_bmRequestType(host_to_device, class_type, other_recp) -#define PORT_RESET 0x4 -#define PORT_POWER 0x8 +/* status bits */ +#define PORT_CONNECTION 0x1 +#define PORT_ENABLE 0x2 +#define PORT_RESET 0x10 +/* status change bits */ +#define C_PORT_CONNECTION 0x1 +/* feature selectors (for setting / clearing features) */ +#define SEL_PORT_RESET 0x4 +#define SEL_PORT_POWER 0x8 +#define SEL_C_PORT_CONNECTION 0x10 typedef struct { int num_ports; @@ -53,28 +61,54 @@ usb_hub_destroy (usbdev_t *dev) static void usb_hub_scanport (usbdev_t *dev, int port) { - unsigned short buf[2]; + int timeout; + unsigned short buf[2]; get_status (dev, port, DR_PORT, 4, buf); - int portstatus = ((buf[0] & 1) == 0); - int datastatus = (HUB_INST (dev)->ports[port] == -1); - if (portstatus == datastatus) - return; // no change - FIXME: read right fields for that test - - if (!datastatus) { - int devno = HUB_INST (dev)->ports[port]; - if (devno == -1) - fatal ("FATAL: illegal devno!\n"); + if (!(buf[1] & C_PORT_CONNECTION)) + /* no change */ + return; + + /* clear Port Connection status change */ + clear_feature (dev, port, SEL_C_PORT_CONNECTION, DR_PORT); + + int devno = HUB_INST (dev)->ports[port]; + if (devno != -1) { + /* detach device, either because of re-/ or disconnect */ usb_detach_device(dev->controller, devno); HUB_INST (dev)->ports[port] = -1; - return; } - set_feature (dev, port, PORT_RESET, DR_PORT); - mdelay (20); + if (!(buf[0] & PORT_CONNECTION)) + /* no device connected, nothing to do */ + return; - get_status (dev, port, DR_PORT, 4, buf); + /* wait 100ms for port to become stable */ + mdelay (100); // usb20 spec 9.1.2 + /* reset port */ + set_feature (dev, port, SEL_PORT_RESET, DR_PORT); + /* wait at least 10ms (usb2.0 spec 11.5.1.5: 10ms to 20ms) */ + mdelay (10); + /* wait for hub to finish reset */ + timeout = 30; /* time out after 10ms (spec) + 20ms (kindly) */ + do { + get_status (dev, port, DR_PORT, 4, buf); + mdelay(1); timeout--; + } while ((buf[0] & PORT_RESET) && timeout); + if (!timeout) + debug("Warning: usbhub: port reset timed out.\n"); + + /* wait for port to be enabled. the hub is responsible for this */ + timeout = 500; /* time out after 500ms */ + do { + get_status (dev, port, DR_PORT, 4, buf); + mdelay(1); timeout--; + } while (!(buf[0] & PORT_ENABLE) && timeout); + if (!timeout) + debug("Warning: usbhub: port enabling timed out.\n"); + + get_status (dev, port, DR_PORT, 4, buf); /* bit 10 9 * 0 0 full speed * 0 1 low speed @@ -83,6 +117,9 @@ usb_hub_scanport (usbdev_t *dev, int port) int speed = ((buf[0] >> 9) & 3) ; HUB_INST (dev)->ports[port] = usb_attach_device(dev->controller, dev->address, port, speed); + + /* clear Port Connection status change */ + clear_feature (dev, port, SEL_C_PORT_CONNECTION, DR_PORT); } static int @@ -92,10 +129,7 @@ usb_hub_report_port_changes (usbdev_t *dev) unsigned short buf[2]; for (port = 1; port <= HUB_INST (dev)->num_ports; port++) { get_status (dev, port, DR_PORT, 4, buf); - // FIXME: proper change detection - int portstatus = ((buf[0] & 1) == 0); - int datastatus = (HUB_INST (dev)->ports[port] == -1); - if (portstatus != datastatus) + if (buf[1] & C_PORT_CONNECTION) return port; } @@ -106,7 +140,7 @@ usb_hub_report_port_changes (usbdev_t *dev) static void usb_hub_enable_port (usbdev_t *dev, int port) { - set_feature (dev, port, PORT_POWER, DR_PORT); + set_feature (dev, port, SEL_PORT_POWER, DR_PORT); mdelay (20); }

1 0

New patch to review for coreboot: aad56a1 libpayload: Add clear_feature() function to USB framework
by Nico Huber 31 May '12

31 May '12

Nico Huber (nico.huber(a)secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1079 -gerrit commit aad56a1666c97ec6c78e4e191b134c0ac4216361 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 16:19:05 2012 +0200 libpayload: Add clear_feature() function to USB framework This function will be used by the USB hub driver. Change-Id: I4d1d2e94f4442cbb636ae989e8ffd543181c4357 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usb.c | 25 ++++++++++++++++--------- payloads/libpayload/include/usb/usb.h | 1 + 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 1f21e6a..1e8f248 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -205,22 +205,29 @@ set_configuration (usbdev_t *dev) dev->controller->control (dev, OUT, sizeof (dr), &dr, 0, 0); } -int -clear_stall (endpoint_t *ep) +void +clear_feature (usbdev_t *dev, int endp, int feature, int rtype) { - usbdev_t *dev = ep->dev; - int endp = ep->endpoint; dev_req_t dr; - dr.bmRequestType = 0; - if (endp != 0) { - dr.req_recp = endp_recp; - } + dr.bmRequestType = rtype; + dr.data_dir = host_to_device; dr.bRequest = CLEAR_FEATURE; - dr.wValue = ENDPOINT_HALT; + dr.wValue = feature; dr.wIndex = endp; dr.wLength = 0; dev->controller->control (dev, OUT, sizeof (dr), &dr, 0, 0); +} + +int +clear_stall (endpoint_t *ep) +{ + usbdev_t *dev = ep->dev; + int endp = ep->endpoint; + int rtype = gen_bmRequestType (host_to_device, standard_type, + endp ? endp_recp : dev_recp); + + clear_feature (dev, endp, ENDPOINT_HALT, rtype); ep->toggle = 0; return 0; } diff --git a/payloads/libpayload/include/usb/usb.h b/payloads/libpayload/include/usb/usb.h index e38aa78..05ced49 100644 --- a/payloads/libpayload/include/usb/usb.h +++ b/payloads/libpayload/include/usb/usb.h @@ -215,6 +215,7 @@ void init_device_entry (hci_t *controller, int num); void set_feature (usbdev_t *dev, int endp, int feature, int rtype); void get_status (usbdev_t *dev, int endp, int rtype, int len, void *data); +void clear_feature (usbdev_t *dev, int endp, int feature, int rtype); int clear_stall (endpoint_t *ep); void usb_nop_init (usbdev_t *dev);

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot May 2012