diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-06-28 00:00:04 +0300 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-06-30 16:27:01 +0000 |
| commit | b20a714bfab30a530b7e96aea19042caac4e6645 (patch) | |
| tree | 31a78d2404ee185f6f242175b3b9b8e51b4550d4 /src/mainboard/emulation/qemu-i440fx/northbridge.c | |
| parent | 906df950dbf54fdb76ce50a6d2ab72cb4470885f (diff) | |
mb/emulation/qemu-i440fx,q35: Do resource transition
Change-Id: Ifb47e0d1d1b9c01c1332af4135f5578160c491a8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55924
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/mainboard/emulation/qemu-i440fx/northbridge.c')
| -rw-r--r-- | src/mainboard/emulation/qemu-i440fx/northbridge.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/northbridge.c b/src/mainboard/emulation/qemu-i440fx/northbridge.c index 708e3a66ce..96a234e580 100644 --- a/src/mainboard/emulation/qemu-i440fx/northbridge.c +++ b/src/mainboard/emulation/qemu-i440fx/northbridge.c @@ -47,7 +47,7 @@ static void cpu_pci_domain_read_resources(struct device *dev) int i440fx = (nbid == 0x1237); int q35 = (nbid == 0x29c0); struct resource *res; - unsigned long tomk = 0, high; + unsigned long tomk = 0; int idx = 10; FWCfgFile f; @@ -65,12 +65,10 @@ static void cpu_pci_domain_read_resources(struct device *dev) list[i].address, list[i].length); if (list[i].address == 0) { tomk = list[i].length / 1024; - ram_resource_kb(dev, idx++, 0, 640); - ram_resource_kb(dev, idx++, 768, tomk - 768); + ram_from_to(dev, idx++, 0, 0xa0000); + ram_from_to(dev, idx++, 0xc0000, tomk * KiB); } else { - ram_resource_kb(dev, idx++, - list[i].address / 1024, - list[i].length / 1024); + ram_range(dev, idx++, list[i].address, list[i].length); } break; case 2: /* reserved */ @@ -94,15 +92,16 @@ static void cpu_pci_domain_read_resources(struct device *dev) if (!tomk) { /* qemu older than 1.7, or reading etc/e820 failed. Fallback to cmos. */ tomk = qemu_get_memory_size(); - high = qemu_get_high_memory_size(); + uint64_t high = qemu_get_high_memory_size(); printk(BIOS_DEBUG, "QEMU: cmos: %lu MiB RAM below 4G.\n", tomk / 1024); - printk(BIOS_DEBUG, "QEMU: cmos: %lu MiB RAM above 4G.\n", high / 1024); + printk(BIOS_DEBUG, "QEMU: cmos: %llu MiB RAM above 4G.\n", high / 1024); /* Report the memory regions. */ - ram_resource_kb(dev, idx++, 0, 640); - ram_resource_kb(dev, idx++, 768, tomk - 768); + ram_from_to(dev, idx++, 0, 0xa0000); + ram_from_to(dev, idx++, 0xc0000, tomk * KiB); + if (high) - ram_resource_kb(dev, idx++, 4 * 1024 * 1024, high); + upper_ram_end(dev, idx++, 4ull * GiB + high * KiB); } /* Reserve I/O ports used by QEMU */ @@ -119,10 +118,10 @@ static void cpu_pci_domain_read_resources(struct device *dev) } /* A segment is legacy VGA region */ - mmio_resource_kb(dev, idx++, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB); + mmio_from_to(dev, idx++, 0xa0000, 0xc0000); /* C segment to 1MB is reserved RAM (low tables) */ - reserved_ram_resource_kb(dev, idx++, 0xc0000 / KiB, (1 * MiB - 0xc0000) / KiB); + reserved_ram_from_to(dev, idx++, 0xc0000, 1 * MiB); if (q35 && ((tomk * 1024) < 0xb0000000)) { /* |