[coreboot-gerrit] Patch set updated for coreboot: 31998cd usbdebug: Split endpoint buffers
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Wed Jul 10 11:14:41 CEST 2013
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3726
-gerrit
commit 31998cd59f64ea8d2f8a9ff03a693bd1b6e32e19
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Mon Jul 8 18:11:44 2013 +0300
usbdebug: Split endpoint buffers
Refactor the structure to better support receive and another
set of endpoints over usbdebug.
Change-Id: Ib0f76afdf4e638363ff30c67010920142c58f250
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/include/usbdebug.h | 45 +++++++++++++++++++-----------
src/lib/usbdebug.c | 76 ++++++++++++++++++++++++++++++--------------------
2 files changed, 74 insertions(+), 47 deletions(-)
diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h
index e32410e..e0bd6c9 100644
--- a/src/include/usbdebug.h
+++ b/src/include/usbdebug.h
@@ -40,16 +40,27 @@ void pci_ehci_read_resources(struct device *dev);
#endif
#endif
+struct dbgp_pipe
+{
+ u8 ep_index;
+ u8 bufidx;
+ char buf[8];
+};
+
+#define DBGP_MAX_ENDPOINTS 4
+#define DBGP_CONSOLE_EPOUT 0
+#define DBGP_CONSOLE_EPIN 1
+
struct ehci_debug_info {
- void *ehci_caps;
- void *ehci_regs;
- void *ehci_debug;
- u32 devnum;
- u32 endpoint_out;
- u32 endpoint_in;
- char buf[8];
- u8 bufidx;
- u8 status;
+ u8 devnum;
+ u8 endpoint[DBGP_MAX_ENDPOINTS];
+ u8 ep_status[DBGP_MAX_ENDPOINTS];
+
+ void *ehci_caps;
+ void *ehci_regs;
+ void *ehci_debug;
+
+ struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS];
};
#define DBGP_EP_VALID (1<<0)
@@ -57,15 +68,15 @@ struct ehci_debug_info {
#define DBGP_EP_STATMASK (DBGP_EP_VALID | DBGP_EP_ENABLED)
void enable_usbdebug(unsigned int port);
-int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size);
-int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size);
void set_debug_port(unsigned port);
int usbdebug_init(void);
-struct ehci_debug_info *dbgp_ehci_info(void);
-#define dbgp_console_output dbgp_ehci_info
-#define dbgp_console_input dbgp_ehci_info
-int dbgp_ep_is_active(struct ehci_debug_info *dbg_info);
-void usbdebug_tx_byte(struct ehci_debug_info *info, unsigned char data);
-void usbdebug_tx_flush(struct ehci_debug_info *info);
+
+struct dbgp_pipe *dbgp_console_output(void);
+struct dbgp_pipe *dbgp_console_input(void);
+int dbgp_ep_is_active(struct dbgp_pipe *pipe);
+int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size);
+int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size);
+void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data);
+void usbdebug_tx_flush(struct dbgp_pipe *pipe);
#endif
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index f3c0d05..e8a07eb 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -210,10 +210,11 @@ static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug,
return ret;
}
-int dbgp_bulk_write_x(struct ehci_debug_info *dbg_info, const char *bytes, int size)
+int dbgp_bulk_write_x(struct dbgp_pipe *pipe, const char *bytes, int size)
{
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
return dbgp_bulk_write(dbg_info->ehci_debug, dbg_info->devnum,
- dbg_info->endpoint_out, bytes, size);
+ dbg_info->endpoint[pipe->ep_index], bytes, size);
}
static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum,
@@ -247,10 +248,11 @@ static int dbgp_bulk_read(struct ehci_dbg_port *ehci_debug, unsigned devnum,
return ret;
}
-int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size)
+int dbgp_bulk_read_x(struct dbgp_pipe *pipe, void *data, int size)
{
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
return dbgp_bulk_read(dbg_info->ehci_debug, dbg_info->devnum,
- dbg_info->endpoint_in, data, size, DBGP_LOOPS);
+ dbg_info->endpoint[pipe->ep_index], data, size, DBGP_LOOPS);
}
static void dbgp_mdelay(int ms)
@@ -374,8 +376,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;
- unsigned dbgp_endpoint_out;
- unsigned dbgp_endpoint_in;
struct usb_debug_descriptor dbgp_desc;
u32 cmd, ctrl, status, portsc, hcs_params;
@@ -391,8 +391,12 @@ static int usbdebug_init_(unsigned ehci_bar, unsigned offset, struct ehci_debug_
HC_LENGTH(read32((unsigned long)&ehci_caps->hc_capbase)));
ehci_debug = (struct ehci_dbg_port *)(ehci_bar + offset);
info->ehci_debug = (void *)0;
- info->bufidx = 0;
- info->status = 0;
+
+ memset(&info->ep_pipe, 0, sizeof (info->ep_pipe));
+ for (i=0; i<DBGP_MAX_ENDPOINTS; i++) {
+ info->ep_status[i] = 0;
+ info->ep_pipe[i].ep_index = i;
+ }
try_next_time:
port_map_tried = 0;
@@ -511,8 +515,6 @@ try_next_port:
ret = -6;
goto err;
}
- dbgp_endpoint_out = dbgp_desc.bDebugOutEndpoint;
- dbgp_endpoint_in = dbgp_desc.bDebugInEndpoint;
/* Move the device to 127 if it isn't already there */
if (devnum != USB_DEBUG_DEVNUM) {
@@ -541,7 +543,7 @@ try_next_port:
dbgp_printk("EHCI debug interface enabled.\n");
/* Perform a small write to get the even/odd data state in sync */
- ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_endpoint_out, "USB\r\n",5);
+ ret = dbgp_bulk_write(ehci_debug, USB_DEBUG_DEVNUM, dbgp_desc.bDebugOutEndpoint, "USB\r\n",5);
if (ret < 0) {
dbgp_printk("dbgp_bulk_write failed: %d\n", ret);
ret = -9;
@@ -553,10 +555,11 @@ try_next_port:
info->ehci_regs = ehci_regs;
info->ehci_debug = ehci_debug;
info->devnum = devnum;
- info->endpoint_out = dbgp_endpoint_out;
- info->endpoint_in = dbgp_endpoint_in;
- info->status |= DBGP_EP_ENABLED | DBGP_EP_VALID;
+ info->endpoint[DBGP_CONSOLE_EPOUT] = dbgp_desc.bDebugOutEndpoint;
+ info->endpoint[DBGP_CONSOLE_EPIN] = dbgp_desc.bDebugInEndpoint;
+ info->ep_status[DBGP_CONSOLE_EPOUT] |= DBGP_EP_ENABLED | DBGP_EP_VALID;
+ info->ep_status[DBGP_CONSOLE_EPIN] |= DBGP_EP_ENABLED | DBGP_EP_VALID;
return 0;
err:
/* Things didn't work so remove my claim */
@@ -581,22 +584,22 @@ next_debug_port:
return -10;
}
-void usbdebug_tx_byte(struct ehci_debug_info *dbg_info, unsigned char data)
+void usbdebug_tx_byte(struct dbgp_pipe *pipe, unsigned char data)
{
- if (dbgp_is_ep_active(dbg_info)) {
- dbg_info->buf[dbg_info->bufidx++] = data;
- if (dbg_info->bufidx >= 8) {
- dbgp_bulk_write_x(dbg_info, dbg_info->buf, dbg_info->bufidx);
- dbg_info->bufidx = 0;
+ if (dbgp_ep_is_active(pipe)) {
+ pipe->buf[pipe->bufidx++] = data;
+ if (pipe->bufidx >= 8) {
+ dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx);
+ pipe->bufidx = 0;
}
}
}
-void usbdebug_tx_flush(struct ehci_debug_info *dbg_info)
+void usbdebug_tx_flush(struct dbgp_pipe *pipe)
{
- if (dbgp_is_ep_active(dbg_info) && dbg_info->bufidx > 0) {
- dbgp_bulk_write_x(dbg_info, dbg_info->buf, dbg_info->bufidx);
- dbg_info->bufidx = 0;
+ if (dbgp_ep_is_active(pipe) && pipe->bufidx > 0) {
+ dbgp_bulk_write_x(pipe, pipe->buf, pipe->bufidx);
+ pipe->bufidx = 0;
}
}
@@ -605,6 +608,7 @@ static void usbdebug_re_enable(unsigned ehci_base)
{
struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
unsigned diff;
+ int i;
if (!dbg_info->ehci_debug)
return;
@@ -613,13 +617,17 @@ static void usbdebug_re_enable(unsigned ehci_base)
dbg_info->ehci_regs -= diff;
dbg_info->ehci_debug -= diff;
dbg_info->ehci_caps = (void*)ehci_base;
- dbg_info->status |= DBGP_EP_ENABLED;
+
+ for (i=0; i<DBGP_MAX_ENDPOINTS; i++)
+ dbg_info->ep_status[i] |= DBGP_EP_ENABLED;
}
static void usbdebug_disable(void)
{
struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
- dbg_info->status &= ~DBGP_EP_ENABLED;
+ int i;
+ for (i=0; i<DBGP_MAX_ENDPOINTS; i++)
+ dbg_info->ep_status[i] &= ~DBGP_EP_ENABLED;
}
static void pci_ehci_set_resources(struct device *dev)
@@ -656,14 +664,22 @@ void pci_ehci_read_resources(struct device *dev)
}
#endif
-int dbgp_ep_is_active(struct ehci_debug_info *dbg_info)
+int dbgp_ep_is_active(struct dbgp_pipe *pipe)
{
- return (dbg_info->status & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED);
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ return (dbg_info->ep_status[pipe->ep_index] & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED);
+}
+
+struct dbgp_pipe *dbgp_console_output(void)
+{
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ return &dbg_info->ep_pipe[DBGP_CONSOLE_EPOUT];
}
-struct ehci_debug_info *dbgp_ehci_info(void)
+struct dbgp_pipe *dbgp_console_input(void)
{
- return car_get_var_ptr(&glob_dbg_info);
+ struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ return &dbg_info->ep_pipe[DBGP_CONSOLE_EPIN];
}
int usbdebug_init(void)
More information about the coreboot-gerrit
mailing list