soc/intel_adsp: Move KERNEL_COHERENCE to cavs15

Andy Ross · nashif · commit 746c65acb795 · 2021-02-11T14:47:40.000-05:00
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 &lt;andrew.j.ross@intel.com&gt;
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ static inline void arch_switch(void switch_to, void *switched_from)`
`66`	`66`	`/* FIXME: we don't have a framework for including this from the SoC`
`67`	`67`	`* layer, so we define it in the arch code here.`
`68`	`68`	`*/`
`69`		`-#ifdef CONFIG_SOC_FAMILY_INTEL_ADSP`
	`69`	`+#if defined(CONFIG_SOC_FAMILY_INTEL_ADSP) && defined(CONFIG_KERNEL_COHERENCE)`
`70`	`70`	`static inline bool arch_mem_coherent(void *ptr)`
`71`	`71`	`{`
`72`	`72`	`size_t addr = (size_t) ptr;`