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

pci_mmio_cfg: Gather everything MMCONF (ECAM) related 

To ease code sharing with other MMIO-based configuration mechanisms,
move everything MMCONF (more specifically ECAM) related to one spot
and guard it.

Change-Id: Idda2320c331499dabbee7447f1ad3e81340f2a25
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58332
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Nico Huber 2021-10-14 18:22:30 +02:00 committed by Nico Huber
parent afe1898607
commit e01e25d4fc
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/include/device/pci_mmio_cfg.h
View File

@ -7,10 +7,6 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_type.h> #include <device/pci_type.h>
/* By not assigning this to CONFIG_MMCONF_BASE_ADDRESS here we
* prevent some sub-optimal constant folding. */
extern u8 *const pci_mmconf;
/* Using a unique datatype for MMIO writes makes the pointers to _not_ /* Using a unique datatype for MMIO writes makes the pointers to _not_
* qualify for pointer aliasing with any other objects in memory. * qualify for pointer aliasing with any other objects in memory.
* *
@ -29,12 +25,28 @@ union pci_bank {
uint32_t reg32[4096 / sizeof(uint32_t)]; uint32_t reg32[4096 / sizeof(uint32_t)];
}; };
#if CONFIG(MMCONF_SUPPORT)
#if CONFIG_MMCONF_BASE_ADDRESS == 0
#error "CONFIG_MMCONF_BASE_ADDRESS undefined!"
#endif
#if CONFIG_MMCONF_BUS_NUMBER * MiB != CONFIG_MMCONF_LENGTH
#error "CONFIG_MMCONF_LENGTH does not correspond with CONFIG_MMCONF_BUS_NUMBER!"
#endif
/* By not assigning this to CONFIG_MMCONF_BASE_ADDRESS here we
prevent some sub-optimal constant folding. */
extern u8 *const pci_mmconf;
static __always_inline static __always_inline
volatile union pci_bank *pcicfg(pci_devfn_t dev) volatile union pci_bank *pcicfg(pci_devfn_t dev)
{ {
return (void *)&pci_mmconf[PCI_DEVFN_OFFSET(dev)]; return (void *)&pci_mmconf[PCI_DEVFN_OFFSET(dev)];
} }
#endif
static __always_inline static __always_inline
uint8_t pci_mmio_read_config8(pci_devfn_t dev, uint16_t reg) uint8_t pci_mmio_read_config8(pci_devfn_t dev, uint16_t reg)
{ {
@ -95,18 +107,6 @@ uint32_t *pci_mmio_config32_addr(pci_devfn_t dev, uint16_t reg)
return (uint32_t *)&pcicfg(dev)->reg32[reg / sizeof(uint32_t)]; return (uint32_t *)&pcicfg(dev)->reg32[reg / sizeof(uint32_t)];
} }
#if CONFIG(MMCONF_SUPPORT)
#if CONFIG_MMCONF_BASE_ADDRESS == 0
#error "CONFIG_MMCONF_BASE_ADDRESS undefined!"
#endif
#if CONFIG_MMCONF_BUS_NUMBER * MiB != CONFIG_MMCONF_LENGTH
#error "CONFIG_MMCONF_LENGTH does not correspond with CONFIG_MMCONF_BUS_NUMBER!"
#endif
#endif
/* Avoid name collisions as different stages have different signature /* Avoid name collisions as different stages have different signature
* for these functions. The _s_ stands for simple, fundamental IO or * for these functions. The _s_ stands for simple, fundamental IO or
* MMIO variant. * MMIO variant.