GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Felix Singer 2020-10-14 18:15:21 +00:00 committed by Nico Huber
parent 320ad9351b
commit 09917e10cb
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
payloads/libpayload/drivers/storage/ahci.c
View File

@ -228,34 +228,27 @@ static u32 working_controllers[] = {
}; };
#endif #endif
void ahci_initialize(pcidev_t dev) void ahci_initialize(struct pci_dev *dev)
{ {
int i; 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) #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) for (i = 0; i < ARRAY_SIZE(working_controllers); ++i)
if (vendor_device == working_controllers[i]) if (vendor_device == working_controllers[i])
break; break;
if (i == ARRAY_SIZE(working_controllers)) { if (i == ARRAY_SIZE(working_controllers)) {
printf("ahci: Not using untested SATA controller " printf("ahci: Not using untested SATA controller "
"%02x:%02x.%02x (%04x:%04x).\n", PCI_BUS(dev), "%02x:%02x.%02x (%04x:%04x).\n", dev->bus,
PCI_SLOT(dev), PCI_FUNC(dev), vendor, device); dev->dev, dev->func, dev->vendor_id, dev->device_id);
return; return;
} }
#endif #endif
printf("ahci: Found SATA controller %02x:%02x.%02x (%04x:%04x).\n", 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( hba_ctrl_t *const ctrl = phys_to_virt(pci_read_long(dev, 0x24) & ~0x3ff);
pci_read_config32(dev, 0x24) & ~0x3ff);
hba_port_t *const ports = ctrl->ports; hba_port_t *const ports = ctrl->ports;
/* Reset host controller. */ /* Reset host controller. */
@ -274,8 +267,8 @@ void ahci_initialize(pcidev_t dev)
ctrl->global_ctrl |= HBA_CTRL_AHCI_EN; ctrl->global_ctrl |= HBA_CTRL_AHCI_EN;
/* Enable bus mastering. */ /* Enable bus mastering. */
const u16 command = pci_read_config16(dev, PCI_COMMAND); const u16 command = pci_read_word(dev, PCI_COMMAND);
pci_write_config16(dev, PCI_COMMAND, command | PCI_COMMAND_MASTER); pci_write_word(dev, PCI_COMMAND, command | PCI_COMMAND_MASTER);
/* Probe for devices. */ /* Probe for devices. */
for (i = 0; i < 32; ++i) { for (i = 0; i < 32; ++i) {

2
payloads/libpayload/drivers/storage/storage.c
View File

@ -115,7 +115,7 @@ void storage_initialize(void)
switch (dev->device_class) { switch (dev->device_class) {
#if CONFIG(LP_STORAGE_AHCI) #if CONFIG(LP_STORAGE_AHCI)
case PCI_CLASS_STORAGE_AHCI: case PCI_CLASS_STORAGE_AHCI:
ahci_initialize(PCI_DEV(dev->bus, dev->dev, dev->func)); ahci_initialize(dev);
break; break;
#endif #endif
default: default:

4
payloads/libpayload/include/storage/ahci.h
View File

@ -26,9 +26,11 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <pci/pci.h>
#ifndef _STORAGE_AHCI_H #ifndef _STORAGE_AHCI_H
#define _STORAGE_AHCI_H #define _STORAGE_AHCI_H
void ahci_initialize(pcidev_t dev); void ahci_initialize(struct pci_dev *dev);
#endif #endif