GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/picasso/uart: introduce and use soc_get_uart_ctrlr_info 

Introduce and use soc_get_uart_ctrlr_info to access the uart_info array
to further decouple uart_info from the code as preparation to factor out
most of the code to a common implementation. In order to slightly reduce
the number of function calls, pass the size of and pointer to uart_info
to get_uart_idx as a parameter instead of calling again
soc_get_uart_ctrlr_info in get_uart_idx despite all callers already
having the information form the soc_get_uart_ctrlr_info call.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I474e47059eaebcf0b9b77f66ee993f1963ebee77
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68534
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
This commit is contained in:
Felix Held 2022-10-18 19:59:30 +02:00
parent f1a03b1d6d
commit 6101dcf670
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/soc/amd/picasso/uart.c
View File

@ -33,19 +33,29 @@ static const struct soc_uart_ctrlr_info uart_info[] = {
} }, } },
}; };
uintptr_t get_uart_base(unsigned int idx) static const struct soc_uart_ctrlr_info *soc_get_uart_ctrlr_info(size_t *num_ctrlrs)
{ {
if (idx >= ARRAY_SIZE(uart_info)) *num_ctrlrs = ARRAY_SIZE(uart_info);
return 0; return uart_info;
return uart_info[idx].base;
} }
static enum cb_err get_uart_idx(uintptr_t base, unsigned int *idx) uintptr_t get_uart_base(unsigned int idx)
{
size_t num_ctrlrs;
const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
if (idx >= num_ctrlrs)
return 0;
return ctrlr[idx].base;
}
static enum cb_err get_uart_idx(uintptr_t base, const struct soc_uart_ctrlr_info *ctrlr,
size_t num_ctrlrs, unsigned int *idx)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(uart_info); i++) { for (i = 0; i < num_ctrlrs; i++) {
if (base == uart_info[i].base) { if (base == ctrlr[i].base) {
*idx = i; *idx = i;
return CB_SUCCESS; return CB_SUCCESS;
} }
@ -56,10 +66,13 @@ static enum cb_err get_uart_idx(uintptr_t base, unsigned int *idx)
static enum cb_err get_uart_aoac_device(uintptr_t base, unsigned int *aoac_dev) static enum cb_err get_uart_aoac_device(uintptr_t base, unsigned int *aoac_dev)
{ {
unsigned int idx; unsigned int idx;
if (get_uart_idx(base, &idx) == CB_ERR) size_t num_ctrlrs;
const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
if (get_uart_idx(base, ctrlr, num_ctrlrs, &idx) == CB_ERR)
return CB_ERR; return CB_ERR;
*aoac_dev = uart_info[idx].aoac_device; *aoac_dev = ctrlr[idx].aoac_device;
return CB_SUCCESS; return CB_SUCCESS;
} }
@ -70,17 +83,23 @@ void clear_uart_legacy_config(void)
void set_uart_config(unsigned int idx) void set_uart_config(unsigned int idx)
{ {
if (idx >= ARRAY_SIZE(uart_info)) size_t num_ctrlrs;
const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
if (idx >= num_ctrlrs)
return; return;
gpio_configure_pads(uart_info[idx].mux, 2); gpio_configure_pads(ctrlr[idx].mux, 2);
} }
static const char *uart_acpi_name(const struct device *dev) static const char *uart_acpi_name(const struct device *dev)
{ {
unsigned int idx; unsigned int idx;
if (get_uart_idx(dev->path.mmio.addr, &idx) == CB_SUCCESS) size_t num_ctrlrs;
return uart_info[idx].acpi_name; const struct soc_uart_ctrlr_info *ctrlr = soc_get_uart_ctrlr_info(&num_ctrlrs);
if (get_uart_idx(dev->path.mmio.addr, ctrlr, num_ctrlrs, &idx) == CB_SUCCESS)
return ctrlr[idx].acpi_name;
else else
return NULL; return NULL;
} }