Add MMCONF resource to AMD fam14 PCI_DOMAIN.

The coreboot resource allocator doesn't respect resources
claimed in the APIC_CLUSTER. Move the MMCONF resource to the
PCI_DOMAIN to prevent overlap with PCI devices.

Change-Id: I8541795f69bbdd9041b390103fb901d37e07eeb9
Signed-off-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-on: http://review.coreboot.org/2167
Reviewed-by: Dave Frodin <dave.frodin@se-eng.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martin.roth@se-eng.com>
Reviewed-by: Steve Goodrich <steve.goodrich@se-eng.com>
This commit is contained in:
Marc Jones 2013-01-16 17:14:24 -07:00 committed by Marc Jones
parent 5e732b8bf0
commit d5c998be99
1 changed files with 23 additions and 19 deletions

View File

@ -343,6 +343,19 @@ static void nb_read_resources(device_t dev)
amdfam14_link_read_bases(dev, nodeid, link->link_num); amdfam14_link_read_bases(dev, nodeid, link->link_num);
} }
} }
/*
* This MMCONF resource must be reserved in the PCI_DOMAIN.
* It is not honored by the coreboot resource allocator if it is in
* the APIC_CLUSTER.
*/
#if CONFIG_MMCONF_SUPPORT
struct resource *resource = new_resource(dev, 0xc0010058);
resource->base = CONFIG_MMCONF_BASE_ADDRESS;
resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256;
resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE |
IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
#endif
} }
static void set_resource(device_t dev, struct resource *resource, u32 nodeid) static void set_resource(device_t dev, struct resource *resource, u32 nodeid)
@ -452,6 +465,12 @@ static void nb_set_resources(device_t dev)
assign_resources(bus); assign_resources(bus);
} }
} }
/* Print the MMCONF region if it has been reserved. */
res = find_resource(dev, 0xc0010058);
if (res) {
report_resource_stored(dev, res, " <mmconfig>");
}
} }
/* Domain/Root Complex related code */ /* Domain/Root Complex related code */
@ -802,27 +821,12 @@ static void domain_enable_resources(device_t dev)
/* Bus related code */ /* Bus related code */
static void cpu_bus_read_resources(device_t dev) { static void cpu_bus_read_resources(device_t dev)
printk(BIOS_DEBUG, "\nFam14h - cpu_bus_read_resources.\n"); {
#if CONFIG_MMCONF_SUPPORT
struct resource *resource = new_resource(dev, 0xc0010058);
resource->base = CONFIG_MMCONF_BASE_ADDRESS;
resource->size = CONFIG_MMCONF_BUS_NUMBER * 4096 * 256;
resource->flags = IORESOURCE_MEM | IORESOURCE_RESERVE |
IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
#endif
} }
static void cpu_bus_set_resources(device_t dev) { static void cpu_bus_set_resources(device_t dev)
struct resource *resource = find_resource(dev, 0xc0010058); {
printk(BIOS_DEBUG, "\nFam14h - cpu_bus_set_resources.\n");
if (resource) {
report_resource_stored(dev, resource, " <mmconfig>");
}
pci_dev_set_resources(dev);
} }
static u32 cpu_bus_scan(device_t dev, u32 max) static u32 cpu_bus_scan(device_t dev, u32 max)