summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-06-30 06:29:52 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-02 09:10:03 +0000
commitfb49379ed22341d5e5e859af6823e9361db021f6 (patch)
tree2aef1c47d99cdde3bb8036b615e09acad6668cd4 /src/device
parent8c9be4327154ef46ffc96da13f816ffddb77253d (diff)
downloadcoreboot-fb49379ed22341d5e5e859af6823e9361db021f6.tar.xz
device/pci_rom: Fix redundant pci_rom_probe() calls
For the PCI_VENDOR_ID_ATI case, we can rely on pci_rom_acpi_fill_vfct() to make the call if necessary. For hardware other than ATI, pci_rom_probe() was already called from pci_rom_ssdt() and pci_dev_init(), so PCI_ROM_ADDRESS BAR is already enabled, if requested so. Change-Id: I0ea893a9ac7ba480840ebf5570d8fe0d9e20938f Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33909 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org> Reviewed-by: Mike Banon <mikebdp2@gmail.com>
Diffstat (limited to 'src/device')
-rw-r--r--src/device/pci_rom.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 7322e57f45..31fe115c89 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -209,8 +209,6 @@ pci_rom_acpi_fill_vfct(struct device *device, struct acpi_vfct *vfct_struct,
struct acpi_vfct_image_hdr *header = &vfct_struct->image_hdr;
struct rom_header *rom;
- vfct_struct->VBIOSImageOffset = (size_t)header - (size_t)vfct_struct;
-
rom = check_initialized(device);
if (!rom)
rom = pci_rom_probe(device);
@@ -233,6 +231,8 @@ pci_rom_acpi_fill_vfct(struct device *device, struct acpi_vfct *vfct_struct,
header->ImageLength = rom->size * 512;
memcpy((void *)&header->VbiosContent, rom, header->ImageLength);
+ vfct_struct->VBIOSImageOffset = (size_t)header - (size_t)vfct_struct;
+
current += header->ImageLength;
return current;
}
@@ -241,9 +241,6 @@ unsigned long
pci_rom_write_acpi_tables(struct device *device, unsigned long current,
struct acpi_rsdp *rsdp)
{
- struct acpi_vfct *vfct;
- struct rom_header *rom;
-
/* Only handle VGA devices */
if ((device->class >> 8) != PCI_CLASS_DISPLAY_VGA)
return current;
@@ -252,19 +249,18 @@ pci_rom_write_acpi_tables(struct device *device, unsigned long current,
if (!device->enabled)
return current;
- /* Probe for option rom */
- rom = pci_rom_probe(device);
- if (!rom)
- return current;
-
/* AMD/ATI uses VFCT */
if (device->vendor == PCI_VENDOR_ID_ATI) {
+ struct acpi_vfct *vfct;
+
current = ALIGN_UP(current, 8);
- printk(BIOS_DEBUG, "ACPI: * VFCT at %lx\n", current);
vfct = (struct acpi_vfct *)current;
acpi_create_vfct(device, vfct, pci_rom_acpi_fill_vfct);
- current += vfct->header.length;
- acpi_add_table(rsdp, vfct);
+ if (vfct->header.length) {
+ printk(BIOS_DEBUG, "ACPI: * VFCT at %lx\n", current);
+ current += vfct->header.length;
+ acpi_add_table(rsdp, vfct);
+ }
}
return current;