From a0a7c30f28e15e9646ba095e7ea9340350a50085 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 23 Feb 2024 11:20:07 +0000 Subject: [PATCH] soc: intel: intel_adsp: Fix issues Fixes issues with missing protection guards and selections in wrong files, and one case of missing bools on 2 fields Signed-off-by: Jamie McCrae --- soc/intel/intel_adsp/Kconfig | 4 ++++ soc/intel/intel_adsp/ace/Kconfig | 7 ------ .../ace/Kconfig.defconfig.ace15_mtpm | 1 - .../ace/Kconfig.defconfig.ace20_lnl | 1 - soc/intel/intel_adsp/ace/Kconfig.soc | 23 +++++++++++-------- soc/intel/intel_adsp/cavs/Kconfig | 2 -- soc/intel/intel_adsp/cavs/Kconfig.soc | 2 ++ 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/soc/intel/intel_adsp/Kconfig b/soc/intel/intel_adsp/Kconfig index c1b150b2eff..135fecb575a 100644 --- a/soc/intel/intel_adsp/Kconfig +++ b/soc/intel/intel_adsp/Kconfig @@ -10,6 +10,8 @@ config SOC_FAMILY_INTEL_ADSP select ARCH_HAS_USERSPACE if XTENSA_MMU select CPU_CACHE_INCOHERENT +if SOC_FAMILY_INTEL_ADSP + rsource "*/Kconfig" DT_COMPAT_INTEL_ADSP_HOST_IPC := intel,adsp-host-ipc @@ -126,3 +128,5 @@ config ADSP_IDLE_CLOCK_GATING HW configuration of a DSP. Evry time core goes to the WAITI state (wait for interrupt) during idle, the clock can be gated (however, this does not mean that this will happen). + +endif # SOC_FAMILY_INTEL_ADSP diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig index 631fdd405dc..162d34daa34 100644 --- a/soc/intel/intel_adsp/ace/Kconfig +++ b/soc/intel/intel_adsp/ace/Kconfig @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ADSP_ACE - select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" @@ -13,12 +12,6 @@ config SOC_SERIES_INTEL_ADSP_ACE select SOC_HAS_RUNTIME_NUM_CPUS select HAS_PM -config SOC_INTEL_ACE15_MTPM - select SOC_SERIES_INTEL_ADSP_ACE - -config SOC_INTEL_ACE20_LNL - select SOC_SERIES_INTEL_ADSP_ACE - config SOC_INTEL_COMM_WIDGET bool "Intel Communication Widget driver" default y diff --git a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm index 83e283d1062..c9c536f56dd 100644 --- a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm @@ -1,7 +1,6 @@ # Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 - if SOC_INTEL_ACE15_MTPM config MP_MAX_NUM_CPUS diff --git a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl index 1891879de2b..2a70da4ac5e 100644 --- a/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl @@ -1,7 +1,6 @@ # Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 - if SOC_INTEL_ACE20_LNL config MP_MAX_NUM_CPUS diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc index 116b80e77c1..3cab72f8f51 100644 --- a/soc/intel/intel_adsp/ace/Kconfig.soc +++ b/soc/intel/intel_adsp/ace/Kconfig.soc @@ -4,25 +4,28 @@ config SOC_SERIES_INTEL_ADSP_ACE bool + select SOC_FAMILY_INTEL_ADSP help Intel ADSP ACE +config SOC_INTEL_ACE15_MTPM + bool + select SOC_SERIES_INTEL_ADSP_ACE + help + ACE 1.5 Meteor Lake PCH M + +config SOC_INTEL_ACE20_LNL + bool + select SOC_SERIES_INTEL_ADSP_ACE + help + ACE 2.0 Lunar Lake PCH + config SOC_SERIES default "intel_adsp_ace" if SOC_SERIES_INTEL_ADSP_ACE config SOC_TOOLCHAIN_NAME default "intel_ace15_mtpm" if SOC_SERIES_INTEL_ADSP_ACE -config SOC_INTEL_ACE15_MTPM - bool - help - ACE 1.5 Meteor Lake PCH M - -config SOC_INTEL_ACE20_LNL - bool - help - ACE 2.0 Lunar Lake PCH - config SOC default "ace15_mtpm" if SOC_INTEL_ACE15_MTPM default "ace20_lnl" if SOC_INTEL_ACE20_LNL diff --git a/soc/intel/intel_adsp/cavs/Kconfig b/soc/intel/intel_adsp/cavs/Kconfig index 662d6144a55..01d325cc325 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig +++ b/soc/intel/intel_adsp/cavs/Kconfig @@ -3,7 +3,6 @@ # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ADSP_CAVS - select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) select XTENSA_RESET_VECTOR @@ -14,6 +13,5 @@ config SOC_SERIES_INTEL_ADSP_CAVS select HAS_PM config SOC_INTEL_CAVS_V25 - select SOC_SERIES_INTEL_ADSP_CAVS select XTENSA_WAITI_BUG select SCHED_IPI_SUPPORTED diff --git a/soc/intel/intel_adsp/cavs/Kconfig.soc b/soc/intel/intel_adsp/cavs/Kconfig.soc index cbbb82c41e5..40bac2f99cc 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig.soc +++ b/soc/intel/intel_adsp/cavs/Kconfig.soc @@ -4,6 +4,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS bool + select SOC_FAMILY_INTEL_ADSP help Intel ADSP CAVS @@ -12,6 +13,7 @@ config SOC_SERIES config SOC_INTEL_CAVS_V25 bool + select SOC_SERIES_INTEL_ADSP_CAVS help Intel Tiger Lake