From 20f59c8f1efdc1c28422d8250a8815c9143039e2 Mon Sep 17 00:00:00 2001 From: Carlo Caione Date: Thu, 3 Dec 2020 10:49:00 +0100 Subject: [PATCH] cache: Rename CACHE_FLUSHING to CACHE_MANAGEMENT The new APIs are not only dealing with cache flushing. Rename the Kconfig symbol to CACHE_MANAGEMENT to better reflect this change. Signed-off-by: Carlo Caione --- arch/Kconfig | 8 ++++---- arch/arc/core/CMakeLists.txt | 2 +- arch/x86/core/Kconfig.ia32 | 4 ++-- include/cache.h | 8 ++++---- include/sys/arch_interface.h | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em11d | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em4 | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em5d | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em6 | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em7d | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp | 2 +- soc/arc/snps_emsdp/Kconfig.defconfig.em9d | 2 +- soc/arc/snps_emsk/Kconfig.defconfig.em11d | 2 +- soc/arc/snps_emsk/Kconfig.defconfig.em7d | 2 +- soc/arc/snps_nsim/Kconfig.defconfig.em | 2 +- soc/arc/snps_nsim/Kconfig.defconfig.em7d_v22 | 2 +- soc/arc/snps_nsim/Kconfig.defconfig.hs | 2 +- soc/arc/snps_nsim/Kconfig.defconfig.hs_smp | 2 +- soc/arc/snps_nsim/Kconfig.defconfig.sem | 2 +- soc/x86/apollo_lake/Kconfig.defconfig | 2 +- soc/x86/atom/Kconfig.defconfig | 2 +- soc/x86/elkhart_lake/Kconfig.defconfig | 2 +- soc/x86/ia32/Kconfig.defconfig | 2 +- 23 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 8784638b11b..b0a77f97f7a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -730,11 +730,11 @@ config CACHE_LINE_SIZE Detect automatically at runtime by selecting CACHE_LINE_SIZE_DETECT. -config CACHE_FLUSHING - bool "Enable cache flushing mechanism" +config CACHE_MANAGEMENT + bool "Enable cache management features" help - This links in the cache flushing functions (d-cache and i-cache where - possible). + This links in the cache management functions (for d-cache and i-cache + where possible). endmenu diff --git a/arch/arc/core/CMakeLists.txt b/arch/arc/core/CMakeLists.txt index 44fb70dd207..feeb9dcb28b 100644 --- a/arch/arc/core/CMakeLists.txt +++ b/arch/arc/core/CMakeLists.txt @@ -24,7 +24,7 @@ zephyr_library_sources( vector_table.c ) -zephyr_library_sources_ifdef(CONFIG_CACHE_FLUSHING cache.c) +zephyr_library_sources_ifdef(CONFIG_CACHE_MANAGEMENT cache.c) zephyr_library_sources_ifdef(CONFIG_ARC_FIRQ fast_irq.S) zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c) diff --git a/arch/x86/core/Kconfig.ia32 b/arch/x86/core/Kconfig.ia32 index edec460c89b..4e75eba9200 100644 --- a/arch/x86/core/Kconfig.ia32 +++ b/arch/x86/core/Kconfig.ia32 @@ -145,7 +145,7 @@ config CACHE_LINE_SIZE config CLFLUSH_INSTRUCTION_SUPPORTED bool "CLFLUSH instruction supported" - depends on !CLFLUSH_DETECT && CACHE_FLUSHING + depends on !CLFLUSH_DETECT && CACHE_MANAGEMENT help An implementation of sys_cache_flush() that uses CLFLUSH is made available, instead of the one using WBINVD. @@ -156,7 +156,7 @@ config CLFLUSH_INSTRUCTION_SUPPORTED config CLFLUSH_DETECT bool "Detect support of CLFLUSH instruction at runtime" - depends on CACHE_FLUSHING + depends on CACHE_MANAGEMENT help This option should be enabled if it is not known in advance whether the CPU supports the CLFLUSH instruction or not. diff --git a/include/cache.h b/include/cache.h index 098a665f58d..5e9b717346c 100644 --- a/include/cache.h +++ b/include/cache.h @@ -36,7 +36,7 @@ __syscall void sys_cache_flush(void *addr, size_t size); static inline void z_impl_sys_cache_flush(void *addr, size_t size) { - if (IS_ENABLED(CONFIG_CACHE_FLUSHING)) { + if (IS_ENABLED(CONFIG_CACHE_MANAGEMENT)) { arch_dcache_flush(addr, size); } } @@ -61,7 +61,7 @@ __syscall void sys_cache_invd(void *addr, size_t size); static inline void z_impl_sys_cache_invd(void *addr, size_t size) { - if (IS_ENABLED(CONFIG_CACHE_FLUSHING)) { + if (IS_ENABLED(CONFIG_CACHE_MANAGEMENT)) { arch_dcache_invd(addr, size); } } @@ -76,7 +76,7 @@ static inline void z_impl_sys_cache_invd(void *addr, size_t size) */ static inline size_t sys_cache_line_size_get(void) { -#ifdef CONFIG_CACHE_FLUSHING +#ifdef CONFIG_CACHE_MANAGEMENT #ifdef CONFIG_CACHE_LINE_SIZE return CONFIG_CACHE_LINE_SIZE; #else @@ -84,7 +84,7 @@ static inline size_t sys_cache_line_size_get(void) #endif /* CONFIG_CACHE_LINE_SIZE */ #else return 0; -#endif /* CONFIG_CACHE_FLUSHING */ +#endif /* CONFIG_CACHE_MANAGEMENT */ } #include diff --git a/include/sys/arch_interface.h b/include/sys/arch_interface.h index 649596294f4..7222e1fec1f 100644 --- a/include/sys/arch_interface.h +++ b/include/sys/arch_interface.h @@ -816,7 +816,7 @@ void arch_gdb_step(void); * @{ */ -#ifdef CONFIG_CACHE_FLUSHING +#ifdef CONFIG_CACHE_MANAGEMENT /** * * @brief Flush d-cache lines to main memory diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d index 4cbba3ac381..edd10e15233 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em11d +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em11d @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em4 b/soc/arc/snps_emsdp/Kconfig.defconfig.em4 index c17b918950b..f0d76d2b4eb 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em4 +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em4 @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default n config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d index 6f09508a277..f26a6bd2be3 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em5d +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em5d @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default n config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em6 b/soc/arc/snps_emsdp/Kconfig.defconfig.em6 index e51b63a110d..0347d0a561c 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em6 +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em6 @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d index a8966196037..7a0a7072b97 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp index c83d2dfda43..e0a931a8b1f 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em7d_esp @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default n -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d index cd702b780bf..e7ef0ce87f8 100644 --- a/soc/arc/snps_emsdp/Kconfig.defconfig.em9d +++ b/soc/arc/snps_emsdp/Kconfig.defconfig.em9d @@ -21,7 +21,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default n config FP_FPU_DA diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em11d b/soc/arc/snps_emsk/Kconfig.defconfig.em11d index 6c40458d07e..ad965710b51 100644 --- a/soc/arc/snps_emsk/Kconfig.defconfig.em11d +++ b/soc/arc/snps_emsk/Kconfig.defconfig.em11d @@ -26,7 +26,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC config HARVARD default n -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_emsk/Kconfig.defconfig.em7d b/soc/arc/snps_emsk/Kconfig.defconfig.em7d index 9e1ef7dacb9..71e7ea560c2 100644 --- a/soc/arc/snps_emsk/Kconfig.defconfig.em7d +++ b/soc/arc/snps_emsk/Kconfig.defconfig.em7d @@ -35,7 +35,7 @@ config ARC_FIRQ default n if BOARD_EM_STARTERKIT_R23 default y if BOARD_EM_STARTERKIT_R22 -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y if (ARC_MPU_VER = 2) diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.em b/soc/arc/snps_nsim/Kconfig.defconfig.em index e7749e8a1ea..ac69c49e329 100644 --- a/soc/arc/snps_nsim/Kconfig.defconfig.em +++ b/soc/arc/snps_nsim/Kconfig.defconfig.em @@ -30,7 +30,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config FP_FPU_DA diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.em7d_v22 b/soc/arc/snps_nsim/Kconfig.defconfig.em7d_v22 index 19ddbf99d4b..11ca82dc00d 100644 --- a/soc/arc/snps_nsim/Kconfig.defconfig.em7d_v22 +++ b/soc/arc/snps_nsim/Kconfig.defconfig.em7d_v22 @@ -30,7 +30,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y if (ARC_MPU_VER = 2) diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs b/soc/arc/snps_nsim/Kconfig.defconfig.hs index a1fd90572fe..ad61d860e54 100644 --- a/soc/arc/snps_nsim/Kconfig.defconfig.hs +++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs @@ -24,7 +24,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y endif # SOC_NSIM_HS diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp index 27d9d6c69ca..c53d9cfa709 100644 --- a/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp +++ b/soc/arc/snps_nsim/Kconfig.defconfig.hs_smp @@ -25,7 +25,7 @@ config HARVARD config ARC_FIRQ default y -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y config ARC_CONNECT diff --git a/soc/arc/snps_nsim/Kconfig.defconfig.sem b/soc/arc/snps_nsim/Kconfig.defconfig.sem index 8bfa5c2e099..c6239c16185 100644 --- a/soc/arc/snps_nsim/Kconfig.defconfig.sem +++ b/soc/arc/snps_nsim/Kconfig.defconfig.sem @@ -30,7 +30,7 @@ config HARVARD config ARC_FIRQ default n -config CACHE_FLUSHING +config CACHE_MANAGEMENT default y endif # SOC_NSIM_SEM diff --git a/soc/x86/apollo_lake/Kconfig.defconfig b/soc/x86/apollo_lake/Kconfig.defconfig index 28a2766c1bb..c8f0d0b2051 100644 --- a/soc/x86/apollo_lake/Kconfig.defconfig +++ b/soc/x86/apollo_lake/Kconfig.defconfig @@ -42,7 +42,7 @@ endif # APIC_TIMER_TSC endif # APIC_TIMER config CLFLUSH_DETECT - default y if CACHE_FLUSHING + default y if CACHE_MANAGEMENT config X86_DYNAMIC_IRQ_STUBS default 16 diff --git a/soc/x86/atom/Kconfig.defconfig b/soc/x86/atom/Kconfig.defconfig index 0e5809c2ff0..3fb18effdee 100644 --- a/soc/x86/atom/Kconfig.defconfig +++ b/soc/x86/atom/Kconfig.defconfig @@ -12,7 +12,7 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC default 25000000 if HPET_TIMER config CLFLUSH_DETECT - default y if CACHE_FLUSHING + default y if CACHE_MANAGEMENT if BT_UART diff --git a/soc/x86/elkhart_lake/Kconfig.defconfig b/soc/x86/elkhart_lake/Kconfig.defconfig index 4511966d764..d84c69a3471 100644 --- a/soc/x86/elkhart_lake/Kconfig.defconfig +++ b/soc/x86/elkhart_lake/Kconfig.defconfig @@ -42,7 +42,7 @@ endif # APIC_TIMER_TSC endif # APIC_TIMER config CLFLUSH_DETECT - default y if CACHE_FLUSHING + default y if CACHE_MANAGEMENT config X86_DYNAMIC_IRQ_STUBS default 16 diff --git a/soc/x86/ia32/Kconfig.defconfig b/soc/x86/ia32/Kconfig.defconfig index 79476ba9f9b..47194835c16 100644 --- a/soc/x86/ia32/Kconfig.defconfig +++ b/soc/x86/ia32/Kconfig.defconfig @@ -12,6 +12,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC default 25000000 if HPET_TIMER config CLFLUSH_DETECT - default y if CACHE_FLUSHING + default y if CACHE_MANAGEMENT endif