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

soc/amd/stoneyridge/northbridge: use get_top_of_mem_[below,above]_4gb

Browse Source 
Use get_top_of_mem_below_4gb and get_top_of_mem_above_4g instead of
open-coding the functionality.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I04f2a3744aee9beedaa97b154a652ce6f0c705c0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74613
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
This commit is contained in:
Felix Held
2023-04-20 13:23:23 +02:00
parent 09906111aa
commit 392cf2f8f8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/soc/amd/stoneyridge/northbridge.c
View File

@@ -327,8 +327,8 @@ void domain_read_resources(struct device *dev)
uint64_t uma_base = get_uma_base(); uint64_t uma_base = get_uma_base();
uint32_t uma_size = get_uma_size(); uint32_t uma_size = get_uma_size();
uint32_t mem_useable = (uintptr_t)cbmem_top(); uint32_t mem_useable = (uintptr_t)cbmem_top();
msr_t tom = rdmsr(TOP_MEM); uint32_t tom = get_top_of_mem_below_4gb();
msr_t high_tom = rdmsr(TOP_MEM2); uint64_t high_tom = get_top_of_mem_above_4g();
uint64_t high_mem_useable; uint64_t high_mem_useable;
int idx = 0x10; int idx = 0x10;
@@ -352,16 +352,15 @@ void domain_read_resources(struct device *dev)
/* Low top usable RAM -> Low top RAM (bottom pci mmio hole) */ /* Low top usable RAM -> Low top RAM (bottom pci mmio hole) */
reserved_ram_resource_kb(dev, idx++, mem_useable / KiB, reserved_ram_resource_kb(dev, idx++, mem_useable / KiB,
(tom.lo - mem_useable) / KiB); (tom - mem_useable) / KiB);
/* If there is memory above 4GiB */ /* If there is memory above 4GiB */
if (high_tom.hi) { if (high_tom >> 32) {
/* 4GiB -> high top usable */ /* 4GiB -> high top usable */
if (uma_base >= (4ull * GiB)) if (uma_base >= (4ull * GiB))
high_mem_useable = uma_base; high_mem_useable = uma_base;
else else
high_mem_useable = ((uint64_t)high_tom.lo | high_mem_useable = high_tom;
((uint64_t)high_tom.hi << 32));
ram_resource_kb(dev, idx++, (4ull * GiB) / KiB, ram_resource_kb(dev, idx++, (4ull * GiB) / KiB,
((high_mem_useable - (4ull * GiB)) / KiB)); ((high_mem_useable - (4ull * GiB)) / KiB));