sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86/cache.h: Use ENV_CACHE_AS_RAM macro

Browse Source 
Change-Id: Ic7b088a04165bb24b9ebcebc1580a96ce0fdfcc8
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37063
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Arthur Heymans
2019-11-20 22:50:33 +01:00
committed by Patrick Georgi
parent 6ea3a13a17
commit 706251d913
3 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/arch/x86/include/arch/cache.h
View File

@@ -31,13 +31,12 @@
#ifndef ARCH_CACHE_H #ifndef ARCH_CACHE_H
#define ARCH_CACHE_H #define ARCH_CACHE_H
#include <arch/early_variables.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
/* Executing WBINVD when running out of CAR would not be good, prevent that. */ /* Executing WBINVD when running out of CAR would not be good, prevent that. */
static inline void dcache_clean_invalidate_all(void) static inline void dcache_clean_invalidate_all(void)
{ {
if (!car_active()) if (!ENV_CACHE_AS_RAM)
wbinvd(); wbinvd();
} }
static inline void dcache_clean_all(void) static inline void dcache_clean_all(void)
@@ -47,7 +46,7 @@ static inline void dcache_clean_all(void)
} }
static inline void dcache_invalidate_all(void) static inline void dcache_invalidate_all(void)
{ {
if (!car_active()) if (!ENV_CACHE_AS_RAM)
invd(); invd();
} }

8
src/arch/x86/include/arch/early_variables.h
View File

@@ -40,9 +40,6 @@ asm(".previous");
/* Get the correct pointer for the CAR global variable. */ /* Get the correct pointer for the CAR global variable. */
void *car_get_var_ptr(void *var); void *car_get_var_ptr(void *var);
/* Return 1 when currently running with globals in Cache-as-RAM, 0 otherwise. */
int car_active(void);
/* Get and set a primitive type global variable. */ /* Get and set a primitive type global variable. */
#define car_get_var(var) \ #define car_get_var(var) \
(*(typeof(var) *)car_get_var_ptr(&(var))) (*(typeof(var) *)car_get_var_ptr(&(var)))
@@ -81,11 +78,6 @@ static inline void *car_get_var_ptr(void *var)
return var; return var;
} }
static inline int car_active(void)
{
return ENV_CACHE_AS_RAM;
}
#endif #endif
#endif /* ARCH_EARLY_VARIABLES_H */ #endif /* ARCH_EARLY_VARIABLES_H */

5
src/cpu/x86/car.c
View File

@@ -65,11 +65,6 @@ void *car_get_var_ptr(void *var)
return &migrated_base[offset]; return &migrated_base[offset];
} }
int car_active(void)
{
return !car_migrated;
}
static void do_car_migrate_variables(void) static void do_car_migrate_variables(void)
{ {
void *migrated_base; void *migrated_base;