diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-10-27 15:07:20 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-11-23 20:34:53 +0100 |
| commit | 7bb4f86d07934373fa427af3dad17ae59bc89bc9 (patch) | |
| tree | 3128386ee8a8536595986fa72ad78810cdef943c | |
| parent | 618d179bfefba32e1672a58f2ee9b969cb313130 (diff) | |
usbdebug: Refactor on EHCI memory space
We only reference with ehci_caps and ehci_regs during initialisation,
no need to carry those around.
When EHCI BAR is relocated during PCI allocation, record the changed
address even if usbdebug is not enabled. Use the DBGP_EP_VALID flags
to determine if endpoints have been configured or not.
Change-Id: Idfd52edf7c2fc25b1b225985462ac488264e4c6d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7207
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/drivers/usb/ehci_debug.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 5a62999dc3..1ab6688a3c 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/src/drivers/usb/ehci_debug.c @@ -37,8 +37,7 @@ #define DBGP_CONSOLE_EPIN 2 struct ehci_debug_info { - void *ehci_caps; - void *ehci_regs; + void *ehci_base; void *ehci_debug; struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS]; @@ -562,7 +561,6 @@ static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_ { struct ehci_caps *ehci_caps; struct ehci_regs *ehci_regs; - struct ehci_dbg_port *ehci_debug; struct usb_debug_descriptor dbgp_desc; u32 cmd, ctrl, status, portsc, hcs_params; @@ -573,14 +571,18 @@ static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_ int port_map_tried; int playtimes = 3; + /* Keep all endpoints disabled before any printk() call. */ + memset(info, 0, sizeof (*info)); + info->ehci_base = (void *)ehci_bar; + info->ehci_debug = (void *)(ehci_bar + offset); + dprintk(BIOS_INFO, "ehci_bar: 0x%x debug_offset 0x%x\n", ehci_bar, offset); ehci_caps = (struct ehci_caps *)ehci_bar; ehci_regs = (struct ehci_regs *)(ehci_bar + HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase))); - ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset); - info->ehci_debug = (void *)0; - memset(&info->ep_pipe, 0, sizeof (info->ep_pipe)); + + struct ehci_dbg_port *ehci_debug = info->ehci_debug; if (CONFIG_USBDEBUG_DEFAULT_PORT > 0) ehci_debug_select_port(CONFIG_USBDEBUG_DEFAULT_PORT); @@ -682,6 +684,7 @@ try_next_port: } dprintk(BIOS_INFO, "EHCI done waiting for port.\n"); + /* Enable the debug port */ ctrl = read32((unsigned long)&ehci_debug->control); ctrl |= DBGP_CLAIM; @@ -792,10 +795,6 @@ small_write: } dprintk(BIOS_INFO, "Test write done\n"); - info->ehci_caps = ehci_caps; - info->ehci_regs = ehci_regs; - info->ehci_debug = ehci_debug; - info->ep_pipe[DBGP_SETUP_EP0].status |= DBGP_EP_ENABLED | DBGP_EP_VALID; info->ep_pipe[DBGP_CONSOLE_EPOUT].status |= DBGP_EP_ENABLED | DBGP_EP_VALID; info->ep_pipe[DBGP_CONSOLE_EPIN].status |= DBGP_EP_ENABLED | DBGP_EP_VALID; @@ -861,16 +860,13 @@ void usbdebug_re_enable(unsigned ehci_base) unsigned diff; int i; - if (!dbg_info->ehci_debug) - return; - - diff = (unsigned)dbg_info->ehci_caps - ehci_base; - dbg_info->ehci_regs -= diff; + diff = (unsigned)dbg_info->ehci_base - ehci_base; dbg_info->ehci_debug -= diff; - dbg_info->ehci_caps = (void*)ehci_base; + dbg_info->ehci_base = (void*)ehci_base; for (i=0; i<DBGP_MAX_ENDPOINTS; i++) - dbg_info->ep_pipe[i].status |= DBGP_EP_ENABLED; + if (dbg_info->ep_pipe[i].status & DBGP_EP_VALID) + dbg_info->ep_pipe[i].status |= DBGP_EP_ENABLED; } void usbdebug_disable(void) |