sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common/uart: Use simple(_s_) variants of PCI functions

Browse Source 
This change updates various uart_* functions to use simple(_s_)
variants of PCI functions. This is done for a few reasons:

* __SIMPLE_DEVICE__ check can be dropped since the same data type can
  be used in early stages and ramstage.
* Removes the requirement on early stage to walk the device tree to
  get access to the device structure. This allows linker-based device
  tree optimizations for early stages.

As part of this change, uart_get_device() is refactored and a new
function uart_console_get_devfn() is added which returns pci_devfn_t
in MMCONF format. It is then used directly by the _s_ variants of PCI
functions.

Change-Id: I344037828118572ae5eb27c82c496d5e7a508a53
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49213
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
This commit is contained in:
Furquan Shaikh 2021-01-07 00:16:35 -08:00 committed by Patrick Georgi
parent 4fa183fe79
commit 582a0e2dbc
1 changed files with 35 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/soc/intel/common/block/uart/uart.c
View File

@ -23,10 +23,10 @@
extern const struct uart_controller_config uart_ctrlr_config[]; extern const struct uart_controller_config uart_ctrlr_config[];
extern const int uart_max_index; extern const int uart_max_index;
static void uart_lpss_init(const struct device *dev, uintptr_t baseaddr) static void uart_lpss_init(pci_devfn_t dev, uintptr_t baseaddr)
{ {
/* Ensure controller is in D0 state */ /* Ensure controller is in D0 state */
lpss_set_power_state(PCI_BDF(dev), STATE_D0); lpss_set_power_state(dev, STATE_D0);
/* Take UART out of reset */ /* Take UART out of reset */
lpss_reset_release(baseaddr); lpss_reset_release(baseaddr);
@ -58,60 +58,49 @@ static int uart_get_valid_index(void)
return UART_CONSOLE_INVALID_INDEX; return UART_CONSOLE_INVALID_INDEX;
} }
static void uart_common_init(const struct device *device, uintptr_t baseaddr) static pci_devfn_t uart_console_get_pci_bdf(void)
{ {
#if defined(__SIMPLE_DEVICE__) int devfn;
pci_devfn_t dev = PCI_BDF(device); int index;
#else
const struct device *dev = device;
#endif
/* Set UART base address */
pci_write_config32(dev, PCI_BASE_ADDRESS_0, baseaddr);
/* Enable memory access and bus master */
pci_write_config16(dev, PCI_COMMAND, UART_PCI_ENABLE);
uart_lpss_init(device, baseaddr);
}
const struct device *uart_get_device(void)
{
/* /*
* This function will get called even if INTEL_LPSS_UART_FOR_CONSOLE * This function will get called even if INTEL_LPSS_UART_FOR_CONSOLE
* config option is not selected. * config option is not selected.
* By default return NULL in this case to avoid compilation errors. * By default return NULL in this case to avoid compilation errors.
*/ */
if (!CONFIG(INTEL_LPSS_UART_FOR_CONSOLE)) if (!CONFIG(INTEL_LPSS_UART_FOR_CONSOLE))
return PCI_DEV_INVALID;
index = uart_get_valid_index();
if (index == UART_CONSOLE_INVALID_INDEX)
return PCI_DEV_INVALID;
devfn = uart_ctrlr_config[index].devfn;
return PCI_DEV(0, PCI_SLOT(devfn), PCI_FUNC(devfn));
}
const struct device *uart_get_device(void)
{
pci_devfn_t dev = uart_console_get_pci_bdf();
if (dev == PCI_DEV_INVALID)
return NULL; return NULL;
int console_index = uart_get_valid_index(); return pcidev_path_on_root(PCI_DEV2DEVFN(dev));
if (console_index != UART_CONSOLE_INVALID_INDEX)
return pcidev_path_on_root(uart_ctrlr_config[console_index].devfn);
else
return NULL;
} }
bool uart_is_controller_initialized(void) bool uart_is_controller_initialized(void)
{ {
uintptr_t base; uintptr_t base;
const struct device *dev_uart = uart_get_device(); pci_devfn_t dev = uart_console_get_pci_bdf();
if (!dev_uart) if (dev == PCI_DEV_INVALID)
return false; return false;
#if defined(__SIMPLE_DEVICE__) base = pci_s_read_config32(dev, PCI_BASE_ADDRESS_0) & ~0xFFF;
pci_devfn_t dev = PCI_BDF(dev_uart);
#else
const struct device *dev = dev_uart;
#endif
base = pci_read_config32(dev, PCI_BASE_ADDRESS_0) & ~0xFFF;
if (!base) if (!base)
return false; return false;
if ((pci_read_config16(dev, PCI_COMMAND) & UART_PCI_ENABLE) if ((pci_s_read_config16(dev, PCI_COMMAND) & UART_PCI_ENABLE)
!= UART_PCI_ENABLE) != UART_PCI_ENABLE)
return false; return false;
@ -129,15 +118,19 @@ static void uart_configure_gpio_pads(void)
void uart_bootblock_init(void) void uart_bootblock_init(void)
{ {
const struct device *dev_uart; const uint32_t baseaddr = CONFIG_CONSOLE_UART_BASE_ADDRESS;
pci_devfn_t dev = uart_console_get_pci_bdf();
dev_uart = uart_get_device(); if (dev == PCI_DEV_INVALID)
if (!dev_uart)
return; return;
/* Program UART BAR0, command, reset and clock register */ /* Set UART base address */
uart_common_init(dev_uart, CONFIG_CONSOLE_UART_BASE_ADDRESS); pci_s_write_config32(dev, PCI_BASE_ADDRESS_0, baseaddr);
/* Enable memory access and bus master */
pci_s_write_config16(dev, PCI_COMMAND, UART_PCI_ENABLE);
uart_lpss_init(dev, baseaddr);
/* Configure the 2 pads per UART. */ /* Configure the 2 pads per UART. */
uart_configure_gpio_pads(); uart_configure_gpio_pads();
@ -224,7 +217,7 @@ static void uart_common_enable_resources(struct device *dev)
base = pci_read_config32(dev, PCI_BASE_ADDRESS_0) & ~0xFFF; base = pci_read_config32(dev, PCI_BASE_ADDRESS_0) & ~0xFFF;
if (base) if (base)
uart_lpss_init(dev, base); uart_lpss_init(PCI_BDF(dev), base);
} }
} }