sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/denverton: Use newer function for resource declarations

Browse Source 
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: Id092b6dd9d42f2965801b0327a857a5a4945f793
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76288
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2023-07-05 12:03:27 +02:00 committed by Martin L Roth
parent 400f1aade8
commit 22c9335846
1 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/soc/intel/denverton_ns/systemagent.c
View File

@ -190,11 +190,8 @@ static void mc_report_map_entries(struct device *dev, uint64_t *values)
static void mc_add_dram_resources(struct device *dev) static void mc_add_dram_resources(struct device *dev)
{ {
unsigned long base_k, size_k;
unsigned long index; unsigned long index;
struct resource *resource;
uint64_t mc_values[NUM_MAP_ENTRIES]; uint64_t mc_values[NUM_MAP_ENTRIES];
uintptr_t top_of_ram;
/* Read in the MAP registers and report their values. */ /* Read in the MAP registers and report their values. */
mc_read_map_entries(dev, &mc_values[0]); mc_read_map_entries(dev, &mc_values[0]);
@ -204,8 +201,8 @@ static void mc_add_dram_resources(struct device *dev)
* These are the host memory ranges that should be added: * These are the host memory ranges that should be added:
* - 0 -> 0xa0000: cacheable * - 0 -> 0xa0000: cacheable
* - 0xc0000 -> 0x100000 : reserved * - 0xc0000 -> 0x100000 : reserved
* - 0x100000 -> top_of_ram : cacheable * - 0x100000 -> cbmem_top() : cacheable
* - top_of_ram -> TSEG: uncacheable * - cbmem_top() -> TSEG: uncacheable
* - TESG -> TOLUD: cacheable with standard MTRRs and reserved * - TESG -> TOLUD: cacheable with standard MTRRs and reserved
* - 4GiB -> TOUUD: cacheable * - 4GiB -> TOUUD: cacheable
* *
@ -232,46 +229,27 @@ static void mc_add_dram_resources(struct device *dev)
* PCI_BASE_ADDRESS_0. * PCI_BASE_ADDRESS_0.
*/ */
index = 0; index = 0;
top_of_ram = (uintptr_t)cbmem_top();
/* 0 - > 0xa0000 */ /*
base_k = 0; * 0 - > 0xa0000: RAM
size_k = (0xa0000 >> 10) - base_k; * 0xa0000 - 0xbffff: Legacy VGA
ram_resource_kb(dev, index++, base_k, size_k); * 0xc0000 - 0xfffff: RAM
*/
ram_range(dev, index++, 0, 0xa0000);
mmio_from_to(dev, index++, 0xa0000, 0xc0000);
reserved_ram_from_to(dev, index++, 0xc0000, 1 * MiB);
/* 0x100000 -> top_of_ram */ /* 0x100000 -> cbmem_top() */
base_k = 0x100000 >> 10; ram_from_to(dev, index++, 1 * MiB, (uintptr_t)cbmem_top());
size_k = (top_of_ram >> 10) - base_k;
ram_resource_kb(dev, index++, base_k, size_k);
/* top_of_ram -> TSEG */ /* cbmem_top() -> TSEG */
resource = new_resource(dev, index++); mmio_from_to(dev, index++, (uintptr_t)cbmem_top(), mc_values[TSEG_REG]);
resource->base = top_of_ram;
resource->size = mc_values[TSEG_REG] - top_of_ram;
resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED |
IORESOURCE_STORED | IORESOURCE_RESERVE |
IORESOURCE_ASSIGNED;
/* TSEG -> TOLUD */ /* TSEG -> TOLUD */
resource = new_resource(dev, index++); reserved_ram_from_to(dev, index++, mc_values[TSEG_REG], mc_values[TOLUD_REG]);
resource->base = mc_values[TSEG_REG];
resource->size = mc_values[TOLUD_REG] - mc_values[TSEG_REG];
resource->flags = IORESOURCE_MEM | IORESOURCE_FIXED |
IORESOURCE_STORED | IORESOURCE_RESERVE |
IORESOURCE_ASSIGNED | IORESOURCE_CACHEABLE;
/* 4GiB -> TOUUD */ /* 4GiB -> TOUUD */
upper_ram_end(dev, index++, mc_values[TOUUD_REG]); upper_ram_end(dev, index++, mc_values[TOUUD_REG]);
/*
* Reserve everything between A segment and 1MB:
*
* 0xa0000 - 0xbffff: legacy VGA
* 0xc0000 - 0xfffff: reserved RAM
*/
mmio_resource_kb(dev, index++, (0xa0000 >> 10), (0xc0000 - 0xa0000) >> 10);
reserved_ram_resource_kb(dev, index++, (0xc0000 >> 10),
(0x100000 - 0xc0000) >> 10);
} }
static void systemagent_read_resources(struct device *dev) static void systemagent_read_resources(struct device *dev)