renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 01:04:08 +08:00
Code

of: earlycon: Move address translation to of_setup_earlycon()

Browse Source 
Cleanup the early DT/earlycon separation; remove the 'addr' parameter
from of_setup_earlycon() and get the uart phys addr directly with a
new wrapper function, of_flat_dt_translate_addr(). Limit
fdt_translate_address() to file scope.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2016-01-16 15:23:44 -08:00 committed by Greg Kroah-Hartman
parent 088da2a176
commit c90fe9c039
5 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/of/fdt.c
View File

@ -827,19 +827,13 @@ static int __init early_init_dt_scan_chosen_serial(void)
return -ENODEV; return -ENODEV;
for (match = __earlycon_table; match < __earlycon_table_end; match++) { for (match = __earlycon_table; match < __earlycon_table_end; match++) {
u64 addr;
if (!match->compatible[0]) if (!match->compatible[0])
continue; continue;
if (fdt_node_check_compatible(fdt, offset, match->compatible)) if (fdt_node_check_compatible(fdt, offset, match->compatible))
continue; continue;
addr = fdt_translate_address(fdt, offset); of_setup_earlycon(match, offset, options);
if (addr == OF_BAD_ADDR)
return -ENXIO;
of_setup_earlycon(addr, match, offset, options);
return 0; return 0;
} }
return -ENODEV; return -ENODEV;

11
drivers/of/fdt_address.c
View File

@ -161,7 +161,7 @@ static int __init fdt_translate_one(const void *blob, int parent,
* that can be mapped to a cpu physical address). This is not really specified * that can be mapped to a cpu physical address). This is not really specified
* that way, but this is traditionally the way IBM at least do things * that way, but this is traditionally the way IBM at least do things
*/ */
u64 __init fdt_translate_address(const void *blob, int node_offset) static u64 __init fdt_translate_address(const void *blob, int node_offset)
{ {
int parent, len; int parent, len;
const struct of_bus *bus, *pbus; const struct of_bus *bus, *pbus;
@ -239,3 +239,12 @@ u64 __init fdt_translate_address(const void *blob, int node_offset)
bail: bail:
return result; return result;
} }
/**
* of_flat_dt_translate_address - translate DT addr into CPU phys addr
* @node: node in the flat blob
*/
u64 __init of_flat_dt_translate_address(unsigned long node)
{
return fdt_translate_address(initial_boot_params, node);
}

12
drivers/tty/serial/earlycon.c
View File

@ -19,6 +19,7 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/of.h>
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#ifdef CONFIG_FIX_EARLYCON_MEM #ifdef CONFIG_FIX_EARLYCON_MEM
@ -218,8 +219,7 @@ early_param("earlycon", param_setup_earlycon);
#ifdef CONFIG_OF_EARLY_FLATTREE #ifdef CONFIG_OF_EARLY_FLATTREE
int __init of_setup_earlycon(unsigned long addr, int __init of_setup_earlycon(const struct earlycon_id *match,
const struct earlycon_id *match,
unsigned long node, unsigned long node,
const char *options) const char *options)
{ {
@ -227,12 +227,18 @@ int __init of_setup_earlycon(unsigned long addr,
struct uart_port *port = &early_console_dev.port; struct uart_port *port = &early_console_dev.port;
const __be32 *val; const __be32 *val;
bool big_endian; bool big_endian;
u64 addr;
spin_lock_init(&port->lock); spin_lock_init(&port->lock);
port->iotype = UPIO_MEM; port->iotype = UPIO_MEM;
addr = of_flat_dt_translate_address(node);
if (addr == OF_BAD_ADDR) {
pr_warn("[%s] bad address\n", match->name);
return -ENXIO;
}
port->mapbase = addr; port->mapbase = addr;
port->uartclk = BASE_BAUD * 16; port->uartclk = BASE_BAUD * 16;
port->membase = earlycon_map(addr, SZ_4K); port->membase = earlycon_map(port->mapbase, SZ_4K);
val = of_get_flat_dt_prop(node, "reg-offset", NULL); val = of_get_flat_dt_prop(node, "reg-offset", NULL);
if (val) if (val)

2
include/linux/of_fdt.h
View File

@ -88,7 +88,7 @@ extern void unflatten_device_tree(void);
extern void unflatten_and_copy_device_tree(void); extern void unflatten_and_copy_device_tree(void);
extern void early_init_devtree(void *); extern void early_init_devtree(void *);
extern void early_get_first_memblock_info(void *, phys_addr_t *); extern void early_get_first_memblock_info(void *, phys_addr_t *);
extern u64 fdt_translate_address(const void *blob, int node_offset); extern u64 of_flat_dt_translate_address(unsigned long node);
extern void of_fdt_limit_memory(int limit); extern void of_fdt_limit_memory(int limit);
#else /* CONFIG_OF_FLATTREE */ #else /* CONFIG_OF_FLATTREE */
static inline void early_init_fdt_scan_reserved_mem(void) {} static inline void early_init_fdt_scan_reserved_mem(void) {}

2
include/linux/serial_core.h
View File

@ -359,7 +359,7 @@ extern const struct earlycon_id __earlycon_table_end[];
#define EARLYCON_DECLARE(_name, fn) OF_EARLYCON_DECLARE(_name, "", fn) #define EARLYCON_DECLARE(_name, fn) OF_EARLYCON_DECLARE(_name, "", fn)
extern int setup_earlycon(char *buf); extern int setup_earlycon(char *buf);
extern int of_setup_earlycon(unsigned long addr, const struct earlycon_id *match, extern int of_setup_earlycon(const struct earlycon_id *match,
unsigned long node, unsigned long node,
const char *options); const char *options);