[coreboot-gerrit] [S] Change in coreboot[master]: include/cpu/amd/mtrr: fix typo in get_top_of_mem_above_4gb

[Felix Held (Code Review)]

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

Change subject: include/cpu/amd/mtrr: fix typo in get_top_of_mem_above_4gb
......................................................................

include/cpu/amd/mtrr: fix typo in get_top_of_mem_above_4gb

Add the missing 'g' to the 4gb so that get_top_of_mem_above_4gb is in
line with get_top_of_mem_below_4gb.

Signed-off-by: Felix Held 
Change-Id: Ic9170372d8b0c27d7de3bd04d822c95e2015cb10
---
M src/include/cpu/amd/mtrr.h
M src/northbridge/amd/pi/00730F01/northbridge.c
M src/soc/amd/common/block/acpi/tables.c
M src/soc/amd/stoneyridge/northbridge.c
4 files changed, 18 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/74710/1

diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index e96dc90..04d775c 100644
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -70,7 +70,7 @@
    return rdmsr(TOP_MEM).lo;
 }

-static inline uint64_t get_top_of_mem_above_4g(void)
+static inline uint64_t get_top_of_mem_above_4gb(void)
 {
    msr_t msr = rdmsr(TOP_MEM2);
    return (uint64_t)msr.hi << 32 | msr.lo;
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index cba57d8..b9ac022 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -550,7 +550,7 @@
     * 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", get_top_of_mem_above_4g() >> 20);
+	acpigen_write_name_dword("TOM2", get_top_of_mem_above_4gb() >> 20);
    acpigen_pop_len();
 }

@@ -834,7 +834,7 @@
    			sizek = 0;
    		}
    		else {
-				uint64_t topmem2 = get_top_of_mem_above_4g();
+				uint64_t topmem2 = get_top_of_mem_above_4gb();
    			basek = 4 * 1024 * 1024;
    			sizek = topmem2 / 1024 - basek;
    		}
diff --git a/src/soc/amd/common/block/acpi/tables.c b/src/soc/amd/common/block/acpi/tables.c
index 17db421..3ba9af6 100644
--- a/src/soc/amd/common/block/acpi/tables.c
+++ b/src/soc/amd/common/block/acpi/tables.c
@@ -58,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", get_top_of_mem_above_4g() >> 20);
+	acpigen_write_name_dword("TOM2", get_top_of_mem_above_4gb() >> 20);
    acpigen_pop_len();
 }
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index bafeabb..75fdfa4 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -328,7 +328,7 @@
    uint32_t uma_size = get_uma_size();
    uint32_t mem_useable = (uintptr_t)cbmem_top();
    uint32_t tom = get_top_of_mem_below_4gb();
-	uint64_t high_tom = get_top_of_mem_above_4g();
+	uint64_t high_tom = get_top_of_mem_above_4gb();
    uint64_t high_mem_useable;
    int idx = 0x10;