Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fdt/serial: Fix tracing, enhance

Browse Source 
Change-Id: Ibc42267fa1208344dbf9062075dbad7086e4e3d4
This commit is contained in:
Alexander von Gluck IV 2019-06-19 19:28:02 -05:00
parent 75262df789
commit f2762b2d56
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/add-ons/kernel/bus_managers/fdt/fdt_serial.cpp
View File

@ -53,8 +53,10 @@ debug_uart_from_fdt(const void *fdt)
const void *prop; const void *prop;
DebugUART *uart = NULL; DebugUART *uart = NULL;
if (fdt == NULL) if (fdt == NULL) {
TRACE("%s: No FDT found!\n", __func__);
return NULL; return NULL;
}
name = fdt_get_alias(fdt, "serial"); name = fdt_get_alias(fdt, "serial");
if (name == NULL) if (name == NULL)
@ -64,42 +66,48 @@ debug_uart_from_fdt(const void *fdt)
if (name == NULL) if (name == NULL)
name = fdt_get_alias(fdt, "uart0"); name = fdt_get_alias(fdt, "uart0");
// TODO: else use /chosen linux,stdout-path // TODO: else use /chosen linux,stdout-path
if (name == NULL) if (name == NULL) {
TRACE("%s: No known FDT UART alias found!\n", __func__);
return NULL; return NULL;
}
node = fdt_path_offset(fdt, name); node = fdt_path_offset(fdt, name);
if (node < 0) if (node < 0) {
TRACE("%s: FDT node not found!\n", __func__);
return NULL; return NULL;
}
// determine the MMIO address // determine the MMIO address
regs = fdt_get_device_reg(fdt, node, false); regs = fdt_get_device_reg(fdt, node, false);
if (regs == 0) if (regs == 0) {
TRACE("%s: FDT UART regs not found!\n", __func__);
return NULL; return NULL;
}
TRACE(("serial: using '%s', node %d @ %" B_PRIxPHYSADDR "\n", TRACE("serial: using '%s', node %d @ %" B_PRIxPHYSADDR "\n",
name, node, regs)); name, node, regs);
// get the UART clock rate // get the UART clock rate
prop = fdt_getprop(fdt, node, "clock-frequency", &len); prop = fdt_getprop(fdt, node, "clock-frequency", &len);
if (prop && len == 4) { if (prop && len == 4) {
clock = fdt32_to_cpu(*(uint32_t *)prop); clock = fdt32_to_cpu(*(uint32_t *)prop);
TRACE(("serial: clock %ld\n", clock)); TRACE("serial: clock %ld\n", clock);
} }
// get current speed (XXX: not yet passed over) // get current speed (XXX: not yet passed over)
prop = fdt_getprop(fdt, node, "current-speed", &len); prop = fdt_getprop(fdt, node, "current-speed", &len);
if (prop && len == 4) { if (prop && len == 4) {
speed = fdt32_to_cpu(*(uint32_t *)prop); speed = fdt32_to_cpu(*(uint32_t *)prop);
TRACE(("serial: speed %ld\n", speed)); TRACE("serial: speed %ld\n", speed);
} }
// fdt_node_check_compatible returns 0 on match. // fdt_node_check_compatible returns 0 on match.
if (fdt_node_check_compatible(fdt, node, "ns16550a") == 0 if (fdt_node_check_compatible(fdt, node, "ns16550a") == 0
|| fdt_node_check_compatible(fdt, node, "ns16550") == 0) { || fdt_node_check_compatible(fdt, node, "ns16550") == 0) {
TRACE(("serial: Found 8250 serial UART!\n")); TRACE("serial: Found 8250 serial UART!\n");
uart = arch_get_uart_8250(regs, clock); uart = arch_get_uart_8250(regs, clock);
#if defined(__arm__) #if defined(__arm__)
} else if (fdt_node_check_compatible(fdt, node, "ti,omap3-uart") == 0 } else if (fdt_node_check_compatible(fdt, node, "ti,omap3-uart") == 0
@ -109,11 +117,11 @@ debug_uart_from_fdt(const void *fdt)
|| fdt_node_check_compatible(fdt, node, "ti,am4372-uart") == 0 || fdt_node_check_compatible(fdt, node, "ti,am4372-uart") == 0
|| fdt_node_check_compatible(fdt, node, "ti,dra742-uart") == 0) { || fdt_node_check_compatible(fdt, node, "ti,dra742-uart") == 0) {
// TODO: ti,am* and ti,dr* have some special quirks. // TODO: ti,am* and ti,dr* have some special quirks.
TRACE(("serial: Found omap 8250 serial UART!\n")); TRACE("serial: Found omap 8250 serial UART!\n");
uart = arch_get_uart_8250_omap(regs, clock); uart = arch_get_uart_8250_omap(regs, clock);
} else if (fdt_node_check_compatible(fdt, node, "arm,pl011") == 0 } else if (fdt_node_check_compatible(fdt, node, "arm,pl011") == 0
|| fdt_node_check_compatible(fdt, node, "arm,primecell") == 0) { || fdt_node_check_compatible(fdt, node, "arm,primecell") == 0) {
TRACE(("serial: Found pl011 serial UART!\n")); TRACE("serial: Found pl011 serial UART!\n");
uart = arch_get_uart_pl011(regs, clock); uart = arch_get_uart_pl011(regs, clock);
#endif #endif
} else { } else {