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

qemu: move ram ressource reservation from "set" to "read" stage 

So the pci allocation code knows where memory is and doesn't
try map pci devices there.  We also don't have to check for
overlaps between pci hole and memory then.

Change-Id: I5eaea0e4d21210719685860fa1f16ca7b2137cde
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-on: http://review.coreboot.org/3491
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Gerd Hoffmann 2013-06-17 13:30:50 +02:00 committed by Ronald G. Minnich
parent 156ff13049
commit 44b11f2fe4
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mainboard/emulation/qemu-i440fx/northbridge.c
View File

@ -18,39 +18,29 @@
static void cpu_pci_domain_set_resources(device_t dev) static void cpu_pci_domain_set_resources(device_t dev)
{ {
u32 pci_tolm = find_pci_tolm(dev->link_list);
unsigned long tomk = 0, tolmk;
int idx;
tomk = qemu_get_memory_size();
printk(BIOS_DEBUG, "Detected %lu Kbytes (%lu MiB) RAM.\n",
tomk, tomk / 1024);
/* Compute the top of Low memory */
tolmk = pci_tolm >> 10;
if (tolmk >= tomk) {
/* The PCI hole does not overlap the memory. */
tolmk = tomk;
}
/* Report the memory regions. */
idx = 10;
ram_resource(dev, idx++, 0, 640);
ram_resource(dev, idx++, 768, tolmk - 768);
/* Leave some space for ACPI, PIRQ and MP tables */
high_tables_base = (tomk * 1024) - HIGH_MEMORY_SIZE;
high_tables_size = HIGH_MEMORY_SIZE;
assign_resources(dev->link_list); assign_resources(dev->link_list);
} }
static void cpu_pci_domain_read_resources(struct device *dev) static void cpu_pci_domain_read_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
unsigned long tomk = 0;
int idx = 10;
pci_domain_read_resources(dev); pci_domain_read_resources(dev);
tomk = qemu_get_memory_size();
printk(BIOS_DEBUG, "Detected %lu MiB RAM.\n", tomk / 1024);
/* Report the memory regions. */
idx = 10;
ram_resource(dev, idx++, 0, 640);
ram_resource(dev, idx++, 768, tomk - 768);
/* Leave some space for ACPI, PIRQ and MP tables */
high_tables_base = (tomk * 1024) - HIGH_MEMORY_SIZE;
high_tables_size = HIGH_MEMORY_SIZE;
/* Reserve space for the IOAPIC. This should be in the Southbridge, /* Reserve space for the IOAPIC. This should be in the Southbridge,
* but I couldn't tell which device to put it in. */ * but I couldn't tell which device to put it in. */
res = new_resource(dev, 2); res = new_resource(dev, 2);