From 746c65acb7958b82d991587fc3407e96cee6dc17 Mon Sep 17 00:00:00 2001 From: Andy Ross Date: Wed, 10 Feb 2021 21:19:54 -0800 Subject: [PATCH] soc/intel_adsp: Move KERNEL_COHERENCE to cavs15 Only the CAVS 1.5 linker script has full support for the coherence features, don't advertise it on the other SoC's yet. Signed-off-by: Andy Ross --- arch/xtensa/include/kernel_arch_func.h | 2 +- soc/xtensa/intel_adsp/Kconfig | 1 - soc/xtensa/intel_adsp/cavs_v15/Kconfig.series | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h index 8485969e7ab..47cef923583 100644 --- a/arch/xtensa/include/kernel_arch_func.h +++ b/arch/xtensa/include/kernel_arch_func.h @@ -66,7 +66,7 @@ static inline void arch_switch(void *switch_to, void **switched_from) /* FIXME: we don't have a framework for including this from the SoC * layer, so we define it in the arch code here. */ -#ifdef CONFIG_SOC_FAMILY_INTEL_ADSP +#if defined(CONFIG_SOC_FAMILY_INTEL_ADSP) && defined(CONFIG_KERNEL_COHERENCE) static inline bool arch_mem_coherent(void *ptr) { size_t addr = (size_t) ptr; diff --git a/soc/xtensa/intel_adsp/Kconfig b/soc/xtensa/intel_adsp/Kconfig index 5a7234e956c..65d29b896b2 100644 --- a/soc/xtensa/intel_adsp/Kconfig +++ b/soc/xtensa/intel_adsp/Kconfig @@ -5,7 +5,6 @@ config SOC_FAMILY_INTEL_ADSP bool - select ARCH_HAS_COHERENCE if SOC_FAMILY_INTEL_ADSP diff --git a/soc/xtensa/intel_adsp/cavs_v15/Kconfig.series b/soc/xtensa/intel_adsp/cavs_v15/Kconfig.series index 50182b24013..2dcc3a6e0ad 100644 --- a/soc/xtensa/intel_adsp/cavs_v15/Kconfig.series +++ b/soc/xtensa/intel_adsp/cavs_v15/Kconfig.series @@ -9,5 +9,6 @@ config SOC_SERIES_INTEL_CAVS_V15 select XTENSA_RESET_VECTOR select XTENSA_USE_CORE_CRT1 select ATOMIC_OPERATIONS_BUILTIN + select ARCH_HAS_COHERENCE help Intel CAVS v1.5