[coreboot-gerrit] [S] Change in coreboot[master]: soc/amd/common/block/acpi/tables: use get_top_of_mem_[below,above]_4gb

[Felix Held (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Matt DeVillier, Fred Reitberger.

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74612 )

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

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 
Change-Id: I35895340f6e747e2f5e1669d40f40b201d8c1845
---
M src/soc/amd/common/block/acpi/tables.c
1 file changed, 16 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/74612/1

diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c
index b7c942c..17db421 100644
--- a/src/soc/amd/common/block/acpi/tables.c
+++ b/src/soc/amd/common/block/acpi/tables.c
@@ -40,7 +40,6 @@
 /* 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 @@
    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 @@
     * 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();
 }