From bd6901e18fe2743e69b90dc1e8f96a98e103c3d0 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Mon, 16 Feb 2015 17:00:59 +0100 Subject: [PATCH] libpayload udc: Deconfigure device when necessary SET_CONFIGURATION(0) stops operation and is moves the device to addressed mode. BRANCH=none BUG=none TEST=USB device mode still works Change-Id: I964d90ba8440b6f428896acc9fe63e1114390da6 Signed-off-by: Patrick Georgi Original-Commit-Id: 402bc907222d07765b3438967edf26cc1a79d775 Original-Change-Id: Iebad024e1ed2e344dba73b73a9b385a4ac4cb450 Original-Signed-off-by: Patrick Georgi Original-Reviewed-on: https://chromium-review.googlesource.com/250791 Original-Reviewed-by: Furquan Shaikh Reviewed-on: http://review.coreboot.org/9785 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/libpayload/drivers/udc/chipidea.c | 8 ++++++++ payloads/libpayload/drivers/udc/udc.c | 20 +++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/payloads/libpayload/drivers/udc/chipidea.c b/payloads/libpayload/drivers/udc/chipidea.c index 58bea063e7..850d0c05b9 100644 --- a/payloads/libpayload/drivers/udc/chipidea.c +++ b/payloads/libpayload/drivers/udc/chipidea.c @@ -138,6 +138,14 @@ static void chipidea_halt_ep(struct usbdev_ctrl *this, int ep, int in_dir) while (readl(&p->opreg->epflush)) ; clrbits_le32(&p->opreg->epctrl[ep], 1 << (7 + (in_dir ? 16 : 0))); + + while (!SIMPLEQ_EMPTY(&p->job_queue[ep][in_dir])) { + struct job *job = SIMPLEQ_FIRST(&p->job_queue[ep][in_dir]); + if (job->autofree) + free(job->data); + + SIMPLEQ_REMOVE_HEAD(&p->job_queue[ep][in_dir], queue); + } } static void chipidea_start_ep(struct usbdev_ctrl *this, diff --git a/payloads/libpayload/drivers/udc/udc.c b/payloads/libpayload/drivers/udc/udc.c index 89a7d1dac2..9694ff8ec1 100644 --- a/payloads/libpayload/drivers/udc/udc.c +++ b/payloads/libpayload/drivers/udc/udc.c @@ -81,12 +81,8 @@ static struct usbdev_configuration *fetch_config(struct usbdev_ctrl *this, return NULL; } -static void enable_interface(struct usbdev_ctrl *this, int iface_num) +static void cease_operation(struct usbdev_ctrl *this) { - struct usbdev_configuration *config = this->current_config; - struct usbdev_interface *iface = &config->interfaces[iface_num]; - - /* first: shut down all endpoints except EP0 */ int i; for (i = 1; i < 16; i++) { /* disable endpoints */ @@ -94,8 +90,19 @@ static void enable_interface(struct usbdev_ctrl *this, int iface_num) this->halt_ep(this, i, 1); } +} + +static void enable_interface(struct usbdev_ctrl *this, int iface_num) +{ + struct usbdev_configuration *config = this->current_config; + struct usbdev_interface *iface = &config->interfaces[iface_num]; + + /* first: shut down all endpoints except EP0 */ + cease_operation(this); + /* now enable all configured endpoints */ int epcount = iface->descriptor.bNumEndpoints; + int i; for (i = 0; i < epcount; i++) { int ep = iface->eps[i].bEndpointAddress; int mps = iface->eps[i].wMaxPacketSize; @@ -139,8 +146,7 @@ static int setup_ep0(struct usbdev_ctrl *this, dev_req_t *dr) this->current_config_id = dr->wValue; if (dr->wValue == 0) - // TODO: reset device - return 1; + cease_operation(this); if (config == NULL) { this->stall(this, 0, 0, 1);