device/pci_early: Fixes for __SIMPLE_DEVICE__

The feature is used to enable PCI MMIO accesses behind
PCIe links (or bridges) before PCI enumeration has been
completed.

Add the feature for bootblock, verstage and postcar, it
is required with add-on PCIe serial cards for early
console output. It's up to the board specific code to
configure PCIe root port prior to calling console_init()
for this to work.

Remove feature from ramstage, it bypasses any resource
allocations and bus number assignments.

For the moment PCI configuration support before ramstage
is available only on ARCH_X86.

Also switch from device_t to pci_devfn_t.

Change-Id: I08acec68b6f17f4d73d30039cc41274492ea4f45
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30496
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

4 files changed, 29 insertions, 17 deletions

diff --git a/src/console/init.c b/src/console/init.c
index 8f71b09881..f35dd51beb 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -72,8 +72,9 @@ asmlinkage void console_init(void)
 {
 	init_log_level();
 
-#if IS_ENABLED(CONFIG_EARLY_PCI_BRIDGE) && !defined(__SMM__)
-	pci_early_bridge_init();
+#if IS_ENABLED(CONFIG_EARLY_PCI_BRIDGE)
+	if (!ENV_SMM && !ENV_RAMSTAGE)
+		pci_early_bridge_init();
 #endif
 
 	console_hw_init();
diff --git a/src/device/Makefile.inc b/src/device/Makefile.inc
index 05dbe742fb..bed0f718ee 100644
--- a/src/device/Makefile.inc
+++ b/src/device/Makefile.inc
@@ -27,7 +27,13 @@ smm-y += device_const.c
 verstage-y += device_const.c
 romstage-y += device_const.c
 ramstage-y += device_const.c
+
+ifeq ($(CONFIG_ARCH_X86),y)
+bootblock-$(CONFIG_PCI) += pci_early.c
+verstage-$(CONFIG_PCI) += pci_early.c
 romstage-$(CONFIG_PCI) += pci_early.c
+postcar-$(CONFIG_PCI) += pci_early.c
+endif
 
 subdirs-y += oprom dram
 
diff --git a/src/device/pci_early.c b/src/device/pci_early.c
index 6baebe0c28..4cf8c7e68c 100644
--- a/src/device/pci_early.c
+++ b/src/device/pci_early.c
@@ -20,7 +20,7 @@
 #include <device/pci_def.h>
 #include <delay.h>
 
-#ifdef __PRE_RAM__
+#if !ENV_RAMSTAGE
 unsigned pci_find_next_capability(pci_devfn_t dev, unsigned cap, unsigned last)
 {
 	unsigned pos = 0;
@@ -68,12 +68,11 @@ unsigned pci_find_capability(pci_devfn_t dev, unsigned cap)
 {
 	return pci_find_next_capability(dev, cap, 0);
 }
-#endif /* __PRE_RAM__ */
-
+#endif
 
 #if IS_ENABLED(CONFIG_EARLY_PCI_BRIDGE)
 
-static void pci_bridge_reset_secondary(device_t p2p_bridge)
+static void pci_bridge_reset_secondary(pci_devfn_t p2p_bridge)
 {
 	u16 reg16;
 
@@ -90,7 +89,7 @@ static void pci_bridge_reset_secondary(device_t p2p_bridge)
 	pci_write_config16(p2p_bridge, PCI_BRIDGE_CONTROL, reg16);
 }
 
-static void pci_bridge_set_secondary(device_t p2p_bridge, u8 secondary)
+static void pci_bridge_set_secondary(pci_devfn_t p2p_bridge, u8 secondary)
 {
 	/* Disable config transaction forwarding. */
 	pci_write_config8(p2p_bridge, PCI_SECONDARY_BUS, 0x00);
@@ -100,7 +99,7 @@ static void pci_bridge_set_secondary(device_t p2p_bridge, u8 secondary)
 	pci_write_config8(p2p_bridge, PCI_SUBORDINATE_BUS, secondary);
 }
 
-static void pci_bridge_set_mmio(device_t p2p_bridge, u32 base, u32 size)
+static void pci_bridge_set_mmio(pci_devfn_t p2p_bridge, u32 base, u32 size)
 {
 	u16 reg16;
 
@@ -122,27 +121,20 @@ static void pci_bridge_set_mmio(device_t p2p_bridge, u32 base, u32 size)
 	pci_write_config16(p2p_bridge, PCI_COMMAND, reg16);
 }
 
-void pci_early_bridge_init(void)
+void pci_early_mmio_window(pci_devfn_t p2p_bridge, u32 mmio_base, u32 mmio_size)
 {
 	int timeout, ret = -1;
 
-	/* No PCI-to-PCI bridges are enabled yet, so the one we try to
-	 * configure must have its primary on bus 0.
-	 */
-	pci_devfn_t p2p_bridge = PCI_DEV(0, CONFIG_EARLY_PCI_BRIDGE_DEVICE,
-		CONFIG_EARLY_PCI_BRIDGE_FUNCTION);
-
 	/* Secondary bus number is mostly irrelevant as we disable
 	 * configuration transactions right after the probe.
 	 */
 	u8 secondary = 15;
 	u8 dev = 0;
-	u32 mmio_base = CONFIG_EARLY_PCI_MMIO_BASE;
 
 	/* Enable configuration and MMIO over bridge. */
 	pci_bridge_reset_secondary(p2p_bridge);
 	pci_bridge_set_secondary(p2p_bridge, secondary);
-	pci_bridge_set_mmio(p2p_bridge, mmio_base, 0x4000);
+	pci_bridge_set_mmio(p2p_bridge, mmio_base, mmio_size);
 
 	for (timeout = 20000; timeout; timeout--) {
 		u32 id = pci_read_config32(PCI_DEV(secondary, dev, 0), PCI_VENDOR_ID);
@@ -164,4 +156,15 @@ void pci_early_bridge_init(void)
 	 */
 	pci_bridge_set_secondary(p2p_bridge, 0);
 }
+
+void pci_early_bridge_init(void)
+{
+	/* No PCI-to-PCI bridges are enabled yet, so the one we try to
+	 * configure must have its primary on bus 0.
+	 */
+	pci_devfn_t p2p_bridge = PCI_DEV(0, CONFIG_EARLY_PCI_BRIDGE_DEVICE,
+		CONFIG_EARLY_PCI_BRIDGE_FUNCTION);
+
+	pci_early_mmio_window(p2p_bridge, CONFIG_EARLY_PCI_MMIO_BASE, 0x4000);
+}
 #endif /* CONFIG_EARLY_PCI_BRIDGE */
diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index f1ab91bbc7..7cf7e0695e 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -145,6 +145,8 @@ unsigned int pci_find_capability(struct device *dev, unsigned int cap);
 #endif /* __SIMPLE_DEVICE__ */
 
 void pci_early_bridge_init(void);
+void pci_early_mmio_window(pci_devfn_t p2p_bridge, u32 mmio_base,
+			   u32 mmio_size);
 int pci_early_device_probe(u8 bus, u8 dev, u32 mmio_base);
 
 #ifndef __ROMCC__