Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75552?usp=email )
Change subject: include/cpu/x86: Simplify en/dis cache functions ......................................................................
include/cpu/x86: Simplify en/dis cache functions
Implementation of enable/disable cache functions aren't complex, simply drop cr0 variable usage, still maintains good readablity.
Signed-off-by: Himanshu Sahdev himanshu.sahdev@intel.com Change-Id: I81688e8bbb073e1d09ecf63f3f33e1651dbd778e Reviewed-on: https://review.coreboot.org/c/coreboot/+/75552 Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Jérémy Compostella jeremy.compostella@intel.com Reviewed-by: Subrata Banik subratabanik@google.com --- M src/include/cpu/x86/cache.h 1 file changed, 2 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved Jérémy Compostella: Looks good to me, but someone else must approve Subrata Banik: Looks good to me, approved
diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h index d4d9160..dcc96b6 100644 --- a/src/include/cpu/x86/cache.h +++ b/src/include/cpu/x86/cache.h @@ -47,10 +47,7 @@ */ static __always_inline void enable_cache(void) { - CRx_TYPE cr0; - cr0 = read_cr0(); - cr0 &= ~(CR0_CD | CR0_NW); - write_cr0(cr0); + write_cr0(read_cr0() & ~(CR0_CD | CR0_NW)); }
/* @@ -66,10 +63,7 @@ static __always_inline void disable_cache(void) { /* Disable and write back the cache */ - CRx_TYPE cr0; - cr0 = read_cr0(); - cr0 |= CR0_CD; - write_cr0(cr0); + write_cr0(read_cr0() | CR0_CD); if (!self_snooping_supported()) wbinvd(); }