Virtualization
/
SLOF
mirror of https://gitlab.com/qemu-project/SLOF.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb-ohci: update init and rationalize timings 

Signed-off-by: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
This commit is contained in:
Nikunj A Dadhania 2013-09-24 15:09:29 +05:30
parent 2b14fb9a9e
commit a351fc0cbc
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libusb/usb-hub.c
View File

@ -119,7 +119,7 @@ static int hub_check_port(struct usb_dev *dev, int port)
if (!(le16_to_cpu(ps.wPortStatus) & HUB_PS_POWER)) {
hub_set_port_feature(dev, port, HUB_PF_POWER);
SLOF_msleep(200);
SLOF_msleep(100);
time = SLOF_GetTimer() + USB_TIMEOUT;
while (time > SLOF_GetTimer()) {
cpu_relax();
@ -133,10 +133,9 @@ static int hub_check_port(struct usb_dev *dev, int port)
}
}
SLOF_msleep(200);
if (le16_to_cpu(ps.wPortStatus) & HUB_PS_CONNECTION) {
hub_set_port_feature(dev, port, HUB_PF_RESET);
SLOF_msleep(200);
SLOF_msleep(100);
time = SLOF_GetTimer() + USB_TIMEOUT;
while (time > SLOF_GetTimer()) {
cpu_relax();

25
lib/libusb/usb-ohci.c
View File

@ -75,22 +75,21 @@ static int ohci_hcd_reset(struct ohci_regs *regs)
/* USBRESET - 1sec */
write_reg32(&regs->control, 0);
SLOF_msleep(1000);
SLOF_msleep(100);
write_reg32(&regs->intr_disable, ~0);
write_reg32(&regs->cmd_status, OHCI_CMD_STATUS_HCR);
SLOF_msleep(100);
mb();
time = SLOF_GetTimer() + USB_TIMEOUT;
while ((time > SLOF_GetTimer()) &&
(read_reg32(&regs->cmd_status) & OHCI_CMD_STATUS_HCR))
cpu_relax();
if (read_reg32(&regs->cmd_status) & OHCI_CMD_STATUS_HCR) {
printf(" ** HCD Reset failed...");
return -1;
time = 30; /* wait for not more than 30usec */
while ((read_reg32(&regs->cmd_status) & OHCI_CMD_STATUS_HCR) != 0) {
time--;
if (!time) {
printf(" ** HCD Reset failed...");
return -1;
}
SLOF_usleep(1);
}
return 0;
}
@ -103,6 +102,7 @@ static int ohci_hcd_init(struct ohci_hcd *ohcd)
uint32_t oldrwc;
struct usb_dev *rhdev = NULL;
struct usb_ep_descr ep;
uint32_t reg;
if (!ohcd)
return -1;
@ -148,6 +148,11 @@ static int ohci_hcd_init(struct ohci_hcd *ohcd)
*/
write_reg32(&regs->fm_interval, FRAME_INTERVAL);
write_reg32(&regs->period_start, PERIODIC_START);
reg = read_reg32(&regs->rh_desc_a);
reg &= ~( RHDA_PSM_INDIVIDUAL | RHDA_OCPM_PERPORT );
reg |= RHDA_NPS_ENABLE;
write_reg32(&regs->rh_desc_a, reg);
write_reg32(&regs->rh_desc_b, 0);
mb();
SLOF_msleep(100);
ohci_dump_regs(regs);