coreboot May 2012

coreboot@coreboot.org

31 participants
287 discussions

New patch to review for coreboot: 8141a15 libpayload: Correct port power settings for EHCI root hub
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/1078 -gerrit commit 8141a15f6aa96be6c388421fa190950cfbaf9f55 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:56:21 2012 +0200 libpayload: Correct port power settings for EHCI root hub Enable power on EHCI root hub ports only if the controller supports it. Wait 20ms for the power to become stable. Change-Id: I8897756ed2bfcb88408fe5e9f9e3f8af5dd900ac Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ehci_private.h | 1 + payloads/libpayload/drivers/usb/ehci_rh.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci_private.h b/payloads/libpayload/drivers/usb/ehci_private.h index 6fa5f03..8ac15b3 100644 --- a/payloads/libpayload/drivers/usb/ehci_private.h +++ b/payloads/libpayload/drivers/usb/ehci_private.h @@ -49,6 +49,7 @@ typedef volatile u32 portsc_t; typedef volatile struct { #define HCS_NPORTS_MASK 0xf +#define HCS_PORT_POWER_CONTROL 0x10 u8 caplength; u8 res1; u16 hciversion; diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c index aeead3b..5f92bd7 100644 --- a/payloads/libpayload/drivers/usb/ehci_rh.c +++ b/payloads/libpayload/drivers/usb/ehci_rh.c @@ -159,10 +159,21 @@ ehci_rh_init (usbdev_t *dev) debug("root hub has %x ports\n", RH_INST(dev)->n_ports); + /* If the host controller has port power control, enable power on + * all ports and wait 20ms. + */ + if (EHCI_INST(dev->controller)->capabilities->hcsparams + & HCS_PORT_POWER_CONTROL) { + debug("host controller has port power control, " + "giving power to all ports.\n"); + for (i=0; i < RH_INST(dev)->n_ports; i++) + RH_INST(dev)->ports[i] |= P_PP; + } + mdelay(20); // ehci spec 2.3.9 + RH_INST(dev)->devices = malloc(RH_INST(dev)->n_ports * sizeof(int)); for (i=0; i < RH_INST(dev)->n_ports; i++) { RH_INST(dev)->devices[i] = -1; - RH_INST(dev)->ports[i] |= P_PP; ehci_rh_scanport(dev, i); }

1 0

New patch to review for coreboot: 2f51d92 libpayload: Add timeouts in the EHCI USB driver
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/1077 -gerrit commit 2f51d9239824baaac28029b5cabb69f1cad06236 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:53:43 2012 +0200 libpayload: Add timeouts in the EHCI USB driver We should always have some timeout when we wait for the hardware. This adds missing timeouts to the EHCI driver. Change-Id: I13ba532a6daf47510b16b8fdbe572a21f1d8b09c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ehci.c | 90 ++++++++++++++++++++-------- payloads/libpayload/drivers/usb/ehci_rh.c | 32 +++++++++-- 2 files changed, 91 insertions(+), 31 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index 9500059..cd1e867 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -116,7 +116,21 @@ static int wait_for_tds(qtd_t *head) qtd_t *cur = head; while (1) { if (0) dump_td(virt_to_phys(cur)); - while ((cur->token & QTD_ACTIVE) && !(cur->token & QTD_HALTED)) udelay(60); + + /* wait for results */ + /* TOTEST: how long to wait? + * tested with some USB2.0 flash sticks: + * slowest took around 180ms + */ + int timeout = 10000; /* time out after 10000 * 50us == 500ms */ + while ((cur->token & QTD_ACTIVE) && !(cur->token & QTD_HALTED) + && timeout--) + udelay(50); + if (timeout < 0) { + printf("Error: ehci: queue transfer " + "processing timed out.\n"); + return 1; + } if (cur->token & QTD_HALTED) { printf("ERROR with packet\n"); dump_td(virt_to_phys(cur)); @@ -134,6 +148,51 @@ static int wait_for_tds(qtd_t *head) return result; } +static int ehci_set_async_schedule(ehci_t *ehcic, int enable) +{ + /* Set async schedule status. */ + if (enable) + ehcic->operation->usbcmd |= HC_OP_ASYNC_SCHED_EN; + else + ehcic->operation->usbcmd &= ~HC_OP_ASYNC_SCHED_EN; + /* Wait for the controller to accept async schedule status. + * This shouldn't take too long, but we should timeout nevertheless. + */ + enable = enable ? HC_OP_ASYNC_SCHED_STAT : 0; + int timeout = 100; /* time out after 100ms */ + while (((ehcic->operation->usbsts & HC_OP_ASYNC_SCHED_STAT) != enable) + && timeout--) + mdelay(1); + if (timeout < 0) { + debug("ehci async schedule status change timed out.\n"); + return 1; + } + return 0; +} + +static int ehci_process_async_schedule( + ehci_t *ehcic, ehci_qh_t *qhead, qtd_t *head) +{ + int result; + + /* make sure async schedule is disabled */ + if (ehci_set_async_schedule(ehcic, 0)) return 1; + + /* hook up QH */ + ehcic->operation->asynclistaddr = virt_to_phys(qhead); + + /* start async schedule */ + if (ehci_set_async_schedule(ehcic, 1)) return 1; + + /* wait for result */ + result = wait_for_tds(head); + + /* disable async schedule */ + ehci_set_async_schedule(ehcic, 0); + + return result; +} + static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) { int result = 0; @@ -179,19 +238,8 @@ static int ehci_bulk (endpoint_t *ep, int size, u8 *data, int finalize) qh->td.token |= (ep->toggle?QTD_TOGGLE_DATA1:0); head->token |= (ep->toggle?QTD_TOGGLE_DATA1:0); - /* hook up QH */ - EHCI_INST(ep->dev->controller)->operation->asynclistaddr = virt_to_phys(qh); - - /* start async schedule */ - EHCI_INST(ep->dev->controller)->operation->usbcmd |= HC_OP_ASYNC_SCHED_EN; - while (!(EHCI_INST(ep->dev->controller)->operation->usbsts & HC_OP_ASYNC_SCHED_STAT)) ; /* wait */ - - /* wait for result */ - result = wait_for_tds(head); - - /* disable async schedule */ - EHCI_INST(ep->dev->controller)->operation->usbcmd &= ~HC_OP_ASYNC_SCHED_EN; - while (EHCI_INST(ep->dev->controller)->operation->usbsts & HC_OP_ASYNC_SCHED_STAT) ; /* wait */ + result = ehci_process_async_schedule( + EHCI_INST(ep->dev->controller), qh, head); ep->toggle = (cur->token & QTD_TOGGLE_MASK) >> QTD_TOGGLE_SHIFT; @@ -268,18 +316,8 @@ static int ehci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq qh->epcaps = 3 << QH_PIPE_MULTIPLIER_SHIFT; qh->td.next_qtd = virt_to_phys(head); - /* hook up QH */ - EHCI_INST(dev->controller)->operation->asynclistaddr = virt_to_phys(qh); - - /* start async schedule */ - EHCI_INST(dev->controller)->operation->usbcmd |= HC_OP_ASYNC_SCHED_EN; - while (!(EHCI_INST(dev->controller)->operation->usbsts & HC_OP_ASYNC_SCHED_STAT)) ; /* wait */ - - result = wait_for_tds(head); - - /* disable async schedule */ - EHCI_INST(dev->controller)->operation->usbcmd &= ~HC_OP_ASYNC_SCHED_EN; - while (EHCI_INST(dev->controller)->operation->usbsts & HC_OP_ASYNC_SCHED_STAT) ; /* wait */ + result = ehci_process_async_schedule( + EHCI_INST(dev->controller), qh, head); free_qh_and_tds(qh, head); return result; diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c index dd073a3..aeead3b 100644 --- a/payloads/libpayload/drivers/usb/ehci_rh.c +++ b/payloads/libpayload/drivers/usb/ehci_rh.c @@ -55,9 +55,21 @@ ehci_rh_hand_over_port (usbdev_t *dev, int port) { debug("giving up port %x, it's USB1\n", port+1); + /* Clear ConnectStatusChange before evaluation */ + /* RW/C register, so clear it by writing 1 */ + RH_INST(dev)->ports[port] |= P_CONN_STATUS_CHANGE; + /* Lowspeed device. Hand over to companion */ RH_INST(dev)->ports[port] |= P_PORT_OWNER; - do {} while (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE)); + + /* TOTEST: how long to wait? trying 100ms for now */ + int timeout = 10; /* timeout after 10 * 10ms == 100ms */ + while (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE) && timeout--) + mdelay(10); + if (!(RH_INST(dev)->ports[port] & P_CONN_STATUS_CHANGE)) { + debug("Warning: Handing port over to companion timed out.\n"); + } + /* RW/C register, so clear it by writing 1 */ RH_INST(dev)->ports[port] |= P_CONN_STATUS_CHANGE; return; @@ -73,7 +85,7 @@ ehci_rh_scanport (usbdev_t *dev, int port) } /* device connected, handle */ if (RH_INST(dev)->ports[port] & P_CURR_CONN_STATUS) { - mdelay(100); + mdelay(100); // usb20 spec 9.1.2 if ((RH_INST(dev)->ports[port] & P_LINE_STATUS) == P_LINE_STATUS_LOWSPEED) { ehci_rh_hand_over_port(dev, port); return; @@ -85,13 +97,23 @@ ehci_rh_scanport (usbdev_t *dev, int port) RH_INST(dev)->ports[port] = (RH_INST(dev)->ports[port] & ~P_PORT_ENABLE) | P_PORT_RESET; /* Wait a bit while reset is active. */ - mdelay(50); + mdelay(50); // usb20 spec 7.1.7.5 (TDRSTR) /* Deassert reset. */ RH_INST(dev)->ports[port] &= ~P_PORT_RESET; - /* Wait for flag change to finish. The controller might take a while */ - while (RH_INST(dev)->ports[port] & P_PORT_RESET) ; + /* Wait max. 2ms (ehci spec 2.3.9) for flag change to finish. */ + int timeout = 20; /* time out after 20 * 100us == 2ms */ + while ((RH_INST(dev)->ports[port] & P_PORT_RESET) && timeout--) + udelay(100); + if (RH_INST(dev)->ports[port] & P_PORT_RESET) { + printf("Error: ehci_rh: port reset timed out.\n"); + return; + } + + /* If the host controller enabled the port, it's a high-speed + * device, otherwise it's full-speed. + */ if (!(RH_INST(dev)->ports[port] & P_PORT_ENABLE)) { ehci_rh_hand_over_port(dev, port); return;

1 0

New patch to review for coreboot: 309aa8c libpayload: Add timeouts in the OHCI USB driver
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/1076 -gerrit commit 309aa8cc0731941ea7b219c8a374bbe182c44891 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:46:26 2012 +0200 libpayload: Add timeouts in the OHCI USB driver We should always have some timeout when we wait for the hardware. This adds missing timeouts and a more standard compliant port reset to the OHCI driver. Change-Id: I2cfcb1039fd12f291e88dcb8b74d41cb5bb2315e Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ohci.c | 22 ++++++++++-- payloads/libpayload/drivers/usb/ohci_rh.c | 50 +++++++++++++++++++++++------ 2 files changed, 58 insertions(+), 14 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index 830542e..730c540 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -195,14 +195,23 @@ dump_td(td_t *cur, int level) } static int -wait_for_ed(usbdev_t *dev, ed_t *head) +wait_for_ed(usbdev_t *dev, ed_t *head, int pages) { td_t *cur; /* wait for results */ + /* TODO: how long to wait? + * give 50ms per page plus another 100ms for now + * this should even work with low-speed + */ + int timeout = pages*50 + 100; while (((head->head_pointer & ~3) != head->tail_pointer) && !(head->head_pointer & 1) && - ((((td_t*)phys_to_virt(head->head_pointer & ~3))->config & TD_CC_MASK) >= TD_CC_NOACCESS)) { + ((((td_t*)phys_to_virt(head->head_pointer & ~3))->config + & TD_CC_MASK) >= TD_CC_NOACCESS) && + timeout--) { + /* don't log every ms */ + if (!(timeout % 100)) debug("intst: %x; ctrl: %x; cmdst: %x; head: %x -> %x, tail: %x, condition: %x\n", OHCI_INST(dev->controller)->opreg->HcInterruptStatus, OHCI_INST(dev->controller)->opreg->HcControl, @@ -213,6 +222,9 @@ wait_for_ed(usbdev_t *dev, ed_t *head) (((td_t*)phys_to_virt(head->head_pointer & ~3))->config & TD_CC_MASK) >> TD_CC_SHIFT); mdelay(1); } + if (timeout < 0) + printf("Error: ohci: endpoint " + "descriptor processing timed out.\n"); #if 0 /* XXX: The following debugging code may follow invalid lists and * cause a reboot. @@ -341,7 +353,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen OHCI_INST(dev->controller)->opreg->HcControl |= ControlListEnable; OHCI_INST(dev->controller)->opreg->HcCommandStatus = ControlListFilled; - int failure = wait_for_ed(dev, head); + int failure = wait_for_ed(dev, head, + (dalen==0)?0:(last_page - first_page + 1)); OHCI_INST(dev->controller)->opreg->HcControl &= ~ControlListEnable; /* free memory */ @@ -430,7 +443,8 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize) OHCI_INST(ep->dev->controller)->opreg->HcControl |= BulkListEnable; OHCI_INST(ep->dev->controller)->opreg->HcCommandStatus = BulkListFilled; - int failure = wait_for_ed(ep->dev, head); + int failure = wait_for_ed(ep->dev, head, + (dalen==0)?0:(last_page - first_page + 1)); OHCI_INST(ep->dev->controller)->opreg->HcControl &= ~BulkListEnable; ep->toggle = head->head_pointer & ED_TOGGLE; diff --git a/payloads/libpayload/drivers/usb/ohci_rh.c b/payloads/libpayload/drivers/usb/ohci_rh.c index 5cf7ee8..ac92f45 100644 --- a/payloads/libpayload/drivers/usb/ohci_rh.c +++ b/payloads/libpayload/drivers/usb/ohci_rh.c @@ -43,15 +43,40 @@ typedef struct { static void ohci_rh_enable_port (usbdev_t *dev, int port) { - if (!(OHCI_INST(dev->controller)->opreg->HcRhPortStatus[port] & CurrentConnectStatus)) - return; - - OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = SetPortEnable; // enable port - mdelay(10); - while (!(OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] & PortEnableStatus)) mdelay(1); - OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = SetPortReset; // reset port - while (OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] & PortResetStatus) mdelay(1); - OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = PortResetStatusChange; + /* Reset RH port should hold 50ms with pulses of at least 10ms and + * gaps of at most 3ms (usb20 spec 7.1.7.5). + * After reset, the port will be enabled automatically (ohci spec + * 7.4.4). + */ + int delay = 100; /* 100 * 500us == 50ms */ + while (delay > 0) { + if (!(OHCI_INST(dev->controller)->opreg->HcRhPortStatus[port] + & CurrentConnectStatus)) + return; + + /* start reset */ + OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = + SetPortReset; + int timeout = 200; /* timeout after 200 * 500us == 100ms */ + while ((OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] + & PortResetStatus) + && timeout--) { + udelay(500); delay--; + } + if (OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] + & PortResetStatus) { + debug("Warning: root-hub port reset timed out.\n"); + break; + } + if ((200-timeout) < 20) + debug("Warning: port reset too short: %dms; " + "should be at least 10ms.\n", + (200-timeout)/2); + /* clear reset status change */ + OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = + PortResetStatusChange; + debug ("rh port reset finished after %dms.\n", (200-timeout)/2); + } } /* disable root hub */ @@ -59,7 +84,12 @@ static void ohci_rh_disable_port (usbdev_t *dev, int port) { OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] = ClearPortEnable; // disable port - while (OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] & PortEnableStatus) mdelay(1); + int timeout = 50; /* timeout after 50 * 100us == 5ms */ + while ((OHCI_INST (dev->controller)->opreg->HcRhPortStatus[port] + & PortEnableStatus) + && timeout--) { + udelay(100); + } } static void

1 0

New patch to review for coreboot: 7772794 libpayload: Remove orphaned delay from OHCI USB driver
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/1075 -gerrit commit 77727940b54e5fe4daafa21e638951f2fb2162f2 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:41:49 2012 +0200 libpayload: Remove orphaned delay from OHCI USB driver This removes a synthetic delay of 5ms from every OHCI USB command. A delay here seems to be of no use and first tests have shown no glitches. Change-Id: Ie72b2d49e6734345708f04f3f7b86bacc7926108 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ohci.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index fa7db3a..830542e 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -213,7 +213,6 @@ wait_for_ed(usbdev_t *dev, ed_t *head) (((td_t*)phys_to_virt(head->head_pointer & ~3))->config & TD_CC_MASK) >> TD_CC_SHIFT); mdelay(1); } - mdelay(5); #if 0 /* XXX: The following debugging code may follow invalid lists and * cause a reboot.

1 0

New patch to review for coreboot: 6ce9398 libpayload: Disable some buggy debugging code
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/1074 -gerrit commit 6ce9398ed02e1fd55b1f329de89e4eff5e1c8c2a Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:38:08 2012 +0200 libpayload: Disable some buggy debugging code This disables some debugging code in the OHCI USB driver which causes reboots under rare circumstances. Change-Id: Ic274c162846137ee00638ffbc59ccf1d8130586f Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/ohci.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index 3a1b51d..fa7db3a 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -214,6 +214,11 @@ wait_for_ed(usbdev_t *dev, ed_t *head) mdelay(1); } mdelay(5); +#if 0 + /* XXX: The following debugging code may follow invalid lists and + * cause a reboot. + */ +#ifdef USB_DEBUG if (OHCI_INST(dev->controller)->opreg->HcInterruptStatus & WritebackDoneHead) { debug("done queue:\n"); debug("%x, %x\n", OHCI_INST(dev->controller)->hcca->HccaDoneHead, phys_to_virt(OHCI_INST(dev->controller)->hcca->HccaDoneHead)); @@ -236,6 +241,8 @@ wait_for_ed(usbdev_t *dev, ed_t *head) } OHCI_INST(dev->controller)->opreg->HcInterruptStatus &= ~WritebackDoneHead; } +#endif +#endif if (head->head_pointer & 1) { debug("HALTED!\n");

1 0

New patch to review for coreboot: 2541489 libpayload: Add timeouts in the UHCI USB driver
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/1073 -gerrit commit 2541489b34e3a5d1fa4a96fdd4dfd7bcbaa92ac5 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:23:03 2012 +0200 libpayload: Add timeouts in the UHCI USB driver We should always have some timeout when we wait for the hardware. This adds missing timeouts to the UHCI driver. Change-Id: Ic37b95ce12ff3ff5efe3e7ca346090946f6ee7de Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/uhci.c | 15 ++++++++++----- payloads/libpayload/drivers/usb/uhci_rh.c | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index d9a1a10..8e6c9ed 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -102,13 +102,18 @@ static void uhci_reset (hci_t *controller) { /* reset */ - uhci_reg_write16 (controller, USBCMD, 4); - mdelay (50); + uhci_reg_write16 (controller, USBCMD, 4); /* Global Reset */ + mdelay (50); /* uhci spec 2.1.1: at least 10ms */ uhci_reg_write16 (controller, USBCMD, 0); mdelay (10); - uhci_reg_write16 (controller, USBCMD, 2); - while ((uhci_reg_read16 (controller, USBCMD) & 2) != 0) - mdelay (1); + uhci_reg_write16 (controller, USBCMD, 2); /* Host Controller Reset */ + /* wait for controller to finish reset */ + /* TOTEST: how long to wait? 100ms for now */ + int timeout = 200; /* time out after 200 * 500us == 100ms */ + while (((uhci_reg_read16 (controller, USBCMD) & 2) != 0) && timeout--) + udelay (500); + if (timeout < 0) + debug ("Warning: uhci: host controller reset timed out.\n"); uhci_reg_write32 (controller, FLBASEADD, (u32) virt_to_phys (UHCI_INST (controller)-> diff --git a/payloads/libpayload/drivers/usb/uhci_rh.c b/payloads/libpayload/drivers/usb/uhci_rh.c index 5074099..4674608 100644 --- a/payloads/libpayload/drivers/usb/uhci_rh.c +++ b/payloads/libpayload/drivers/usb/uhci_rh.c @@ -65,10 +65,15 @@ uhci_rh_enable_port (usbdev_t *dev, int port) uhci_reg_write16(controller, port, uhci_reg_read16(controller, port) | 1 << 2); /* enable */ + /* wait for controller to enable port */ + /* TOTEST: how long to wait? 100ms for now */ + int timeout = 200; /* time out after 200 * 500us == 100ms */ do { value = uhci_reg_read16 (controller, port); - mdelay (1); - } while (((value & (1 << 2)) == 0) && (value & 0x01)); + udelay(500); timeout--; + } while (((value & (1 << 2)) == 0) && (value & 0x01) && timeout); + if (!timeout) + debug("Warning: uhci_rh: port enabling timed out.\n"); } /* disable root hub */ @@ -82,10 +87,15 @@ uhci_rh_disable_port (usbdev_t *dev, int port) uhci_reg_write16(controller, port, uhci_reg_read16(controller, port) & ~4); int value; + /* wait for controller to disable port */ + /* TOTEST: how long to wait? 100ms for now */ + int timeout = 200; /* time out after 200 * 500us == 100ms */ do { value = uhci_reg_read16 (controller, port); - mdelay (1); - } while ((value & (1 << 2)) != 0); + udelay(500); timeout--; + } while (((value & (1 << 2)) != 0) && timeout); + if (!timeout) + debug("Warning: uhci_rh: port disabling timed out.\n"); } static void

1 0

New patch to review for coreboot: ded4007 libpayload: Better error detection in USB mass storage
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/1072 -gerrit commit ded400746b66ee42983c6a92e7490fd0a354ac53 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:05:41 2012 +0200 libpayload: Better error detection in USB mass storage This implements status transport (CSW) more closely to the standard (usbmassbulk_10). Change-Id: Ife516316e054d4e87ebe698dc487eeb9ebcfd38d Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usbmsc.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c index 8d57736..e3ed3bb 100644 --- a/payloads/libpayload/drivers/usb/usbmsc.c +++ b/payloads/libpayload/drivers/usb/usbmsc.c @@ -151,8 +151,8 @@ get_max_luns (usbdev_t *dev) return luns; } -int tag; -int lun = 0; +unsigned int tag; +unsigned char lun = 0; static void wrap_cbw (cbw_t *cbw, int datalen, cbw_direction dir, const u8 *cmd, @@ -161,7 +161,7 @@ wrap_cbw (cbw_t *cbw, int datalen, cbw_direction dir, const u8 *cmd, memset (cbw, 0, sizeof (cbw_t)); cbw->dCBWSignature = cbw_signature; - cbw->dCBWTag = tag++; + cbw->dCBWTag = ++tag; cbw->bCBWLUN = lun; // static value per device cbw->dCBWDataTransferLength = datalen; @@ -170,11 +170,22 @@ wrap_cbw (cbw_t *cbw, int datalen, cbw_direction dir, const u8 *cmd, cbw->bCBWCBLength = cmdlen; } -static void +static int get_csw (endpoint_t *ep, csw_t *csw) { - if (ep->dev->controller->bulk (ep, sizeof (csw_t), (u8 *) csw, 1)) + if (ep->dev->controller->bulk (ep, sizeof (csw_t), (u8 *) csw, 1)) { clear_stall (ep); + if (ep->dev->controller->bulk + (ep, sizeof (csw_t), (u8 *) csw, 1)) { + reset_transport (ep->dev); + return 1; + } + } + if (csw->dCSWTag != tag) { + reset_transport (ep->dev); + return 1; + } + return 0; } static int @@ -209,7 +220,8 @@ execute_command (usbdev_t *dev, cbw_direction dir, const u8 *cb, int cblen, } } } - get_csw (MSC_INST (dev)->bulk_in, &csw); + if (get_csw (MSC_INST (dev)->bulk_in, &csw)) + return 1; if (always_succeed == 1) { // return success, regardless of message return 0; @@ -219,7 +231,7 @@ execute_command (usbdev_t *dev, cbw_direction dir, const u8 *cb, int cblen, reset_transport (dev); return 1; } - if (csw.bCSWStatus == 0) { + if ((csw.bCSWStatus == 0) && (csw.dCSWDataResidue == 0)) { // no error, exit return 0; }

1 0

New patch to review for coreboot: 3e0c664 libpayload: Remove orphaned delay from USB mass storage
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/1071 -gerrit commit 3e0c6641a94dbcb652f9283b4b769c56c0d9829a Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 14:01:52 2012 +0200 libpayload: Remove orphaned delay from USB mass storage This removes a synthetic delay of 10ms from every mass storage command. A delay here seems to be of no use and first tests have only shown a huge speed increase. Change-Id: Ida7423229373ec521d4326c5467a3f518b76149c Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usbmsc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c index e19b2a6..8d57736 100644 --- a/payloads/libpayload/drivers/usb/usbmsc.c +++ b/payloads/libpayload/drivers/usb/usbmsc.c @@ -194,7 +194,6 @@ execute_command (usbdev_t *dev, cbw_direction dir, const u8 *cb, int cblen, reset_transport (dev); return 1; } - mdelay (10); if (buflen > 0) { if (dir == cbw_direction_data_in) { if (dev->controller->

1 0

New patch to review for coreboot: b2d5bd2 libpayload: Fix an integer overflow in USB mass storage
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/1070 -gerrit commit b2d5bd239402dd8410fdab99fcee678e24ab9308 Author: Nico Huber <nico.huber(a)secunet.com> Date: Mon May 21 13:59:43 2012 +0200 libpayload: Fix an integer overflow in USB mass storage Change-Id: I3d618497016478ea727c520e866d27dbc3ebf9af Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usbmsc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usbmsc.c b/payloads/libpayload/drivers/usb/usbmsc.c index f90acb1..e19b2a6 100644 --- a/payloads/libpayload/drivers/usb/usbmsc.c +++ b/payloads/libpayload/drivers/usb/usbmsc.c @@ -361,6 +361,9 @@ read_capacity (usbdev_t *dev) } printf (" %d %d-byte sectors (%d MB)\n", MSC_INST (dev)->numblocks, MSC_INST (dev)->blocksize, + /* round down high block counts to avoid integer overflow */ + MSC_INST (dev)->numblocks > 1000000 + ? (MSC_INST (dev)->numblocks / 1000) * MSC_INST (dev)->blocksize / 1000 : MSC_INST (dev)->numblocks * MSC_INST (dev)->blocksize / 1000 / 1000); }

1 0

New patch to review for coreboot: 168e361 libpayload: Fix b0b4a52b70f0d7c09241f0f718a179fc55d85179
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/1069 -gerrit 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> --- payloads/libpayload/drivers/usb/uhci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/libpayload/drivers/usb/uhci.c b/payloads/libpayload/drivers/usb/uhci.c index 07a0742..d9a1a10 100644 --- a/payloads/libpayload/drivers/usb/uhci.c +++ b/payloads/libpayload/drivers/usb/uhci.c @@ -339,13 +339,13 @@ uhci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen data += mlen; } - tds[count].token = (dir == OUT) ? UHCI_IN : UHCI_OUT | + tds[count].token = ((dir == OUT) ? UHCI_IN : UHCI_OUT) | dev->address << TD_DEVADDR_SHIFT | endp << TD_EP_SHIFT | maxlen(0) << TD_MAXLEN_SHIFT | TD_TOGGLE_DATA1; tds[count].bufptr = 0; - tds[0].ctrlsts = (0 << TD_COUNTER_SHIFT) | /* as Linux 2.4.10 does */ + tds[count].ctrlsts = (0 << TD_COUNTER_SHIFT) | /* as Linux 2.4.10 does */ (dev->speed?TD_LOWSPEED:0) | TD_STATUS_ACTIVE; UHCI_INST (dev->controller)->qh_data->elementlinkptr = @@ -395,7 +395,7 @@ fill_schedule (td_t *td, endpoint_t *ep, int length, unsigned char *data, (*toggle & 1) << TD_TOGGLE_SHIFT; td->bufptr = virt_to_phys (data); td->ctrlsts = ((ep->direction == SETUP?3:0) << TD_COUNTER_SHIFT) | - ep->dev->speed?TD_LOWSPEED:0 | + (ep->dev->speed?TD_LOWSPEED:0) | TD_STATUS_ACTIVE; *toggle ^= 1; } @@ -495,7 +495,7 @@ uhci_create_intr_queue (endpoint_t *ep, int reqsize, int reqcount, int reqtiming (ep->toggle & 1) << TD_TOGGLE_SHIFT; tds[i].bufptr = virt_to_phys (data); tds[i].ctrlsts = (0 << TD_COUNTER_SHIFT) | - ep->dev->speed?TD_LOWSPEED:0 | + (ep->dev->speed?TD_LOWSPEED:0) | TD_STATUS_ACTIVE; ep->toggle ^= 1; data += reqsize;

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