GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udc/chipidea: Allow force_shutdown of connection 

Allow force shutdown operation of the connection in case where the
cable is disconnected and reconnected back.

BUG=chrome-os-partner:41687
BRANCH=None
TEST=Compiles successfully and fastboot works fine even with
reconnection of cable

Change-Id: I8eb1217b4a9ad6ce8a2a40db329eca1930eda089
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 3d7ab65c459caa4ec526b99a1aee1a31e9cb80da
Original-Change-Id: I354c44e0ed2211cb2c4c1ae653d201b7d15ea932
Original-Signed-off-by: Furquan Shaikh <furquan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/281066
Original-Trybot-Ready: Furquan Shaikh <furquan@chromium.org>
Original-Tested-by: Furquan Shaikh <furquan@chromium.org>
Original-Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/10686
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Furquan Shaikh 2015-06-22 16:07:51 -07:00 committed by Patrick Georgi
parent 14610ec20a
commit ed1a4bbb60
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
payloads/libpayload/drivers/udc/chipidea.c
View File

@ -413,6 +413,18 @@ static int chipidea_poll(struct usbdev_ctrl *this)
return 1; return 1;
} }
static void chipidea_force_shutdown(struct usbdev_ctrl *this)
{
struct chipidea_pdata *p = CI_PDATA(this);
writel(0xffffffff, &p->opreg->epflush);
writel(USBCMD_8MICRO | USBCMD_RST, &p->opreg->usbcmd);
writel(0, &p->opreg->usbmode);
writel(USBCMD_8MICRO, &p->opreg->usbcmd);
free(p->qhlist);
free(p);
free(this);
}
static void chipidea_shutdown(struct usbdev_ctrl *this) static void chipidea_shutdown(struct usbdev_ctrl *this)
{ {
struct chipidea_pdata *p = CI_PDATA(this); struct chipidea_pdata *p = CI_PDATA(this);
@ -426,13 +438,7 @@ static void chipidea_shutdown(struct usbdev_ctrl *this)
if (!SIMPLEQ_EMPTY(&p->job_queue[i][j])) if (!SIMPLEQ_EMPTY(&p->job_queue[i][j]))
is_empty = 0; is_empty = 0;
} }
writel(0xffffffff, &p->opreg->epflush); chipidea_force_shutdown(this);
writel(USBCMD_8MICRO | USBCMD_RST, &p->opreg->usbcmd);
writel(0, &p->opreg->usbmode);
writel(USBCMD_8MICRO, &p->opreg->usbcmd);
free(p->qhlist);
free(p);
free(this);
} }
static void chipidea_set_address(struct usbdev_ctrl *this, int address) static void chipidea_set_address(struct usbdev_ctrl *this, int address)
@ -491,6 +497,7 @@ struct usbdev_ctrl *chipidea_init(device_descriptor_t *dd)
ctrl->add_gadget = udc_add_gadget; ctrl->add_gadget = udc_add_gadget;
ctrl->add_strings = udc_add_strings; ctrl->add_strings = udc_add_strings;
ctrl->enqueue_packet = chipidea_enqueue_packet; ctrl->enqueue_packet = chipidea_enqueue_packet;
ctrl->force_shutdown = chipidea_force_shutdown;
ctrl->shutdown = chipidea_shutdown; ctrl->shutdown = chipidea_shutdown;
ctrl->set_address = chipidea_set_address; ctrl->set_address = chipidea_set_address;
ctrl->stall = chipidea_stall; ctrl->stall = chipidea_stall;

9
payloads/libpayload/include/udc/udc.h
View File

@ -140,6 +140,15 @@ struct usbdev_ctrl {
*/ */
void (*stall)(struct usbdev_ctrl *, uint8_t ep, int in_dir, int set); void (*stall)(struct usbdev_ctrl *, uint8_t ep, int in_dir, int set);
/**
* Disable controller and deallocate data structures.
*/
void (*force_shutdown)(struct usbdev_ctrl *this);
/**
* Let queues run out, then disable controller and deallocate data
* structures.
*/
void (*shutdown)(struct usbdev_ctrl *this); void (*shutdown)(struct usbdev_ctrl *this);
/** /**