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

nb/intel/pineview: Rework nb resource reading 

- Use newer functions and avoid the * / KiB dance
- Use existing functions for figuring out TSEG and UMA

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I502eeb39c05bd4d00b01976c96884636baf3030c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76273
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Arthur Heymans 2023-07-05 09:52:13 +02:00 committed by Kyösti Mälkki
parent a4b391bf81
commit 4141394975
1 changed files with 20 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/northbridge/intel/pineview/northbridge.c
View File

@ -12,6 +12,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <northbridge/intel/pineview/pineview.h> #include <northbridge/intel/pineview/pineview.h>
#include <cpu/intel/smm_reloc.h> #include <cpu/intel/smm_reloc.h>
#include <cpu/x86/smm.h>
/* /*
* Reserve everything between A segment and 1MB: * Reserve everything between A segment and 1MB:
@ -23,17 +24,7 @@
static void add_fixed_resources(struct device *dev, int index) static void add_fixed_resources(struct device *dev, int index)
{ {
struct resource *resource; mmio_range(dev, index++, HPET_BASE_ADDRESS, 0x00100000);
resource = new_resource(dev, index++);
resource->base = (resource_t)HPET_BASE_ADDRESS;
resource->size = (resource_t)0x00100000;
resource->flags = IORESOURCE_MEM
| IORESOURCE_RESERVE
| IORESOURCE_FIXED
| IORESOURCE_STORED
| IORESOURCE_ASSIGNED;
mmio_from_to(dev, index++, 0xa0000, 0xc0000); mmio_from_to(dev, index++, 0xa0000, 0xc0000);
reserved_ram_from_to(dev, index++, 0xc0000, 1 * MiB); reserved_ram_from_to(dev, index++, 0xc0000, 1 * MiB);
} }
@ -41,8 +32,7 @@ static void add_fixed_resources(struct device *dev, int index)
static void mch_domain_read_resources(struct device *dev) static void mch_domain_read_resources(struct device *dev)
{ {
u64 tom, touud; u64 tom, touud;
u32 tomk, tolud, tseg_sizek; u32 tolud;
u32 cbmem_topk, delta_cbmem;
u16 index; u16 index;
struct device *mch = pcidev_on_root(0, 0); struct device *mch = pcidev_on_root(0, 0);
@ -65,43 +55,30 @@ static void mch_domain_read_resources(struct device *dev)
printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx ", touud, tolud, tom); printk(BIOS_DEBUG, "TOUUD 0x%llx TOLUD 0x%08x TOM 0x%llx ", touud, tolud, tom);
tomk = tolud / KiB;
/* Graphics memory */ /* Graphics memory */
const u16 ggc = pci_read_config16(mch, GGC); const u16 ggc = pci_read_config16(mch, GGC);
const u32 gms_sizek = decode_igd_memory_size((ggc >> 4) & 0xf); const u32 gms_size = decode_igd_memory_size((ggc >> 4) & 0xf) * KiB;
printk(BIOS_DEBUG, "%uM UMA", gms_sizek / KiB); printk(BIOS_DEBUG, "%uM UMA", gms_size / MiB);
tomk -= gms_sizek;
/* GTT Graphics Stolen Memory Size (GGMS) */ /* GTT Graphics Stolen Memory Size (GGMS) */
const u32 gsm_sizek = decode_igd_gtt_size((ggc >> 8) & 0xf); const u32 gsm_size = decode_igd_gtt_size((ggc >> 8) & 0xf) * KiB;
printk(BIOS_DEBUG, " and %uM GTT\n", gsm_sizek / KiB); printk(BIOS_DEBUG, " and %uM GTT\n", gsm_size / MiB);
tomk -= gsm_sizek;
const u32 tseg_basek = pci_read_config32(mch, TSEG) / KiB; const u32 igd_base = pci_read_config32(mch, GBSM);
const u32 igd_basek = pci_read_config32(mch, GBSM) / KiB; const u32 gtt_base = pci_read_config32(mch, BGSM);
const u32 gtt_basek = pci_read_config32(mch, BGSM) / KiB;
/* Subtract TSEG size */
tseg_sizek = gtt_basek - tseg_basek;
tomk -= tseg_sizek;
printk(BIOS_DEBUG, "TSEG decoded, subtracting %dM\n", tseg_sizek / KiB);
/* cbmem_top can be shifted downwards due to alignment.
Mark the region between cbmem_top and tomk as unusable */
cbmem_topk = (uint32_t)cbmem_top() / KiB;
delta_cbmem = tomk - cbmem_topk;
tomk -= delta_cbmem;
printk(BIOS_DEBUG, "Unused RAM between cbmem_top and TOMK: 0x%xK\n", delta_cbmem);
/* Report the memory regions */ /* Report the memory regions */
ram_resource_kb(dev, index++, 0, 0xa0000 / KiB); ram_range(dev, index++, 0, 0xa0000);
ram_resource_kb(dev, index++, 1 * MiB / KiB, tomk - 1 * MiB / KiB); ram_from_to(dev, index++, 1 * MiB, (uintptr_t)cbmem_top());
mmio_resource_kb(dev, index++, tseg_basek, tseg_sizek); uintptr_t tseg_base;
mmio_resource_kb(dev, index++, gtt_basek, gsm_sizek); size_t tseg_size;
mmio_resource_kb(dev, index++, igd_basek, gms_sizek); smm_region(&tseg_base, &tseg_size);
reserved_ram_resource_kb(dev, index++, cbmem_topk, delta_cbmem); mmio_range(dev, index++, tseg_base, tseg_size);
mmio_range(dev, index++, gtt_base, gsm_size);
mmio_range(dev, index++, igd_base, gms_size);
printk(BIOS_DEBUG, "Unused RAM between cbmem_top and TOM: 0x%lx\n",
tseg_base - (uintptr_t)cbmem_top());
reserved_ram_from_to(dev, index++, (uintptr_t)cbmem_top(), tseg_base);
/* /*
* If > 4GB installed then memory from TOLUD to 4GB * If > 4GB installed then memory from TOLUD to 4GB