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

nb/intel/i945,gm45: Use incrementing index with fixed resource 

Do this for consistency, while followup will remove the index
completely.

Change-Id: I7b4822c3909801e91627ed2ffe776d65dfab08d5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55927
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2021-06-26 19:09:05 +03:00 committed by Felix Held
parent 0a3bbe8645
commit c1d4d0b0ea
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/northbridge/intel/gm45/northbridge.c
View File

@ -27,6 +27,7 @@ static void mch_domain_read_resources(struct device *dev)
{ {
u64 tom, touud; u64 tom, touud;
u32 tomk, tolud, uma_sizek = 0, delta_cbmem; u32 tomk, tolud, uma_sizek = 0, delta_cbmem;
int idx = 3;
/* Total Memory 2GB example: /* Total Memory 2GB example:
* *
@ -102,7 +103,7 @@ static void mch_domain_read_resources(struct device *dev)
printk(BIOS_INFO, "Available memory below 4GB: %uM\n", tomk >> 10); printk(BIOS_INFO, "Available memory below 4GB: %uM\n", tomk >> 10);
/* Report lowest memory region */ /* Report lowest memory region */
ram_resource(dev, 3, 0, 0xa0000 / KiB); ram_resource(dev, idx++, 0, 0xa0000 / KiB);
/* /*
* Reserve everything between A segment and 1MB: * Reserve everything between A segment and 1MB:
@ -110,11 +111,11 @@ static void mch_domain_read_resources(struct device *dev)
* 0xa0000 - 0xbffff: Legacy VGA * 0xa0000 - 0xbffff: Legacy VGA
* 0xc0000 - 0xfffff: RAM * 0xc0000 - 0xfffff: RAM
*/ */
mmio_resource(dev, 4, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB); mmio_resource(dev, idx++, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB);
reserved_ram_resource(dev, 5, 0xc0000 / KiB, (1*MiB - 0xc0000) / KiB); reserved_ram_resource(dev, idx++, 0xc0000 / KiB, (1*MiB - 0xc0000) / KiB);
/* Report < 4GB memory */ /* Report < 4GB memory */
ram_resource(dev, 6, 1*MiB / KiB, tomk - 1*MiB / KiB); ram_resource(dev, idx++, 1*MiB / KiB, tomk - 1*MiB / KiB);
/* /*
* If >= 4GB installed then memory from TOLUD to 4GB * If >= 4GB installed then memory from TOLUD to 4GB
@ -122,7 +123,7 @@ static void mch_domain_read_resources(struct device *dev)
*/ */
touud >>= 10; /* Convert to KB */ touud >>= 10; /* Convert to KB */
if (touud > 4096 * 1024) { if (touud > 4096 * 1024) {
ram_resource(dev, 7, 4096 * 1024, touud - (4096 * 1024)); ram_resource(dev, idx++, 4096 * 1024, touud - (4096 * 1024));
printk(BIOS_INFO, "Available memory above 4GB: %lluM\n", printk(BIOS_INFO, "Available memory above 4GB: %lluM\n",
(touud >> 10) - 4096); (touud >> 10) - 4096);
} }
@ -130,9 +131,9 @@ static void mch_domain_read_resources(struct device *dev)
printk(BIOS_DEBUG, "Adding UMA memory area base=0x%llx " printk(BIOS_DEBUG, "Adding UMA memory area base=0x%llx "
"size=0x%llx\n", ((u64)tomk) << 10, ((u64)uma_sizek) << 10); "size=0x%llx\n", ((u64)tomk) << 10, ((u64)uma_sizek) << 10);
/* Don't use uma_resource() as our UMA touches the PCI hole. */ /* Don't use uma_resource() as our UMA touches the PCI hole. */
fixed_mem_resource(dev, 8, tomk, uma_sizek, IORESOURCE_RESERVE); fixed_mem_resource(dev, idx++, tomk, uma_sizek, IORESOURCE_RESERVE);
mmconf_resource(dev, 9); mmconf_resource(dev, idx++);
} }
static void mch_domain_set_resources(struct device *dev) static void mch_domain_set_resources(struct device *dev)

15
src/northbridge/intel/i945/northbridge.c
View File

@ -21,6 +21,7 @@ static void mch_domain_read_resources(struct device *dev)
uint64_t uma_memory_base = 0, uma_memory_size = 0; uint64_t uma_memory_base = 0, uma_memory_size = 0;
uint64_t tseg_memory_base = 0, tseg_memory_size = 0; uint64_t tseg_memory_base = 0, tseg_memory_size = 0;
struct device *const d0f0 = pcidev_on_root(0, 0); struct device *const d0f0 = pcidev_on_root(0, 0);
int idx = 3;
pci_domain_read_resources(dev); pci_domain_read_resources(dev);
@ -74,15 +75,15 @@ static void mch_domain_read_resources(struct device *dev)
printk(BIOS_INFO, " (%dM)\n", (uint32_t)(tomk_stolen / KiB)); printk(BIOS_INFO, " (%dM)\n", (uint32_t)(tomk_stolen / KiB));
/* Report the memory regions */ /* Report the memory regions */
ram_resource(dev, 3, 0, 0xa0000 / KiB); ram_resource(dev, idx++, 0, 0xa0000 / KiB);
ram_resource(dev, 4, 1 * MiB / KiB, (tomk - 1 * MiB / KiB)); ram_resource(dev, idx++, 1 * MiB / KiB, (tomk - 1 * MiB / KiB));
uma_resource(dev, 5, uma_memory_base / KiB, uma_memory_size / KiB); uma_resource(dev, idx++, uma_memory_base / KiB, uma_memory_size / KiB);
mmio_resource(dev, 6, tseg_memory_base / KiB, tseg_memory_size / KiB); mmio_resource(dev, idx++, tseg_memory_base / KiB, tseg_memory_size / KiB);
uma_resource(dev, 7, cbmem_topk, delta_cbmem); uma_resource(dev, idx++, cbmem_topk, delta_cbmem);
/* legacy VGA memory */ /* legacy VGA memory */
mmio_resource(dev, 8, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB); mmio_resource(dev, idx++, 0xa0000 / KiB, (0xc0000 - 0xa0000) / KiB);
/* RAM to be used for option roms and BIOS */ /* RAM to be used for option roms and BIOS */
reserved_ram_resource(dev, 9, 0xc0000 / KiB, (1 * MiB - 0xc0000) / KiB); reserved_ram_resource(dev, idx++, 0xc0000 / KiB, (1 * MiB - 0xc0000) / KiB);
} }
static void mch_domain_set_resources(struct device *dev) static void mch_domain_set_resources(struct device *dev)