michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/serial/ns16550: Unbreak 64 bit MMIO addresses

Browse source 
PCI devices on 64 bit systems can be mapped anywhere, not just in the
lower 4G of memory.  Remove pointer size assumptions.

Also this removes the use of a struct uart_device_config to store the
(runtime) BAR address.  That struct has other stuff in it, and the
only thing we need is the single MMIO address.  It's also REALLY
confusing to have two "devconf" fields in the device storing values of
the same struct type, some fields of which are used from one of them
but some from the other!

Signed-off-by: Andy Ross <andrew.j.ross@intel.com>
This commit is contained in:
Andy Ross 2020-06-11 05:48:33 -07:00 • committed by Carles Cufí
commit 662835a798
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/serial/uart_ns16550.c
View file

@ -272,7 +272,7 @@ struct uart_ns16550_device_config {
/** Device data structure */
struct uart_ns16550_dev_data_t {
#ifdef UART_NS16550_PCIE_ENABLED
struct uart_device_config devconf;
uint64_t pcimem;
#endif
struct uart_config uart_config;
struct k_spinlock lock;
@ -290,11 +290,11 @@ struct uart_ns16550_dev_data_t {
static const struct uart_driver_api uart_ns16550_driver_api;
static inline uint32_t get_port(struct device *dev)
static inline uintptr_t get_port(struct device *dev)
{
#ifdef UART_NS16550_PCIE_ENABLED
if (DEV_CFG(dev)->pcie) {
return DEV_DATA(dev)->devconf.port;
return (uintptr_t) DEV_DATA(dev)->pcimem;
}
#endif /* UART_NS16550_PCIE_ENABLED */
@ -352,7 +352,7 @@ static int uart_ns16550_configure(struct device *dev,
goto out;
}
dev_data->devconf.port = pcie_get_mbar(dev_cfg->pcie_bdf, 0);
dev_data->pcimem = pcie_get_mbar(dev_cfg->pcie_bdf, 0);
pcie_set_cmd(dev_cfg->pcie_bdf, PCIE_CONF_CMDSTAT_MEM, true);
}
#endif