Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: utils/fdt: Factor out common uart node code

Browse Source 
Factor out the common code used by the fdt UART node parsers,
allowing us to drop duplicate code.

Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Andrew Jones
2022-07-18 19:20:25 +02:00
committed by Anup Patel
parent 11c0008862
commit 8e86b23db9
1 changed files with 39 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
lib/utils/fdt/fdt_helper.c
View File

@@ -314,8 +314,10 @@ int fdt_parse_timebase_frequency(void *fdt, unsigned long *freq)
return 0; return 0;
} }
int fdt_parse_gaisler_uart_node(void *fdt, int nodeoffset, static int fdt_parse_uart_node_common(void *fdt, int nodeoffset,
struct platform_uart_data *uart) struct platform_uart_data *uart,
unsigned long default_freq,
unsigned long default_baud)
{ {
int len, rc; int len, rc;
const fdt32_t *val; const fdt32_t *val;
@@ -338,13 +340,28 @@ int fdt_parse_gaisler_uart_node(void *fdt, int nodeoffset,
if (len > 0 && val) if (len > 0 && val)
uart->freq = fdt32_to_cpu(*val); uart->freq = fdt32_to_cpu(*val);
else else
uart->freq = DEFAULT_UART_FREQ; uart->freq = default_freq;
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "current-speed", &len); val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "current-speed", &len);
if (len > 0 && val) if (len > 0 && val)
uart->baud = fdt32_to_cpu(*val); uart->baud = fdt32_to_cpu(*val);
else else
uart->baud = DEFAULT_UART_BAUD; uart->baud = default_baud;
return 0;
}
int fdt_parse_gaisler_uart_node(void *fdt, int nodeoffset,
struct platform_uart_data *uart)
{
int rc;
rc = fdt_parse_uart_node_common(fdt, nodeoffset, uart,
DEFAULT_UART_FREQ,
DEFAULT_UART_BAUD);
if (rc)
return rc;
/* For Gaisler APBUART, the reg-shift and reg-io-width are fixed .*/ /* For Gaisler APBUART, the reg-shift and reg-io-width are fixed .*/
uart->reg_shift = DEFAULT_UART_REG_SHIFT; uart->reg_shift = DEFAULT_UART_REG_SHIFT;
@@ -356,69 +373,26 @@ int fdt_parse_gaisler_uart_node(void *fdt, int nodeoffset,
int fdt_parse_shakti_uart_node(void *fdt, int nodeoffset, int fdt_parse_shakti_uart_node(void *fdt, int nodeoffset,
struct platform_uart_data *uart) struct platform_uart_data *uart)
{ {
int len, rc; int rc;
const fdt32_t *val;
uint64_t reg_addr, reg_size;
if (nodeoffset < 0 || !uart || !fdt) rc = fdt_parse_uart_node_common(fdt, nodeoffset, uart,
return SBI_ENODEV; DEFAULT_SHAKTI_UART_FREQ,
DEFAULT_SHAKTI_UART_BAUD);
rc = fdt_get_node_addr_size(fdt, nodeoffset, 0, return rc ? : 0;
&reg_addr, &reg_size);
if (rc < 0 || !reg_addr || !reg_size)
return SBI_ENODEV;
uart->addr = reg_addr;
/**
* UART address is mandaotry. clock-frequency and current-speed
* may not be present. Don't return error.
*/
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "clock-frequency", &len);
if (len > 0 && val)
uart->freq = fdt32_to_cpu(*val);
else
uart->freq = DEFAULT_SHAKTI_UART_FREQ;
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "current-speed", &len);
if (len > 0 && val)
uart->baud = fdt32_to_cpu(*val);
else
uart->baud = DEFAULT_SHAKTI_UART_BAUD;
return 0;
} }
int fdt_parse_sifive_uart_node(void *fdt, int nodeoffset, int fdt_parse_sifive_uart_node(void *fdt, int nodeoffset,
struct platform_uart_data *uart) struct platform_uart_data *uart)
{ {
int len, rc; int rc;
const fdt32_t *val;
uint64_t reg_addr, reg_size;
if (nodeoffset < 0 || !uart || !fdt) rc = fdt_parse_uart_node_common(fdt, nodeoffset, uart,
return SBI_ENODEV; DEFAULT_SIFIVE_UART_FREQ,
DEFAULT_SIFIVE_UART_BAUD);
rc = fdt_get_node_addr_size(fdt, nodeoffset, 0, if (rc)
&reg_addr, &reg_size); return rc;
if (rc < 0 || !reg_addr || !reg_size)
return SBI_ENODEV;
uart->addr = reg_addr;
/**
* UART address is mandaotry. clock-frequency and current-speed
* may not be present. Don't return error.
*/
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "clock-frequency", &len);
if (len > 0 && val)
uart->freq = fdt32_to_cpu(*val);
else
uart->freq = DEFAULT_SIFIVE_UART_FREQ;
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "current-speed", &len);
if (len > 0 && val)
uart->baud = fdt32_to_cpu(*val);
else
uart->baud = DEFAULT_SIFIVE_UART_BAUD;
/* For SiFive UART, the reg-shift and reg-io-width are fixed .*/ /* For SiFive UART, the reg-shift and reg-io-width are fixed .*/
uart->reg_shift = DEFAULT_SIFIVE_UART_REG_SHIFT; uart->reg_shift = DEFAULT_SIFIVE_UART_REG_SHIFT;
@@ -432,32 +406,13 @@ int fdt_parse_uart8250_node(void *fdt, int nodeoffset,
{ {
int len, rc; int len, rc;
const fdt32_t *val; const fdt32_t *val;
uint64_t reg_addr, reg_size;
if (nodeoffset < 0 || !uart || !fdt) rc = fdt_parse_uart_node_common(fdt, nodeoffset, uart,
return SBI_ENODEV; DEFAULT_UART_FREQ,
DEFAULT_UART_BAUD);
rc = fdt_get_node_addr_size(fdt, nodeoffset, 0, if (rc)
&reg_addr, &reg_size); return rc;
if (rc < 0 || !reg_addr || !reg_size)
return SBI_ENODEV;
uart->addr = reg_addr;
/**
* UART address is mandaotry. clock-frequency and current-speed
* may not be present. Don't return error.
*/
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "clock-frequency", &len);
if (len > 0 && val)
uart->freq = fdt32_to_cpu(*val);
else
uart->freq = DEFAULT_UART_FREQ;
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "current-speed", &len);
if (len > 0 && val)
uart->baud = fdt32_to_cpu(*val);
else
uart->baud = DEFAULT_UART_BAUD;
val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "reg-shift", &len); val = (fdt32_t *)fdt_getprop(fdt, nodeoffset, "reg-shift", &len);
if (len > 0 && val) if (len > 0 && val)
@@ -499,18 +454,10 @@ int fdt_parse_xlnx_uartlite_node(void *fdt, int nodeoffset,
struct platform_uart_data *uart) struct platform_uart_data *uart)
{ {
int rc; int rc;
uint64_t reg_addr, reg_size;
if (nodeoffset < 0 || !uart || !fdt) rc = fdt_parse_uart_node_common(fdt, nodeoffset, uart, 0, 0);
return SBI_ENODEV;
rc = fdt_get_node_addr_size(fdt, nodeoffset, 0, return rc ? : 0;
&reg_addr, &reg_size);
if (rc < 0 || !reg_addr || !reg_size)
return SBI_ENODEV;
uart->addr = reg_addr;
return 0;
} }
int fdt_parse_aplic_node(void *fdt, int nodeoff, struct aplic_data *aplic) int fdt_parse_aplic_node(void *fdt, int nodeoff, struct aplic_data *aplic)