From 70d92b9465b1edf646b25b89f1442f7107b5f1f6 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 19 Apr 2017 19:57:01 +0300 Subject: CBMEM: Clarify CBMEM_TOP_BACKUP function usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The deprecated LATE_CBMEM_INIT function is renamed: set_top_of_ram -> set_late_cbmem_top Obscure term top_of_ram is replaced: backup_top_of_ram -> backup_top_of_low_cacheable get_top_of_ram -> restore_top_of_low_cacheable New function that always resolves to CBMEM top boundary, with or without SMM, is named restore_cbmem_top(). Change-Id: I61d20f94840ad61e9fd55976e5aa8c27040b8fb7 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/19377 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Philippe Mathieu-Daudé --- src/southbridge/amd/agesa/hudson/ramtop.c | 6 +++--- src/southbridge/amd/cimx/sb700/ramtop.c | 6 +++--- src/southbridge/amd/cimx/sb800/ramtop.c | 6 +++--- src/southbridge/amd/cimx/sb900/ramtop.c | 6 +++--- src/southbridge/amd/sb700/early_setup.c | 6 ++---- src/southbridge/amd/sb700/lpc.c | 2 +- src/southbridge/amd/sb800/early_setup.c | 6 ++---- src/southbridge/via/k8t890/early_car.c | 4 ++-- src/southbridge/via/k8t890/host_ctrl.c | 6 ++---- 9 files changed, 21 insertions(+), 27 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/amd/agesa/hudson/ramtop.c b/src/southbridge/amd/agesa/hudson/ramtop.c index 798a3bbf42..22b291d1bb 100644 --- a/src/southbridge/amd/agesa/hudson/ramtop.c +++ b/src/southbridge/amd/agesa/hudson/ramtop.c @@ -26,7 +26,7 @@ int acpi_get_sleep_type(void) return (int)tmp; } -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; int nvram_pos = 0xf8, i; /* temp */ @@ -37,7 +37,7 @@ void backup_top_of_ram(uint64_t ramtop) } } -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { uint32_t xdata = 0; int xnvram_pos = 0xf8, xi; @@ -47,5 +47,5 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } diff --git a/src/southbridge/amd/cimx/sb700/ramtop.c b/src/southbridge/amd/cimx/sb700/ramtop.c index f59a9a346b..cbc4596f57 100644 --- a/src/southbridge/amd/cimx/sb700/ramtop.c +++ b/src/southbridge/amd/cimx/sb700/ramtop.c @@ -18,7 +18,7 @@ #include #include -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; int nvram_pos = 0xfc, i; @@ -29,7 +29,7 @@ void backup_top_of_ram(uint64_t ramtop) } } -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { u32 xdata = 0; int xnvram_pos = 0xfc, xi; @@ -39,5 +39,5 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } diff --git a/src/southbridge/amd/cimx/sb800/ramtop.c b/src/southbridge/amd/cimx/sb800/ramtop.c index 4d5b9a8a62..3c685767bc 100644 --- a/src/southbridge/amd/cimx/sb800/ramtop.c +++ b/src/southbridge/amd/cimx/sb800/ramtop.c @@ -26,7 +26,7 @@ int acpi_get_sleep_type(void) return (int)tmp; } -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; int nvram_pos = 0xf8, i; /* temp */ @@ -37,7 +37,7 @@ void backup_top_of_ram(uint64_t ramtop) } } -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { u32 xdata = 0; int xnvram_pos = 0xf8, xi; @@ -47,5 +47,5 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } diff --git a/src/southbridge/amd/cimx/sb900/ramtop.c b/src/southbridge/amd/cimx/sb900/ramtop.c index 34e8364379..26e930bb7e 100644 --- a/src/southbridge/amd/cimx/sb900/ramtop.c +++ b/src/southbridge/amd/cimx/sb900/ramtop.c @@ -18,7 +18,7 @@ #include #include -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = ramtop; int nvram_pos = 0xf8, i; /* temp */ @@ -29,7 +29,7 @@ void backup_top_of_ram(uint64_t ramtop) } } -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { u32 xdata = 0; int xnvram_pos = 0xf8, xi; @@ -39,5 +39,5 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } diff --git a/src/southbridge/amd/sb700/early_setup.c b/src/southbridge/amd/sb700/early_setup.c index f20c1e1dfd..3ed4cac8a1 100644 --- a/src/southbridge/amd/sb700/early_setup.c +++ b/src/southbridge/amd/sb700/early_setup.c @@ -860,8 +860,7 @@ void set_lpc_sticky_ctl(bool enable) pmio_write(0xbb, byte); } -#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { uint32_t xdata = 0; int xnvram_pos = 0xfc, xi; @@ -873,8 +872,7 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } -#endif #endif diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c index 8270f8a450..fda30b8687 100644 --- a/src/southbridge/amd/sb700/lpc.c +++ b/src/southbridge/amd/sb700/lpc.c @@ -89,7 +89,7 @@ int acpi_get_sleep_type(void) return ((tmp & (7 << 10)) >> 10); } -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { u32 dword = (u32) ramtop; int nvram_pos = 0xfc, i; diff --git a/src/southbridge/amd/sb800/early_setup.c b/src/southbridge/amd/sb800/early_setup.c index 7ac6ec85fe..c9ae08c755 100644 --- a/src/southbridge/amd/sb800/early_setup.c +++ b/src/southbridge/amd/sb800/early_setup.c @@ -665,8 +665,7 @@ int acpi_get_sleep_type(void) return ((tmp & (7 << 10)) >> 10); } -#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { uint32_t xdata = 0; int xnvram_pos = 0xfc, xi; @@ -678,8 +677,7 @@ unsigned long get_top_of_ram(void) xdata |= inb(BIOSRAM_DATA) << (xi *8); xnvram_pos++; } - return (unsigned long) xdata; + return xdata; } -#endif #endif diff --git a/src/southbridge/via/k8t890/early_car.c b/src/southbridge/via/k8t890/early_car.c index dca75f40b2..5f1e4c442e 100644 --- a/src/southbridge/via/k8t890/early_car.c +++ b/src/southbridge/via/k8t890/early_car.c @@ -177,9 +177,9 @@ int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos) return nvram_pos; } -unsigned long get_top_of_ram(void) +uintptr_t restore_top_of_low_cacheable(void) { if (acpi_get_sleep_type() != 3) return 0; - return (unsigned long) inl(K8T890_NVRAM_IO_BASE+K8T890_NVRAM_TOP_OF_RAM); + return inl(K8T890_NVRAM_IO_BASE+K8T890_NVRAM_TOP_OF_RAM); } diff --git a/src/southbridge/via/k8t890/host_ctrl.c b/src/southbridge/via/k8t890/host_ctrl.c index 4417d757cc..3e7a2c74b0 100644 --- a/src/southbridge/via/k8t890/host_ctrl.c +++ b/src/southbridge/via/k8t890/host_ctrl.c @@ -110,12 +110,10 @@ static void host_ctrl_enable_k8m8xx(struct device *dev) { } -#if IS_ENABLED(CONFIG_LATE_CBMEM_INIT) -void backup_top_of_ram(uint64_t ramtop) +void backup_top_of_low_cacheable(uintptr_t ramtop) { - outl((u32) ramtop, K8T890_NVRAM_IO_BASE+K8T890_NVRAM_TOP_OF_RAM); + outl((u32) ramtop, K8T890_NVRAM_IO_BASE+K8T890_NVRAM_TOP_OF_RAM); } -#endif static struct pci_operations lops_pci = { .set_subsystem = pci_dev_set_subsystem, -- cgit v1.2.3