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

usbdebug: Remove option DEBUG_USBDEBUG

Browse Source 
Superseeded with DEBUG_CONSOLE_INIT.

For dbgp_print_data() return early and skip reading
registers when dprintk() would not get printed anyways.

Change-Id: Idf470b8572ad992c8d4684a860412d9140f514ca
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30878
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kyösti Mälkki
2019-01-10 13:07:42 +02:00
parent 6627795289
commit 8c1258ab8b
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Kconfig
View File

@ -961,16 +961,6 @@ config DEBUG_SPI_FLASH
help help
This option enables additional SPI flash related debug messages. This option enables additional SPI flash related debug messages.
config DEBUG_USBDEBUG
bool "Output verbose USB 2.0 EHCI debug dongle messages"
default n
depends on USBDEBUG
help
This option enables additional USB 2.0 debug dongle related messages.
Select this to debug the connection of usbdebug dongle. Note that
you need some other working console to receive the messages.
if SOUTHBRIDGE_INTEL_BD82X6X && DEFAULT_CONSOLE_LOGLEVEL_8 if SOUTHBRIDGE_INTEL_BD82X6X && DEFAULT_CONSOLE_LOGLEVEL_8
# Only visible with the right southbridge and loglevel. # Only visible with the right southbridge and loglevel.
config DEBUG_INTEL_ME config DEBUG_INTEL_ME

29
src/drivers/usb/ehci_debug.c
View File

@ -34,13 +34,14 @@ struct ehci_debug_info {
struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS]; struct dbgp_pipe ep_pipe[DBGP_MAX_ENDPOINTS];
}; };
#if IS_ENABLED(CONFIG_DEBUG_USBDEBUG) #if IS_ENABLED(CONFIG_DEBUG_CONSOLE_INIT)
static void dbgp_print_data(struct ehci_dbg_port *ehci_debug); /* When selected, you can debug the connection of usbdebug dongle.
static int dbgp_enabled(void); * EHCI port register bits and USB packets are dumped on console,
* assuming some other console already works.
*/
# define dprintk(LEVEL, args...) \ # define dprintk(LEVEL, args...) \
do { if (!dbgp_enabled()) printk(LEVEL, ##args); } while (0) do { if (!dbgp_enabled()) printk(LEVEL, ##args); } while (0)
#else #else
# define dbgp_print_data(x) do {} while (0)
# define dprintk(LEVEL, args...) do {} while (0) # define dprintk(LEVEL, args...) do {} while (0)
#endif #endif
@ -57,6 +58,9 @@ static int dbgp_enabled(void);
#define DBGP_MICROFRAME_RETRIES 10 #define DBGP_MICROFRAME_RETRIES 10
#define DBGP_MAX_PACKET 8 #define DBGP_MAX_PACKET 8
static int dbgp_enabled(void);
static void dbgp_print_data(struct ehci_dbg_port *ehci_debug);
static struct ehci_debug_info glob_dbg_info CAR_GLOBAL; static struct ehci_debug_info glob_dbg_info CAR_GLOBAL;
static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL; static struct ehci_debug_info * glob_dbg_info_p CAR_GLOBAL;
@ -202,13 +206,19 @@ static void dbgp_get_data(struct ehci_dbg_port *ehci_debug, void *buf, int size)
bytes[i] = (hi >> (8*(i - 4))) & 0xff; bytes[i] = (hi >> (8*(i - 4))) & 0xff;
} }
#if IS_ENABLED(CONFIG_DEBUG_USBDEBUG)
static void dbgp_print_data(struct ehci_dbg_port *ehci_debug) static void dbgp_print_data(struct ehci_dbg_port *ehci_debug)
{ {
u32 ctrl = read32(&ehci_debug->control); int len;
u32 lo = read32(&ehci_debug->data03); u32 ctrl, lo, hi;
u32 hi = read32(&ehci_debug->data47);
int len = DBGP_LEN(ctrl); if (!IS_ENABLED(CONFIG_DEBUG_CONSOLE_INIT) || dbgp_enabled())
return;
ctrl = read32(&ehci_debug->control);
lo = read32(&ehci_debug->data03);
hi = read32(&ehci_debug->data47);
len = DBGP_LEN(ctrl);
if (len) { if (len) {
int i; int i;
dprintk(BIOS_SPEW, "dbgp: buf:"); dprintk(BIOS_SPEW, "dbgp: buf:");
@ -219,7 +229,6 @@ static void dbgp_print_data(struct ehci_dbg_port *ehci_debug)
dprintk(BIOS_SPEW, "\n"); dprintk(BIOS_SPEW, "\n");
} }
} }
#endif
static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe, static int dbgp_bulk_write(struct ehci_dbg_port *ehci_debug, struct dbgp_pipe *pipe,
const char *bytes, int size) const char *bytes, int size)