include/cpu/amd/mtrr: rename functions to get top of memory regions
Rename amd_topmem and amd_topmem2 to get_top_of_mem_below_4gb and get_top_of_mem_above_4g to make it clearer what those functions return. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Ic6e98d94c731af74aea0ce276a9a7e4867e3986f Reviewed-on: https://review.coreboot.org/c/coreboot/+/74589 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:
parent
df2edde891
commit
5e9afe7272
|
@ -7,7 +7,7 @@
|
|||
|
||||
void add_uma_resource_below_tolm(struct device *nb, int idx)
|
||||
{
|
||||
uint32_t topmem = amd_topmem();
|
||||
uint32_t topmem = get_top_of_mem_below_4gb();
|
||||
uint32_t top_of_cacheable = restore_top_of_low_cacheable();
|
||||
|
||||
if (top_of_cacheable == topmem)
|
||||
|
|
|
@ -65,12 +65,12 @@ static __always_inline void wrmsr_amd(unsigned int index, msr_t msr)
|
|||
);
|
||||
}
|
||||
|
||||
static inline uint64_t amd_topmem(void)
|
||||
static inline uint64_t get_top_of_mem_below_4gb(void)
|
||||
{
|
||||
return rdmsr(TOP_MEM).lo;
|
||||
}
|
||||
|
||||
static inline uint64_t amd_topmem2(void)
|
||||
static inline uint64_t get_top_of_mem_above_4g(void)
|
||||
{
|
||||
msr_t msr = rdmsr(TOP_MEM2);
|
||||
return (uint64_t)msr.hi << 32 | msr.lo;
|
||||
|
|
|
@ -781,7 +781,7 @@ static void domain_read_resources(struct device *dev)
|
|||
pci_domain_read_resources(dev);
|
||||
|
||||
/* TOP_MEM MSR is our boundary between DRAM and MMIO under 4G */
|
||||
mmio_basek = amd_topmem() >> 10;
|
||||
mmio_basek = get_top_of_mem_below_4gb() >> 10;
|
||||
|
||||
#if CONFIG_HW_MEM_HOLE_SIZEK != 0
|
||||
/* if the hw mem hole is already set in raminit stage, here we will compare
|
||||
|
@ -837,7 +837,7 @@ static void domain_read_resources(struct device *dev)
|
|||
sizek = 0;
|
||||
}
|
||||
else {
|
||||
uint64_t topmem2 = amd_topmem2();
|
||||
uint64_t topmem2 = get_top_of_mem_above_4g();
|
||||
basek = 4 * 1024 * 1024;
|
||||
sizek = topmem2 / 1024 - basek;
|
||||
}
|
||||
|
|
|
@ -276,7 +276,7 @@ struct device_operations stoneyridge_northbridge_operations = {
|
|||
*/
|
||||
void amd_initcpuio(void)
|
||||
{
|
||||
uintptr_t topmem = amd_topmem();
|
||||
uintptr_t topmem = get_top_of_mem_below_4gb();
|
||||
uintptr_t base, limit;
|
||||
|
||||
/* Enable legacy video routing: D18F1xF4 VGA Enable */
|
||||
|
|
Loading…
Reference in New Issue