soc/amd/common/block/acpi/tables: use get_top_of_mem_[below,above]_4gb

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: I35895340f6e747e2f5e1669d40f40b201d8c1845
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74612
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:22:34 +02:00
parent 88c94fead3
commit 09906111aa
1 changed files with 3 additions and 5 deletions

View File

@ -40,7 +40,6 @@ unsigned long acpi_fill_madt_irqoverride(unsigned long current)
/* Used by \_SB.PCI0._CRS */
void acpi_fill_root_complex_tom(const struct device *device)
{
msr_t msr;
const char *scope;
assert(device);
@ -49,9 +48,8 @@ void acpi_fill_root_complex_tom(const struct device *device)
assert(scope);
acpigen_write_scope(scope);
msr = rdmsr(TOP_MEM);
acpigen_write_name_dword("TOM1", msr.lo);
msr = rdmsr(TOP_MEM2);
acpigen_write_name_dword("TOM1", get_top_of_mem_below_4gb());
/*
* Since XP only implements parts of ACPI 2.0, we can't use a qword
* here.
@ -60,6 +58,6 @@ void acpi_fill_root_complex_tom(const struct device *device)
* Shift value right by 20 bit to make it fit into 32bit,
* giving us 1MB granularity and a limit of almost 4Exabyte of memory.
*/
acpigen_write_name_dword("TOM2", (msr.hi << 12) | msr.lo >> 20);
acpigen_write_name_dword("TOM2", get_top_of_mem_above_4g() >> 20);
acpigen_pop_len();
}