[coreboot-gerrit] Change in coreboot[master]: libpayload/storage/ahci: Don't rescan PCI bus

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46416 )

Change subject: libpayload/storage/ahci: Don't rescan PCI bus
......................................................................

libpayload/storage/ahci: Don't rescan PCI bus

Change-Id: I4c79e71777e718f5065107ebf780ca9fdb4f1b0c
Signed-off-by: Felix Singer 
---
M payloads/libpayload/drivers/storage/ahci.c
M payloads/libpayload/drivers/storage/storage.c
M payloads/libpayload/include/pci/pci.h
M payloads/libpayload/include/storage/ahci.h
4 files changed, 18 insertions(+), 19 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/46416/1

diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c
index ff22b19..e54bfbf 100644
--- a/payloads/libpayload/drivers/storage/ahci.c
+++ b/payloads/libpayload/drivers/storage/ahci.c
@@ -227,7 +227,8 @@
    0x8086 | 0x5ae3 << 16, /* Apollo Lake */
 };
 #endif
-static void ahci_init_pci(pcidev_t dev)
+
+void ahci_initialize(pcidev_t dev)
 {
    int i;

@@ -282,19 +283,3 @@
    		ahci_port_probe(ctrl, &ports[i], i + 1);
    }
 }
-
-void ahci_initialize(void)
-{
-	int bus, dev, func;
-
-	for (bus = 0; bus < 256; ++bus) {
-		for (dev = 0; dev < 32; ++dev) {
-			const u16 class =
-				pci_read_config16(PCI_DEV(bus, dev, 0), 0xa);
-			if (class != 0xffff) {
-				for (func = 0; func < 8; ++func)
-					ahci_init_pci(PCI_DEV(bus, dev, func));
-			}
-		}
-	}
-}
diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c
index 24b9024..9412f86 100644
--- a/payloads/libpayload/drivers/storage/storage.c
+++ b/payloads/libpayload/drivers/storage/storage.c
@@ -27,6 +27,7 @@
  */

#include <libpayload.h>
+#include <pci/pci.h>
 #if CONFIG(LP_STORAGE_AHCI)
 # include <storage/ahci.h>
 #endif
@@ -108,7 +109,19 @@
  */
 void storage_initialize(void)
 {
+	struct pci_dev *dev;
+
+	for (dev = lib_sysinfo.pacc->devices; dev; dev = dev->next) {
+		const uint32_t pcidev = PCI_DEV(dev->bus, dev->dev, dev->func);
+
+		switch (dev->device_class) {
+		case PCI_CLASS_STORAGE_AHCI:
 #if CONFIG(LP_STORAGE_AHCI)
-	ahci_initialize();
+		ahci_initialize(pcidev);
 #endif
+			break;
+		default:
+			break;
+		}
+	}
 }
diff --git a/payloads/libpayload/include/pci/pci.h b/payloads/libpayload/include/pci/pci.h
index ea11a05..ad88590 100644
--- a/payloads/libpayload/include/pci/pci.h
+++ b/payloads/libpayload/include/pci/pci.h
@@ -66,6 +66,7 @@
 #define PCI_ROM_ADDRESS1	0x38 // on bridges
 #define PCI_ROM_ADDRESS_MASK	~0x7ff

+#define PCI_CLASS_STORAGE_AHCI	0x0106
 #define PCI_CLASS_MEMORY_OTHER	0x0580

#define PCI_VENDOR_ID_INTEL 0x8086
diff --git a/payloads/libpayload/include/storage/ahci.h b/payloads/libpayload/include/storage/ahci.h
index 0aa0322..2843624 100644
--- a/payloads/libpayload/include/storage/ahci.h
+++ b/payloads/libpayload/include/storage/ahci.h
@@ -29,6 +29,6 @@
 #ifndef _STORAGE_AHCI_H
 #define _STORAGE_AHCI_H

-void ahci_initialize(void);
+void ahci_initialize(pcidev_t dev);

#endif