sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Redirect USB slave init through controller driver

Browse Source 
xHCI requires special treatment of set_address since it determines
the device number itself (instead of the driver, as with the other
controllers). The controller also wants to validate a chosen device
configuration and we need to setup additional structures for the
device and the endpoints.

Therefore, we add three functions to the hci_t structure, namely:
  set_address()
  finish_device_config()
  destroy_device()
Current implementation for the Set Address request moved into
generic_set_address() which is set_address() for the UHCI, OCHI and
EHCI drivers. The latter two are only provided as hooks for the xHCI
driver.

The Set Configuration request is moved after endpoint enumeration.
For all other controller drivers nothing changes, as there is no other
device communication between the lines where the set_configuration()
call moved.

Change-Id: I6127627b9367ef573aa1a1525782bc1304ea350d
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/3447
Tested-by: build bot (Jenkins)
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Patrick Georgi
2013-05-24 15:48:56 +02:00
committed by Stefan Reinauer
parent 4fc7b6c994
commit 482af6d15c
5 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
payloads/libpayload/drivers/usb/usb.c
View File

@ -242,13 +242,11 @@ get_free_address (hci_t *controller)
return -1; // no free address
}
static int
set_address (hci_t *controller, int speed, int hubport, int hubaddr)
int
generic_set_address (hci_t *controller, int speed, int hubport, int hubaddr)
{
int adr = get_free_address (controller); // address to set
dev_req_t dr;
configuration_descriptor_t *cd;
device_descriptor_t *dd;
memset (&dr, 0, sizeof (dr));
dr.data_dir = host_to_device;
@ -273,11 +271,29 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
dev->endpoints[0].direction = SETUP;
mdelay (50);
if (dev->controller->control (dev, OUT, sizeof (dr), &dr, 0, 0)) {
usb_debug ("set_address failed\n");
return -1;
}
mdelay (50);
return adr;
}
static int
set_address (hci_t *controller, int speed, int hubport, int hubaddr)
{
int adr = controller->set_address(controller, speed, hubport, hubaddr);
if (adr < 0 || !controller->devices[adr]) {
usb_debug ("set_address failed\n");
return -1;
}
configuration_descriptor_t *cd;
device_descriptor_t *dd;
usbdev_t *dev = controller->devices[adr];
dev->address = adr;
dev->hub = hubaddr;
dev->port = hubport;
dev->speed = speed;
dev->descriptor = get_descriptor (dev, gen_bmRequestType
(device_to_host, standard_type, dev_recp), 1, 0, 0);
dd = (device_descriptor_t *) dev->descriptor;
@ -298,7 +314,6 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
dev->configuration = get_descriptor (dev, gen_bmRequestType
(device_to_host, standard_type, dev_recp), 2, 0, 0);
cd = (configuration_descriptor_t *) dev->configuration;
set_configuration (dev);
interface_descriptor_t *interface =
(interface_descriptor_t *) (((char *) cd) + cd->bLength);
{
@ -366,6 +381,13 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr)
}
}
if (controller->finish_device_config &&
controller->finish_device_config(dev))
return adr; /* Device isn't configured correctly,
only control transfers may work. */
set_configuration(dev);
int class = dd->bDeviceClass;
if (class == 0)
class = interface->bInterfaceClass;
@ -475,6 +497,8 @@ usb_detach_device(hci_t *controller, int devno)
controller->devices[devno]->destroy (controller->devices[devno]);
free(controller->devices[devno]);
controller->devices[devno] = NULL;
if (controller->destroy_device)
controller->destroy_device(controller, devno);
}
}