leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: ohci: Skip unnecessary mdelay(1) calls in various places

Browse Source 
For some reason the ohci code is full with:

 #ifdef DEBUG
		pkt_print(...)
 #else
		mdelay(1);
 #endif

AFAICT there is no reason for the mdelay(1) calls. This commit disables them
when building the ohci code for new driver-model using boards. It leaves
the mdelay(1) calls in place when building for older boards, so as to avoid
causing any regressions there.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2015-05-10 14:10:24 +02:00 committed by Simon Glass
parent 969bb5bad3
commit 8f761f023c
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/usb/host/ohci-hcd.c
View File

@ -129,6 +129,17 @@ static struct pci_device_id ehci_pci_ids[] = {
#define invalidate_dcache_iso_td(addr) invalidate_dcache_buffer(addr, 32) #define invalidate_dcache_iso_td(addr) invalidate_dcache_buffer(addr, 32)
#define invalidate_dcache_hcca(addr) invalidate_dcache_buffer(addr, 256) #define invalidate_dcache_hcca(addr) invalidate_dcache_buffer(addr, 256)
#ifdef CONFIG_DM_USB
/*
* The various ohci_mdelay(1) calls in the code seem unnecessary. We keep
* them around when building for older boards not yet converted to the dm
* just in case (to avoid regressions), for dm this turns them into nops.
*/
#define ohci_mdelay(x)
#else
#define ohci_mdelay(x) mdelay(x)
#endif
/* global ohci_t */ /* global ohci_t */
static ohci_t gohci; static ohci_t gohci;
/* this must be aligned to a 256 byte boundary */ /* this must be aligned to a 256 byte boundary */
@ -1257,7 +1268,7 @@ static int ohci_submit_rh_msg(ohci_t *ohci, struct usb_device *dev,
pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len, pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len,
cmd, "SUB(rh)", usb_pipein(pipe)); cmd, "SUB(rh)", usb_pipein(pipe));
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
if (usb_pipeint(pipe)) { if (usb_pipeint(pipe)) {
info("Root-Hub submit IRQ: NOT implemented"); info("Root-Hub submit IRQ: NOT implemented");
@ -1442,7 +1453,7 @@ pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len,
#ifdef DEBUG #ifdef DEBUG
ohci_dump_roothub(ohci, 1); ohci_dump_roothub(ohci, 1);
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
len = min_t(int, len, leni); len = min_t(int, len, leni);
@ -1455,7 +1466,7 @@ pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len,
pkt_print(ohci, NULL, dev, pipe, buffer, pkt_print(ohci, NULL, dev, pipe, buffer,
transfer_len, cmd, "RET(rh)", 0/*usb_pipein(pipe)*/); transfer_len, cmd, "RET(rh)", 0/*usb_pipein(pipe)*/);
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
return stat; return stat;
@ -1488,7 +1499,7 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev,
pkt_print(ohci, urb, dev, pipe, buffer, transfer_len, pkt_print(ohci, urb, dev, pipe, buffer, transfer_len,
setup, "SUB", usb_pipein(pipe)); setup, "SUB", usb_pipein(pipe));
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
if (!maxsize) { if (!maxsize) {
err("submit_common_message: pipesize for pipe %lx is zero", err("submit_common_message: pipesize for pipe %lx is zero",
@ -1556,7 +1567,7 @@ static int submit_common_msg(ohci_t *ohci, struct usb_device *dev,
pkt_print(ohci, urb, dev, pipe, buffer, transfer_len, pkt_print(ohci, urb, dev, pipe, buffer, transfer_len,
setup, "RET(ctlr)", usb_pipein(pipe)); setup, "RET(ctlr)", usb_pipein(pipe));
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
urb_free_priv(urb); urb_free_priv(urb);
return 0; return 0;
@ -1590,7 +1601,7 @@ static int _ohci_submit_control_msg(ohci_t *ohci, struct usb_device *dev,
pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len, pkt_print(ohci, NULL, dev, pipe, buffer, transfer_len,
setup, "SUB", usb_pipein(pipe)); setup, "SUB", usb_pipein(pipe));
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
if (!maxsize) { if (!maxsize) {
err("submit_control_message: pipesize for pipe %lx is zero", err("submit_control_message: pipesize for pipe %lx is zero",
@ -1787,7 +1798,7 @@ static int hc_interrupt(ohci_t *ohci)
#ifdef DEBUG #ifdef DEBUG
ohci_dump(ohci, 1); ohci_dump(ohci, 1);
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
/* FIXME: be optimistic, hope that bug won't repeat often. */ /* FIXME: be optimistic, hope that bug won't repeat often. */
/* Make some non-interrupt context restart the controller. */ /* Make some non-interrupt context restart the controller. */
@ -1798,7 +1809,7 @@ static int hc_interrupt(ohci_t *ohci)
} }
if (ints & OHCI_INTR_WDH) { if (ints & OHCI_INTR_WDH) {
mdelay(1); ohci_mdelay(1);
ohci_writel(OHCI_INTR_WDH, &regs->intrdisable); ohci_writel(OHCI_INTR_WDH, &regs->intrdisable);
(void)ohci_readl(&regs->intrdisable); /* flush */ (void)ohci_readl(&regs->intrdisable); /* flush */
stat = dl_done_list(ohci); stat = dl_done_list(ohci);
@ -1935,7 +1946,7 @@ int usb_lowlevel_init(int index, enum usb_init_type init, void **controller)
#ifdef DEBUG #ifdef DEBUG
ohci_dump(&gohci, 1); ohci_dump(&gohci, 1);
#else #else
mdelay(1); ohci_mdelay(1);
#endif #endif
ohci_inited = 1; ohci_inited = 1;
return 0; return 0;