U-Boot: initialize the debug UART using FDT hints when possible

* we first try to find 'serial', 'serial0' or 'serial1' in /aliases
* extract the required properties from the found node and use them
* fallback to the hardcoded UART from the board definition header
This commit is contained in:
François Revol 2012-08-24 21:20:09 +02:00
parent 513f67f193
commit 74eeabe4a6
3 changed files with 95 additions and 6 deletions

View File

@ -17,6 +17,12 @@
#include <new>
#include <string.h>
extern "C" {
#include <fdt.h>
#include <libfdt.h>
#include <libfdt_env.h>
};
DebugUART* gUART;
@ -90,11 +96,94 @@ serial_cleanup(void)
}
extern "C" void
serial_init(void)
static void
serial_init_fdt(const void *fdt)
{
gUART = arch_get_uart_8250(BOARD_UART_DEBUG, BOARD_UART_CLOCK);
if (gUART == 0)
const char *name;
const char *type;
int node;
int len;
phys_addr_t regs;
int32 clock = 0;
int32 speed = 0;
const void *prop;
if (fdt == NULL)
return;
name = fdt_get_alias(fdt, "serial");
if (name == NULL)
name = fdt_get_alias(fdt, "serial0");
if (name == NULL)
name = fdt_get_alias(fdt, "serial1");
// TODO: else use /chosen linux,stdout-path
if (name == NULL)
return;
node = fdt_path_offset(fdt, name);
//dprintf("serial: using '%s', node %d\n", name, node);
if (node < 0)
return;
type = (const char *)fdt_getprop(fdt, node, "device_type", &len);
//dprintf("serial: type: '%s'\n", type);
if (type == NULL || strcmp(type, "serial"))
return;
// determine the MMIO address
// TODO: ppc640 use 64bit addressing, but U-Boot seems to map it below 4G,
// and the FDT is not very clear. libfdt is also getting 64bit addr support.
// so FIXME someday.
prop = fdt_getprop(fdt, node, "virtual-reg", &len);
if (prop && len == 4) {
regs = fdt32_to_cpu(*(uint32_t *)prop);
//dprintf("serial: virtual-reg 0x%08llx\n", (int64)regs);
} else {
prop = fdt_getprop(fdt, node, "reg", &len);
if (prop && len >= 4) {
regs = fdt32_to_cpu(*(uint32_t *)prop);
//dprintf("serial: reg 0x%08llx\n", (int64)regs);
} else
return;
}
// get the UART clock rate
prop = fdt_getprop(fdt, node, "clock-frequency", &len);
if (prop && len == 4) {
clock = fdt32_to_cpu(*(uint32_t *)prop);
//dprintf("serial: clock %ld\n", clock);
}
// get current speed (XXX: not yet passed over)
prop = fdt_getprop(fdt, node, "current-speed", &len);
if (prop && len == 4) {
speed = fdt32_to_cpu(*(uint32_t *)prop);
//dprintf("serial: speed %ld\n", speed);
}
if (fdt_node_check_compatible(fdt, node, "ns16550a") == 1
|| fdt_node_check_compatible(fdt, node, "ns16550") == 1) {
gUART = arch_get_uart_8250(regs, clock);
//dprintf("serial: using 8250\n");
return;
}
}
extern "C" void
serial_init(const void *fdt)
{
// first try with hints from the FDT
serial_init_fdt(fdt);
#ifdef BOARD_UART_DEBUG
// fallback to hardcoded board UART
if (gUART == NULL)
gUART = arch_get_uart_8250(BOARD_UART_DEBUG, BOARD_UART_CLOCK);
#endif
if (gUART == NULL)
return;
serial_enable();

View File

@ -13,7 +13,7 @@
extern "C" {
#endif
extern void serial_init(void);
extern void serial_init(const void *fdt);
extern void serial_cleanup(void);
extern void serial_puts(const char *string, size_t size);

View File

@ -167,7 +167,7 @@ start_raw(int argc, const char **argv)
args.platform.boot_tgz_data = NULL;
args.platform.boot_tgz_size = 0;
serial_init();
serial_init(gFDT);
console_init();
cpu_init();