From 3f98d41b6e546223d8a13245ad197f0d67b4e094 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 29 Jul 2019 16:38:14 +0300
Subject: device/pci_ops: Make PCI_BDF() available in all stages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Caller needs to take into account that bus numbers may
have not been assigned yet. Same issue existed before
with early ramstage and mostly does not cause problems
when used with static devices on bus 0.

Change-Id: I4865b4277dbc858c8c2ffd2052defcaa1a92173c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34614
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/device/pci_device.c | 5 -----
 src/device/pci_ops.c    | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/device')

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 7786043a6c..5765529f86 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -630,11 +630,6 @@ void pci_dev_enable_resources(struct device *dev)
 	pci_write_config16(dev, PCI_COMMAND, command);
 }
 
-void __noreturn pcidev_die(void)
-{
-	die("PCI: dev is NULL!\n");
-}
-
 void pci_bus_enable_resources(struct device *dev)
 {
 	u16 ctrl;
diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index 96133155be..6f42978e82 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -14,6 +14,7 @@
 #define __SIMPLE_DEVICE__
 
 #include <stdint.h>
+#include <console/console.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
@@ -85,3 +86,8 @@ u16 pci_s_find_capability(pci_devfn_t dev, u16 cap)
 {
 	return pci_s_find_next_capability(dev, cap, 0);
 }
+
+void __noreturn pcidev_die(void)
+{
+	die("PCI: dev is NULL!\n");
+}
-- 
cgit v1.2.3