Change in coreboot[master]: pci_mmio_cfg: Gather everything MMCONF (ECAM) related

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/58332 )

Change subject: pci_mmio_cfg: Gather everything MMCONF (ECAM) related
......................................................................

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 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58332
Tested-by: build bot (Jenkins) 
Reviewed-by: Shelley Chen 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Angel Pons 
Reviewed-by: Kyösti Mälkki 
---
M src/include/device/pci_mmio_cfg.h
1 file changed, 16 insertions(+), 16 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, but someone else must approve
  Shelley Chen: Looks good to me, approved
  Angel Pons: Looks good to me, but someone else must approve
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h
index e873abc..557adcb 100644
--- a/src/include/device/pci_mmio_cfg.h
+++ b/src/include/device/pci_mmio_cfg.h
@@ -7,10 +7,6 @@
 #include <device/mmio.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_
  * qualify for pointer aliasing with any other objects in memory.
  *
@@ -29,12 +25,28 @@
    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
 volatile union pci_bank *pcicfg(pci_devfn_t dev)
 {
    return (void *)&pci_mmconf[PCI_DEVFN_OFFSET(dev)];
 }

+#endif
+
 static __always_inline
 uint8_t pci_mmio_read_config8(pci_devfn_t dev, uint16_t reg)
 {
@@ -95,18 +107,6 @@
    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
  * for these functions. The _s_ stands for simple, fundamental IO or
  * MMIO variant.