Change in coreboot[master]: libpayload/storage/ahci: Use pci_dev struct in ahci_initialize()

[Felix Singer (Code Review)]

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

Change subject: libpayload/storage/ahci: Use pci_dev struct in ahci_initialize()
......................................................................

libpayload/storage/ahci: Use pci_dev struct in ahci_initialize()

Change-Id: I559f1aba6985ebadc0a9b2d2db0f7fa1a6c24af2
Signed-off-by: Felix Singer 
---
M payloads/libpayload/drivers/storage/ahci.c
M payloads/libpayload/drivers/storage/storage.c
M payloads/libpayload/include/storage/ahci.h
3 files changed, 14 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/46426/1

diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c
index be54686..7c67182 100644
--- a/payloads/libpayload/drivers/storage/ahci.c
+++ b/payloads/libpayload/drivers/storage/ahci.c
@@ -228,34 +228,33 @@
 };
 #endif

-void ahci_initialize(pcidev_t dev)
+void ahci_initialize(struct pci_dev *dev)
 {
    int i;

+	pcidev_t pcidev = PCI_DEV(dev->bus, dev->dev, dev->func);
+
    if (dev->device_class != PCI_CLASS_STORAGE_AHCI)
    	return;

-	const u16 vendor = pci_read_config16(dev, 0x00);
-	const u16 device = pci_read_config16(dev, 0x02);
-
 #if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED)
-	const u32 vendor_device = pci_read_config32(dev, 0x0);
+	const u32 vendor_device = dev->vendor_id | dev->device_id >> 16;
    for (i = 0; i < ARRAY_SIZE(working_controllers); ++i)
    	if (vendor_device == working_controllers[i])
    		break;
    if (i == ARRAY_SIZE(working_controllers)) {
    	printf("ahci: Not using untested SATA controller "
-			"%02x:%02x.%02x (%04x:%04x).\n", PCI_BUS(dev),
-			PCI_SLOT(dev), PCI_FUNC(dev), vendor, device);
+			"%02x:%02x.%02x (%04x:%04x).\n", dev->bus,
+			dev->dev, dev->func, dev->vendor_id, dev->device_id);
    	return;
    }
 #endif

printf("ahci: Found SATA controller %02x:%02x.%02x (%04x:%04x).\n",
-		PCI_BUS(dev), PCI_SLOT(dev), PCI_FUNC(dev), vendor, device);
+		dev->bus, dev->dev, dev->func, dev->vendor_id, dev->device_id);

hba_ctrl_t *const ctrl = phys_to_virt(
-			pci_read_config32(dev, 0x24) & ~0x3ff);
+			pci_read_config32(pcidev, 0x24) & ~0x3ff);
    hba_port_t *const ports = ctrl->ports;

/* Reset host controller. */
@@ -274,8 +273,8 @@
    ctrl->global_ctrl |= HBA_CTRL_AHCI_EN;

/* Enable bus mastering. */
-	const u16 command = pci_read_config16(dev, PCI_COMMAND);
-	pci_write_config16(dev, PCI_COMMAND, command | PCI_COMMAND_MASTER);
+	const u16 command = pci_read_config16(pcidev, PCI_COMMAND);
+	pci_write_config16(pcidev, PCI_COMMAND, command | PCI_COMMAND_MASTER);

/* Probe for devices. */
    for (i = 0; i < 32; ++i) {
diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c
index e720a2d..f2bde77 100644
--- a/payloads/libpayload/drivers/storage/storage.c
+++ b/payloads/libpayload/drivers/storage/storage.c
@@ -112,11 +112,9 @@
    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:
-			ahci_initialize(pcidev);
+			ahci_initialize(dev);
    		break;
    	default:
    		break;
diff --git a/payloads/libpayload/include/storage/ahci.h b/payloads/libpayload/include/storage/ahci.h
index 2843624..18a0920 100644
--- a/payloads/libpayload/include/storage/ahci.h
+++ b/payloads/libpayload/include/storage/ahci.h
@@ -26,9 +26,11 @@
  * SUCH DAMAGE.
  */

+#include <pci/pci.h>
+
 #ifndef _STORAGE_AHCI_H
 #define _STORAGE_AHCI_H

-void ahci_initialize(pcidev_t dev);
+void ahci_initialize(struct pci_dev *dev);

#endif