summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2020-10-14 18:15:21 +0000
committerNico Huber <nico.h@gmx.de>2020-10-20 20:39:30 +0000
commit09917e10cb520b6d492e7661e48db629504b58a1 (patch)
treeaf02f4f0ad7ab6ed38d9d0aa1cdd466d60c3ff11 /payloads/libpayload/drivers
parent320ad9351bb78c09ffd15fccd1ecc3089f068ab6 (diff)
downloadcoreboot-09917e10cb520b6d492e7661e48db629504b58a1.tar.xz
libpayload/storage/ahci: Use pci_dev struct in ahci_initialize()
Clean up ahci_initialize() by using pci_dev struct. Change-Id: I2d5673c631d978d8ebd0c4a90962ab9cccaf40a2 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46427 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
Diffstat (limited to 'payloads/libpayload/drivers')
-rw-r--r--payloads/libpayload/drivers/storage/ahci.c23
-rw-r--r--payloads/libpayload/drivers/storage/storage.c2
2 files changed, 9 insertions, 16 deletions
diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c
index e54bfbfef0..6a6fbfd418 100644
--- a/payloads/libpayload/drivers/storage/ahci.c
+++ b/payloads/libpayload/drivers/storage/ahci.c
@@ -228,34 +228,27 @@ static u32 working_controllers[] = {
};
#endif
-void ahci_initialize(pcidev_t dev)
+void ahci_initialize(struct pci_dev *dev)
{
int i;
- const u16 class = pci_read_config16(dev, 0xa);
- if (class != 0x0106)
- 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);
+ hba_ctrl_t *const ctrl = phys_to_virt(pci_read_long(dev, 0x24) & ~0x3ff);
hba_port_t *const ports = ctrl->ports;
/* Reset host controller. */
@@ -274,8 +267,8 @@ void ahci_initialize(pcidev_t dev)
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_word(dev, PCI_COMMAND);
+ pci_write_word(dev, 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 addf8d2bd3..a3b31c598d 100644
--- a/payloads/libpayload/drivers/storage/storage.c
+++ b/payloads/libpayload/drivers/storage/storage.c
@@ -115,7 +115,7 @@ void storage_initialize(void)
switch (dev->device_class) {
#if CONFIG(LP_STORAGE_AHCI)
case PCI_CLASS_STORAGE_AHCI:
- ahci_initialize(PCI_DEV(dev->bus, dev->dev, dev->func));
+ ahci_initialize(dev);
break;
#endif
default: