UPSTREAM: x86/acpi: Add VFCT table

Add VFCT table to provide PCI Optiom Rom for
AMD graphic devices.
Useful for GNU Linux payloads and embedded dual GPU systems.

Tested on Lenovo T500 with AMD RV635 as secondary gpu.

Original Change-Id: I3b4a587c71e7165338cad3aca77ed5afa085a63c
Signed-off-by: Patrick Rudolph <siro@das-labor.org>

BUG=none
BRANCH=none
TEST=none

Change-Id: Ic5f8c8122003d6f09b0ce2e663e31605daf7db7b
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: a5c2ac6256
Original-Change-Id: I4dc00005270240c048272b2e4f52ae46ba1c9422
Original-Reviewed-on: https://review.coreboot.org/18192
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/438046
This commit is contained in:
Patrick Rudolph 2016-03-31 20:04:23 +02:00 committed by chrome-bot
commit 6dd9a4a33f
5 changed files with 129 additions and 0 deletions

View file

@ -735,6 +735,9 @@ struct device_operations default_pci_ops_dev = {
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
.write_acpi_tables = pci_rom_write_acpi_tables,
#endif
.init = pci_dev_init,
.scan_bus = 0,
.enable = 0,

View file

@ -169,3 +169,68 @@ struct rom_header *pci_rom_load(struct device *dev,
pci_ram_image_start += rom_size;
return (struct rom_header *) (pci_ram_image_start-rom_size);
}
/* ACPI */
#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
static unsigned long
pci_rom_acpi_fill_vfct(struct device *device,
struct acpi_vfct *vfct_struct,
unsigned long current)
{
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 = pci_rom_probe(device);
if (!rom) {
printk(BIOS_ERR, "pci_rom_acpi_fill_vfct failed\n");
return current;
}
header->DeviceID = device->device;
header->VendorID = device->vendor;
header->PCIBus = device->bus->secondary;
header->PCIFunction = PCI_FUNC(device->path.pci.devfn);
header->PCIDevice = PCI_SLOT(device->path.pci.devfn);
header->ImageLength = rom->size * 512;
memcpy((void *)&header->VbiosContent, rom, header->ImageLength);
current += header->ImageLength;
return current;
}
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;
/* Only handle enabled devices */
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) {
current = ALIGN(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);
}
return current;
}
#endif