From 845fb3a0fd7aeadce63825640e49d0ebe67b1201 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 08:35:45 +0100 Subject: [PATCH 01/18] soc: xtensa: intel_adsp: move and convert to HWMv2 Move and convert soc/xtensa/intel_adsp SoC family configurations to HWMv2 with its SoC series: `ace` (INTEL_ACE) and `cavs` (INTEL_ADSP_CAVS). Signed-off-by: Dmitrii Golovanov --- .../intel_adsp/CMakeLists.txt | 6 +++- .../xtensa => intel}/intel_adsp/Kconfig | 14 ++-------- .../intel_adsp/Kconfig.defconfig | 4 +-- soc/intel/intel_adsp/Kconfig.soc | 12 ++++++++ .../intel_adsp/ace/CMakeLists.txt | 0 soc/intel/intel_adsp/ace/Kconfig | 28 +++++++++++++++++++ .../ace/Kconfig.defconfig.ace15_mtpm | 6 +--- .../ace/Kconfig.defconfig.ace20_lnl | 6 +--- .../intel_adsp/ace/Kconfig.defconfig.series | 12 ++------ soc/intel/intel_adsp/ace/Kconfig.soc | 28 +++++++++++++++++++ .../intel_adsp/ace/_soc_inthandlers.h | 0 .../intel_adsp/ace/ace-link.ld | 0 .../intel_adsp/ace/asm_memory_management.h | 0 .../xtensa => intel}/intel_adsp/ace/boot.c | 0 .../intel_adsp/ace/comm_widget.c | 0 .../intel_adsp/ace/comm_widget.h | 0 .../intel_adsp/ace/comm_widget_messages.c | 0 .../intel_adsp/ace/include/adsp_imr_layout.h | 0 .../intel_adsp/ace/include/adsp_timestamp.h | 0 .../intel_adsp/ace/include/dmic_regs.h | 0 .../ace/include/intel_ace15_mtpm/adsp_boot.h | 0 .../intel_ace15_mtpm/adsp_comm_widget.h | 0 .../include/intel_ace15_mtpm/adsp_interrupt.h | 0 .../include/intel_ace15_mtpm/adsp_ipc_regs.h | 0 .../include/intel_ace15_mtpm/adsp_memory.h | 0 .../intel_ace15_mtpm/adsp_memory_regions.h | 0 .../ace/include/intel_ace15_mtpm/adsp_power.h | 0 .../ace/include/intel_ace15_mtpm/adsp_shim.h | 0 .../include/intel_ace15_mtpm/adsp_watchdog.h | 0 .../intel_ace15_mtpm/dmic_regs_ace1x.h | 0 .../ace/include/intel_ace20_lnl/adsp_boot.h | 0 .../include/intel_ace20_lnl/adsp_interrupt.h | 0 .../include/intel_ace20_lnl/adsp_ipc_regs.h | 0 .../ace/include/intel_ace20_lnl/adsp_memory.h | 0 .../intel_ace20_lnl/adsp_memory_regions.h | 0 .../ace/include/intel_ace20_lnl/adsp_power.h | 0 .../ace/include/intel_ace20_lnl/adsp_shim.h | 0 .../include/intel_ace20_lnl/dmic_regs_ace2x.h | 0 .../xtensa => intel}/intel_adsp/ace/irq.c | 0 .../xtensa => intel}/intel_adsp/ace/linker.ld | 0 .../intel_adsp/ace/multiprocessing.c | 0 .../intel_adsp/ace/pmc_interface.h | 0 .../xtensa => intel}/intel_adsp/ace/power.c | 0 .../intel_adsp/ace/power_down.S | 0 .../xtensa => intel}/intel_adsp/ace/sram.c | 0 .../intel_adsp/ace/timestamp.c | 0 .../intel_adsp/cavs/CMakeLists.txt | 0 .../intel_adsp/cavs/Kconfig} | 11 +++++--- .../cavs/Kconfig.defconfig.cavs_v25 | 9 +----- .../intel_adsp/cavs/Kconfig.defconfig.series | 9 ++---- soc/intel/intel_adsp/cavs/Kconfig.soc | 22 +++++++++++++++ .../intel_adsp/cavs}/_soc_inthandlers.h | 0 .../intel_adsp/cavs/asm_ldo_management.h | 0 .../intel_adsp/cavs/asm_memory_management.h | 0 .../intel_adsp/cavs/include/adsp_interrupt.h | 0 .../include/intel_tgl_adsp/adsp_imr_layout.h | 0 .../include/intel_tgl_adsp/adsp_ipc_regs.h | 0 .../cavs/include/intel_tgl_adsp/adsp_memory.h | 0 .../cavs/include/intel_tgl_adsp/adsp_shim.h | 0 .../cavs/include/intel_tgl_adsp/dmic_regs.h | 0 .../cavs/include/xtensa-cavs-linker.ld | 0 .../xtensa => intel}/intel_adsp/cavs/irq.c | 0 .../intel_adsp/cavs/multiprocessing.c | 0 .../xtensa => intel}/intel_adsp/cavs/power.c | 0 .../intel_adsp/cavs/power_down_cavs.S | 0 .../xtensa => intel}/intel_adsp/cavs/sram.c | 0 .../intel_adsp/common/CMakeLists.txt | 4 +-- .../xtensa => intel}/intel_adsp/common/boot.c | 0 .../intel_adsp/common/boot_complete.c | 0 .../xtensa => intel}/intel_adsp/common/clk.c | 0 .../intel_adsp/common/include/adsp-vectors.h | 0 .../intel_adsp/common/include/adsp_clk.h | 0 .../common/include/adsp_debug_window.h | 0 .../intel_adsp/common/include/cavs-idc.h | 0 .../intel_adsp/common/include/cavstool.h | 0 .../intel_adsp/common/include/cpu_init.h | 0 .../intel_adsp/common/include/debug_helpers.h | 0 .../common/include/intel_adsp_hda.h | 0 .../common/include/intel_adsp_ipc.h | 0 .../common/include/intel_adsp_ipc_devtree.h | 0 .../intel_adsp/common/include/manifest.h | 0 .../intel_adsp/common/include/mem_window.h | 0 .../intel_adsp/common/include/soc.h | 0 .../intel_adsp/common/include/soc_util.h | 0 .../xtensa => intel}/intel_adsp/common/ipc.c | 0 .../intel_adsp/common/mem_window.c | 0 .../intel_adsp/common/multiprocessing.c | 0 .../intel_adsp/common/rimage_modules.c | 0 .../xtensa => intel}/intel_adsp/common/soc.c | 0 soc/intel/intel_adsp/soc.yml | 10 +++++++ .../intel_adsp/tools/acetool.py | 0 .../intel_adsp/tools/cavstool.py | 0 .../intel_adsp/tools/cavstool_client.py | 0 .../intel_adsp/tools/cavstwist.sh | 8 +++--- .../intel_adsp/tools/remote-fw-service.py | 0 soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc | 6 ---- .../xtensa/intel_adsp/ace/Kconfig.series | 16 ----------- .../xtensa/intel_adsp/ace/Kconfig.soc | 23 --------------- .../xtensa/intel_adsp/cavs/Kconfig.soc | 13 --------- 99 files changed, 130 insertions(+), 117 deletions(-) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/CMakeLists.txt (64%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/Kconfig (92%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/Kconfig.defconfig (85%) create mode 100644 soc/intel/intel_adsp/Kconfig.soc rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/CMakeLists.txt (100%) create mode 100644 soc/intel/intel_adsp/ace/Kconfig rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm (54%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/Kconfig.defconfig.ace20_lnl (54%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/Kconfig.defconfig.series (81%) create mode 100644 soc/intel/intel_adsp/ace/Kconfig.soc rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/_soc_inthandlers.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/ace-link.ld (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/asm_memory_management.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/boot.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/comm_widget.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/comm_widget.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/comm_widget_messages.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/adsp_imr_layout.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/adsp_timestamp.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/dmic_regs.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/irq.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/linker.ld (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/multiprocessing.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/pmc_interface.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/power.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/power_down.S (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/sram.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/ace/timestamp.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/CMakeLists.txt (100%) rename soc/{soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series => intel/intel_adsp/cavs/Kconfig} (74%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 (88%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/Kconfig.defconfig.series (78%) create mode 100644 soc/intel/intel_adsp/cavs/Kconfig.soc rename soc/{soc_legacy/xtensa/intel_adsp/common/include => intel/intel_adsp/cavs}/_soc_inthandlers.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/asm_ldo_management.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/asm_memory_management.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/adsp_interrupt.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/include/xtensa-cavs-linker.ld (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/irq.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/multiprocessing.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/power.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/power_down_cavs.S (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/cavs/sram.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/CMakeLists.txt (98%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/boot.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/boot_complete.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/clk.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/adsp-vectors.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/adsp_clk.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/adsp_debug_window.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/cavs-idc.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/cavstool.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/cpu_init.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/debug_helpers.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/intel_adsp_hda.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/intel_adsp_ipc.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/intel_adsp_ipc_devtree.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/manifest.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/mem_window.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/soc.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/include/soc_util.h (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/ipc.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/mem_window.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/multiprocessing.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/rimage_modules.c (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/common/soc.c (100%) create mode 100644 soc/intel/intel_adsp/soc.yml rename soc/{soc_legacy/xtensa => intel}/intel_adsp/tools/acetool.py (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/tools/cavstool.py (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/tools/cavstool_client.py (100%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/tools/cavstwist.sh (94%) rename soc/{soc_legacy/xtensa => intel}/intel_adsp/tools/remote-fw-service.py (100%) delete mode 100644 soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc delete mode 100644 soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series delete mode 100644 soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc delete mode 100644 soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc diff --git a/soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt b/soc/intel/intel_adsp/CMakeLists.txt similarity index 64% rename from soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt rename to soc/intel/intel_adsp/CMakeLists.txt index 2cee15bbcf6b..eabae1f9b48e 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt +++ b/soc/intel/intel_adsp/CMakeLists.txt @@ -1,13 +1,17 @@ # Intel ADSP SoCs family CMake file # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +zephyr_include_directories(common) + add_subdirectory(common) if(CONFIG_SOC_SERIES_INTEL_ACE) + zephyr_include_directories(ace) add_subdirectory(ace) endif() if(CONFIG_INTEL_ADSP_CAVS) + zephyr_include_directories(cavs) add_subdirectory(cavs) endif() zephyr_include_directories(common/include) diff --git a/soc/soc_legacy/xtensa/intel_adsp/Kconfig b/soc/intel/intel_adsp/Kconfig similarity index 92% rename from soc/soc_legacy/xtensa/intel_adsp/Kconfig rename to soc/intel/intel_adsp/Kconfig index f5f533acf168..c1b150b2eff2 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig +++ b/soc/intel/intel_adsp/Kconfig @@ -1,6 +1,6 @@ # Intel CAVS SoC family configuration options # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 config SOC_FAMILY_INTEL_ADSP @@ -9,16 +9,8 @@ config SOC_FAMILY_INTEL_ADSP select CPU_HAS_DCACHE select ARCH_HAS_USERSPACE if XTENSA_MMU select CPU_CACHE_INCOHERENT - bool - -if SOC_FAMILY_INTEL_ADSP -config SOC_FAMILY - string - default "intel_adsp" - -# Select SoC Part No. and configuration options -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.soc" +rsource "*/Kconfig" DT_COMPAT_INTEL_ADSP_HOST_IPC := intel,adsp-host-ipc DT_COMPAT_INTEL_ADSP_IDC := intel,adsp-idc @@ -134,5 +126,3 @@ 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/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig b/soc/intel/intel_adsp/Kconfig.defconfig similarity index 85% rename from soc/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig rename to soc/intel/intel_adsp/Kconfig.defconfig index f196d7274587..0fa4115c6176 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig +++ b/soc/intel/intel_adsp/Kconfig.defconfig @@ -1,11 +1,11 @@ # Intel CAVS SoC family default configuration options # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_FAMILY_INTEL_ADSP -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.defconfig.series" +rsource "*/Kconfig.defconfig.series" config XTENSA_RPO_CACHE def_bool y diff --git a/soc/intel/intel_adsp/Kconfig.soc b/soc/intel/intel_adsp/Kconfig.soc new file mode 100644 index 000000000000..9df1c63e1a9b --- /dev/null +++ b/soc/intel/intel_adsp/Kconfig.soc @@ -0,0 +1,12 @@ +# Intel CAVS SoC series selection +# +# Copyright (c) 2020-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_INTEL_ADSP + bool + +config SOC_FAMILY + default "intel_adsp" if SOC_FAMILY_INTEL_ADSP + +rsource "*/Kconfig.soc" diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/CMakeLists.txt b/soc/intel/intel_adsp/ace/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/CMakeLists.txt rename to soc/intel/intel_adsp/ace/CMakeLists.txt diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig new file mode 100644 index 000000000000..99c5380c3cbc --- /dev/null +++ b/soc/intel/intel_adsp/ace/Kconfig @@ -0,0 +1,28 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_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" + select ARCH_HAS_COHERENCE + select SCHED_IPI_SUPPORTED + select DW_ICTL_ACE + select SOC_HAS_RUNTIME_NUM_CPUS + select HAS_PM + +config SOC_INTEL_ACE15_MTPM + select SOC_SERIES_INTEL_ACE + +config SOC_INTEL_ACE20_LNL + select SOC_SERIES_INTEL_ACE + +config SOC_INTEL_COMM_WIDGET + bool "Intel Communication Widget driver" + default y + depends on DT_HAS_INTEL_ADSP_COMMUNICATION_WIDGET_ENABLED + help + Select this to enable Intel Communication Widget driver. + DSP Communication Widget is a device for generic sideband message transmit/receive. diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm similarity index 54% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm index 937b3e2b3c5d..83e283d10629 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm @@ -1,13 +1,9 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_ACE15_MTPM -config SOC - string - default "intel_ace15_mtpm" - config MP_MAX_NUM_CPUS default 3 diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl similarity index 54% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl index 2dc9365ffb52..1891879de2b7 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl @@ -1,13 +1,9 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_ACE20_LNL -config SOC - string - default "intel_ace20_lnl" - config MP_MAX_NUM_CPUS default 5 diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series similarity index 81% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.series index fe3a68280d56..2141a270c25c 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series @@ -1,16 +1,8 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_SERIES_INTEL_ACE -config SOC_SERIES - string - default "ace" - -config SOC_TOOLCHAIN_NAME - string - default "intel_ace15_mtpm" - config SMP default y @@ -68,6 +60,6 @@ config LOG_BACKEND_ADSP endif # LOG -source "soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace*" +rsource "Kconfig.defconfig.ace*" endif # SOC_SERIES_INTEL_ACE diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc new file mode 100644 index 000000000000..571a76991385 --- /dev/null +++ b/soc/intel/intel_adsp/ace/Kconfig.soc @@ -0,0 +1,28 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_ACE + bool + help + Intel ADSP ACE + +config SOC_SERIES + default "ace" if SOC_SERIES_INTEL_ACE + +config SOC_TOOLCHAIN_NAME + default "intel_ace15_mtpm" if SOC_SERIES_INTEL_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 "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM + default "intel_ace20_lnl" if SOC_INTEL_ACE20_LNL diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/_soc_inthandlers.h b/soc/intel/intel_adsp/ace/_soc_inthandlers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/_soc_inthandlers.h rename to soc/intel/intel_adsp/ace/_soc_inthandlers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/ace-link.ld b/soc/intel/intel_adsp/ace/ace-link.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/ace-link.ld rename to soc/intel/intel_adsp/ace/ace-link.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/asm_memory_management.h b/soc/intel/intel_adsp/ace/asm_memory_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/asm_memory_management.h rename to soc/intel/intel_adsp/ace/asm_memory_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/boot.c b/soc/intel/intel_adsp/ace/boot.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/boot.c rename to soc/intel/intel_adsp/ace/boot.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.c b/soc/intel/intel_adsp/ace/comm_widget.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.c rename to soc/intel/intel_adsp/ace/comm_widget.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.h b/soc/intel/intel_adsp/ace/comm_widget.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.h rename to soc/intel/intel_adsp/ace/comm_widget.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget_messages.c b/soc/intel/intel_adsp/ace/comm_widget_messages.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget_messages.c rename to soc/intel/intel_adsp/ace/comm_widget_messages.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_imr_layout.h b/soc/intel/intel_adsp/ace/include/adsp_imr_layout.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_imr_layout.h rename to soc/intel/intel_adsp/ace/include/adsp_imr_layout.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_timestamp.h b/soc/intel/intel_adsp/ace/include/adsp_timestamp.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_timestamp.h rename to soc/intel/intel_adsp/ace/include/adsp_timestamp.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/dmic_regs.h b/soc/intel/intel_adsp/ace/include/dmic_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/dmic_regs.h rename to soc/intel/intel_adsp/ace/include/dmic_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/irq.c b/soc/intel/intel_adsp/ace/irq.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/irq.c rename to soc/intel/intel_adsp/ace/irq.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/linker.ld b/soc/intel/intel_adsp/ace/linker.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/linker.ld rename to soc/intel/intel_adsp/ace/linker.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/multiprocessing.c b/soc/intel/intel_adsp/ace/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/multiprocessing.c rename to soc/intel/intel_adsp/ace/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/pmc_interface.h b/soc/intel/intel_adsp/ace/pmc_interface.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/pmc_interface.h rename to soc/intel/intel_adsp/ace/pmc_interface.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/power.c b/soc/intel/intel_adsp/ace/power.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/power.c rename to soc/intel/intel_adsp/ace/power.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/power_down.S b/soc/intel/intel_adsp/ace/power_down.S similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/power_down.S rename to soc/intel/intel_adsp/ace/power_down.S diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/sram.c b/soc/intel/intel_adsp/ace/sram.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/sram.c rename to soc/intel/intel_adsp/ace/sram.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/timestamp.c b/soc/intel/intel_adsp/ace/timestamp.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/timestamp.c rename to soc/intel/intel_adsp/ace/timestamp.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/CMakeLists.txt b/soc/intel/intel_adsp/cavs/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/CMakeLists.txt rename to soc/intel/intel_adsp/cavs/CMakeLists.txt diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series b/soc/intel/intel_adsp/cavs/Kconfig similarity index 74% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series rename to soc/intel/intel_adsp/cavs/Kconfig index a88bec1ec2e4..662d6144a555 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series +++ b/soc/intel/intel_adsp/cavs/Kconfig @@ -1,8 +1,8 @@ -# Copyright (c) 2017,2022 Intel Corporation +# Copyright (c) 2017,2022-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ADSP_CAVS - bool "Intel CAVS" select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) @@ -12,5 +12,8 @@ config SOC_SERIES_INTEL_ADSP_CAVS select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc" select ARCH_HAS_COHERENCE select HAS_PM - help - Intel ADSP CAVS + +config SOC_INTEL_CAVS_V25 + select SOC_SERIES_INTEL_ADSP_CAVS + select XTENSA_WAITI_BUG + select SCHED_IPI_SUPPORTED diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 similarity index 88% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 rename to soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 index f983aa27bb70..ad6fa8baac68 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 +++ b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 @@ -1,15 +1,8 @@ -# Copyright (c) 2020,2022 Intel Corporation +# Copyright (c) 2020,2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_CAVS_V25 -config SOC_TOOLCHAIN_NAME - string - default "intel_tgl_adsp" - -config SOC - default "intel_tgl_adsp" - # For backward compatibility, to be removed config SOC_SERIES_INTEL_CAVS_V25 def_bool y diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.series similarity index 78% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series rename to soc/intel/intel_adsp/cavs/Kconfig.defconfig.series index c340e4c77be6..6b39e8bc930a 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series +++ b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.series @@ -1,16 +1,13 @@ -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 if SOC_SERIES_INTEL_ADSP_CAVS -config SOC_SERIES - string - default "cavs" - config INTEL_ADSP_CAVS def_bool y -source "soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs*" +rsource "Kconfig.defconfig.cavs*" config DMA_INTEL_ADSP_GPDMA default y diff --git a/soc/intel/intel_adsp/cavs/Kconfig.soc b/soc/intel/intel_adsp/cavs/Kconfig.soc new file mode 100644 index 000000000000..a8c7f0b469b7 --- /dev/null +++ b/soc/intel/intel_adsp/cavs/Kconfig.soc @@ -0,0 +1,22 @@ +# Copyright (c) 2020-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_ADSP_CAVS + bool + help + Intel ADSP CAVS + +config SOC_SERIES + default "cavs" if SOC_SERIES_INTEL_ADSP_CAVS + +config SOC_INTEL_CAVS_V25 + bool + help + Intel Tiger Lake + +config SOC + default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 + +config SOC_TOOLCHAIN_NAME + default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/_soc_inthandlers.h b/soc/intel/intel_adsp/cavs/_soc_inthandlers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/_soc_inthandlers.h rename to soc/intel/intel_adsp/cavs/_soc_inthandlers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/asm_ldo_management.h b/soc/intel/intel_adsp/cavs/asm_ldo_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/asm_ldo_management.h rename to soc/intel/intel_adsp/cavs/asm_ldo_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/asm_memory_management.h b/soc/intel/intel_adsp/cavs/asm_memory_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/asm_memory_management.h rename to soc/intel/intel_adsp/cavs/asm_memory_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/adsp_interrupt.h b/soc/intel/intel_adsp/cavs/include/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/adsp_interrupt.h rename to soc/intel/intel_adsp/cavs/include/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/xtensa-cavs-linker.ld b/soc/intel/intel_adsp/cavs/include/xtensa-cavs-linker.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/xtensa-cavs-linker.ld rename to soc/intel/intel_adsp/cavs/include/xtensa-cavs-linker.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/irq.c b/soc/intel/intel_adsp/cavs/irq.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/irq.c rename to soc/intel/intel_adsp/cavs/irq.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/multiprocessing.c b/soc/intel/intel_adsp/cavs/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/multiprocessing.c rename to soc/intel/intel_adsp/cavs/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/power.c b/soc/intel/intel_adsp/cavs/power.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/power.c rename to soc/intel/intel_adsp/cavs/power.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/power_down_cavs.S b/soc/intel/intel_adsp/cavs/power_down_cavs.S similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/power_down_cavs.S rename to soc/intel/intel_adsp/cavs/power_down_cavs.S diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/sram.c b/soc/intel/intel_adsp/cavs/sram.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/sram.c rename to soc/intel/intel_adsp/cavs/sram.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt b/soc/intel/intel_adsp/common/CMakeLists.txt similarity index 98% rename from soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt rename to soc/intel/intel_adsp/common/CMakeLists.txt index c463e4453fcd..a3cdb9ff5ad7 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt +++ b/soc/intel/intel_adsp/common/CMakeLists.txt @@ -1,6 +1,6 @@ # Intel CAVS SoC family CMake file # -# Copyright (c) 2020-2022 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 zephyr_interface_library_named(INTEL_ADSP_COMMON) @@ -129,7 +129,7 @@ add_custom_target(zephyr.ri ALL # Parameters after the double dash -- are passed through to rimage. For # other ways to override default rimage parameters check -# boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst +# boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst # Warning: because `west sign` can also be used interactively, using # ${WEST_SIGN_OPTS} like this has _higher_ precedence than `west config diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/boot.c b/soc/intel/intel_adsp/common/boot.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/boot.c rename to soc/intel/intel_adsp/common/boot.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/boot_complete.c b/soc/intel/intel_adsp/common/boot_complete.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/boot_complete.c rename to soc/intel/intel_adsp/common/boot_complete.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/clk.c rename to soc/intel/intel_adsp/common/clk.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp-vectors.h b/soc/intel/intel_adsp/common/include/adsp-vectors.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp-vectors.h rename to soc/intel/intel_adsp/common/include/adsp-vectors.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_clk.h b/soc/intel/intel_adsp/common/include/adsp_clk.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_clk.h rename to soc/intel/intel_adsp/common/include/adsp_clk.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_debug_window.h b/soc/intel/intel_adsp/common/include/adsp_debug_window.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_debug_window.h rename to soc/intel/intel_adsp/common/include/adsp_debug_window.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cavs-idc.h b/soc/intel/intel_adsp/common/include/cavs-idc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cavs-idc.h rename to soc/intel/intel_adsp/common/include/cavs-idc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cavstool.h b/soc/intel/intel_adsp/common/include/cavstool.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cavstool.h rename to soc/intel/intel_adsp/common/include/cavstool.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cpu_init.h b/soc/intel/intel_adsp/common/include/cpu_init.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cpu_init.h rename to soc/intel/intel_adsp/common/include/cpu_init.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/debug_helpers.h b/soc/intel/intel_adsp/common/include/debug_helpers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/debug_helpers.h rename to soc/intel/intel_adsp/common/include/debug_helpers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_hda.h b/soc/intel/intel_adsp/common/include/intel_adsp_hda.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_hda.h rename to soc/intel/intel_adsp/common/include/intel_adsp_hda.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc.h b/soc/intel/intel_adsp/common/include/intel_adsp_ipc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc.h rename to soc/intel/intel_adsp/common/include/intel_adsp_ipc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc_devtree.h b/soc/intel/intel_adsp/common/include/intel_adsp_ipc_devtree.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc_devtree.h rename to soc/intel/intel_adsp/common/include/intel_adsp_ipc_devtree.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/manifest.h b/soc/intel/intel_adsp/common/include/manifest.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/manifest.h rename to soc/intel/intel_adsp/common/include/manifest.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/mem_window.h b/soc/intel/intel_adsp/common/include/mem_window.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/mem_window.h rename to soc/intel/intel_adsp/common/include/mem_window.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/soc.h b/soc/intel/intel_adsp/common/include/soc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/soc.h rename to soc/intel/intel_adsp/common/include/soc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/soc_util.h b/soc/intel/intel_adsp/common/include/soc_util.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/soc_util.h rename to soc/intel/intel_adsp/common/include/soc_util.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/ipc.c b/soc/intel/intel_adsp/common/ipc.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/ipc.c rename to soc/intel/intel_adsp/common/ipc.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/mem_window.c b/soc/intel/intel_adsp/common/mem_window.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/mem_window.c rename to soc/intel/intel_adsp/common/mem_window.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/multiprocessing.c b/soc/intel/intel_adsp/common/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/multiprocessing.c rename to soc/intel/intel_adsp/common/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/rimage_modules.c b/soc/intel/intel_adsp/common/rimage_modules.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/rimage_modules.c rename to soc/intel/intel_adsp/common/rimage_modules.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/soc.c b/soc/intel/intel_adsp/common/soc.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/soc.c rename to soc/intel/intel_adsp/common/soc.c diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml new file mode 100644 index 000000000000..33418d53a367 --- /dev/null +++ b/soc/intel/intel_adsp/soc.yml @@ -0,0 +1,10 @@ +family: + - name: intel_adsp + series: + - name: ace + socs: + - name: intel_ace15_mtpm + - name: intel_ace20_lnl + - name: cavs + socs: + - name: intel_tgl_adsp diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/acetool.py b/soc/intel/intel_adsp/tools/acetool.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/acetool.py rename to soc/intel/intel_adsp/tools/acetool.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py b/soc/intel/intel_adsp/tools/cavstool.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py rename to soc/intel/intel_adsp/tools/cavstool.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool_client.py b/soc/intel/intel_adsp/tools/cavstool_client.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstool_client.py rename to soc/intel/intel_adsp/tools/cavstool_client.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh b/soc/intel/intel_adsp/tools/cavstwist.sh similarity index 94% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh rename to soc/intel/intel_adsp/tools/cavstwist.sh index 3dcfd0e9d4b6..6854fa2fbb9a 100755 --- a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh +++ b/soc/intel/intel_adsp/tools/cavstwist.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 set -e @@ -13,8 +13,8 @@ set -e # export CAVS_RIMAGE=$HOME/rimage # # twister -p intel_adsp_cavs25 --device-testing \ -# --device-serial-pty=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh \ -# --west-flash=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh +# --device-serial-pty=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh \ +# --west-flash=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh # # The CAVS_OLD_FLASHER is necessary because now the client-server-based # cavstool works by default. This is to tell the build system to use @@ -80,7 +80,7 @@ fi ######################################################################## -CAVSTOOL=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py +CAVSTOOL=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool.py IMAGE=$ZEPHYR_BASE/_cavstmp.ri IMAGE2=$ZEPHYR_BASE/_cavstmp2.ri diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/remote-fw-service.py b/soc/intel/intel_adsp/tools/remote-fw-service.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/remote-fw-service.py rename to soc/intel/intel_adsp/tools/remote-fw-service.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc deleted file mode 100644 index 58e4440e3fc9..000000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc +++ /dev/null @@ -1,6 +0,0 @@ -# Intel CAVS SoC series selection -# -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.series" diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series b/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series deleted file mode 100644 index 963c33bdf615..000000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_INTEL_ACE - bool "Intel 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" - select ARCH_HAS_COHERENCE - select SCHED_IPI_SUPPORTED - select DW_ICTL_ACE - select SOC_HAS_RUNTIME_NUM_CPUS - select HAS_PM - help - Intel ADSP ACE diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc deleted file mode 100644 index 69f8ebd887a4..000000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "Intel ADSP SoC Selection" - - config SOC_INTEL_ACE15_MTPM - bool "ACE 1.5 Meteor PCH M" - depends on SOC_SERIES_INTEL_ACE - - config SOC_INTEL_ACE20_LNL - bool "ACE 2.0 Lunar Lake PCH" - depends on SOC_SERIES_INTEL_ACE - -endchoice - -config SOC_INTEL_COMM_WIDGET - bool "Intel Communication Widget driver" - default y - depends on DT_HAS_INTEL_ADSP_COMMUNICATION_WIDGET_ENABLED - help - Select this to enable Intel Communication Widget driver. - DSP Communication Widget is a device for generic sideband message transmit/receive. diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc deleted file mode 100644 index 0d054e0ee2a3..000000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "Intel CAVS SoC Selection" - depends on SOC_SERIES_INTEL_ADSP_CAVS - -config SOC_INTEL_CAVS_V25 - bool "Intel Tiger Lake" - select XTENSA_WAITI_BUG - select SCHED_IPI_SUPPORTED - -endchoice From 83884b7423110a497bbbed115d0cd470ac854a2a Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 7 Feb 2024 11:21:16 +0100 Subject: [PATCH 02/18] soc: xtensa: intel_adsp: HWMv2 workaround for SOF config Apply a workaround at Kconfig.defconfig for CORE_COUNT default value set overriding SOF arch/host incorrect defaults chosen without ARCH specified by the changed HWMv2 cmake sequence. Signed-off-by: Dmitrii Golovanov --- soc/intel/intel_adsp/Kconfig.defconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/soc/intel/intel_adsp/Kconfig.defconfig b/soc/intel/intel_adsp/Kconfig.defconfig index 0fa4115c6176..d76faf02defd 100644 --- a/soc/intel/intel_adsp/Kconfig.defconfig +++ b/soc/intel/intel_adsp/Kconfig.defconfig @@ -7,6 +7,13 @@ if SOC_FAMILY_INTEL_ADSP rsource "*/Kconfig.defconfig.series" +# A workaround for HWMv2 to recover SOF arch/xtensa defaults overridden by arch/host. +if SOF +config CORE_COUNT + int + default MP_MAX_NUM_CPUS +endif + config XTENSA_RPO_CACHE def_bool y From 8a3baad3650dd8a949eab08777358924f4188fed Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 14:13:39 +0100 Subject: [PATCH 03/18] boards: xtensa: intel_adsp_cavs25: move and convert to HWMv2 Move and convert to HWMv2 intel_adsp_cavs25 board configuration. Signed-off-by: Dmitrii Golovanov --- .../xtensa/intel_adsp_cavs25/Kconfig.board | 12 ----------- .../intel_adsp_cavs25/Kconfig.defconfig | 20 ------------------- .../intel/intel_adsp_cavs25/Kconfig.defconfig | 10 ++++++++++ .../Kconfig.intel_adsp_cavs25 | 5 +++++ .../Kconfig.intel_adsp_cavs25_tgph | 5 +++++ .../intel_adsp_cavs25/board.cmake | 0 boards/intel/intel_adsp_cavs25/board.yml | 11 ++++++++++ .../doc/chromebooks_adsp.rst | 2 +- .../intel_adsp_cavs25/doc/index.rst | 0 .../doc/intel_adsp_generic.rst | 18 ++++++++--------- .../intel_adsp_cavs25/intel_adsp_cavs25.dts | 0 .../intel_adsp_cavs25/intel_adsp_cavs25.yaml | 0 .../intel_adsp_cavs25_defconfig | 4 ---- .../intel_adsp_cavs25_tgph.dts | 0 .../intel_adsp_cavs25_tgph.yaml | 0 .../intel_adsp_cavs25_tgph_defconfig | 5 ----- .../intel_adsp_cavs25/pre_dt_board.cmake | 0 17 files changed, 41 insertions(+), 51 deletions(-) delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.board delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_cavs25/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 create mode 100644 boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/board.cmake (100%) create mode 100644 boards/intel/intel_adsp_cavs25/board.yml rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/doc/chromebooks_adsp.rst (99%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/doc/index.rst (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/doc/intel_adsp_generic.rst (93%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25.dts (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25.yaml (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25_defconfig (76%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig (76%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_cavs25/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.board b/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.board deleted file mode 100644 index 275d43b3c778..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.board +++ /dev/null @@ -1,12 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS25 - bool "Intel ADSP CAVS 2.5" - depends on SOC_SERIES_INTEL_ADSP_CAVS - -config BOARD_INTEL_ADSP_CAVS25_TGPH - bool "Intel ADSP CAVS 2.5 for Tiger Lake H PCH" - depends on SOC_SERIES_INTEL_ADSP_CAVS diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.defconfig b/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.defconfig deleted file mode 100644 index 03d5c7a1ad35..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/Kconfig.defconfig +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2020 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH - -config BOARD - default "intel_adsp_cavs25" if BOARD_INTEL_ADSP_CAVS25 - default "intel_adsp_cavs25_tgph" if BOARD_INTEL_ADSP_CAVS25_TGPH - - - -if DAI_INTEL_SSP - -config DAI_SSP_HAS_POWER_CONTROL - def_bool y - -endif - -endif # BOARD_INTEL_ADSP_CAVS25 || BOARD_INTEL_ADSP_CAVS25_TGPH diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.defconfig b/boards/intel/intel_adsp_cavs25/Kconfig.defconfig new file mode 100644 index 000000000000..eafedb0c550e --- /dev/null +++ b/boards/intel/intel_adsp_cavs25/Kconfig.defconfig @@ -0,0 +1,10 @@ +# Copyright (c) 2020-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +if DAI_INTEL_SSP + +config DAI_SSP_HAS_POWER_CONTROL + def_bool y + +endif diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 b/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 new file mode 100644 index 000000000000..a408d1b70462 --- /dev/null +++ b/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS25 + select SOC_INTEL_CAVS_V25 diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph b/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph new file mode 100644 index 000000000000..409d6937099c --- /dev/null +++ b/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph @@ -0,0 +1,5 @@ +# Copyright (c) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_CAVS25_TGPH + select SOC_INTEL_CAVS_V25 diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/board.cmake b/boards/intel/intel_adsp_cavs25/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/board.cmake rename to boards/intel/intel_adsp_cavs25/board.cmake diff --git a/boards/intel/intel_adsp_cavs25/board.yml b/boards/intel/intel_adsp_cavs25/board.yml new file mode 100644 index 000000000000..0886ab10677f --- /dev/null +++ b/boards/intel/intel_adsp_cavs25/board.yml @@ -0,0 +1,11 @@ +boards: + + - name: intel_adsp_cavs25 + vendor: intel + socs: + - name: intel_tgl_adsp + + - name: intel_adsp_cavs25_tgph + vendor: intel + socs: + - name: intel_tgl_adsp diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/chromebooks_adsp.rst b/boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst similarity index 99% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/chromebooks_adsp.rst rename to boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst index 867df7b83897..b796a9de5fd0 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/chromebooks_adsp.rst +++ b/boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst @@ -366,7 +366,7 @@ the Crouton environment installed above. Copy them: .. code-block:: console - dev$ scp soc/xtensa/intel_adsp/tools/cavstool.py user@crouton: + dev$ scp soc/intel/intel_adsp/tools/cavstool.py user@crouton: Then start the service in the Crouton environment: diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/index.rst b/boards/intel/intel_adsp_cavs25/doc/index.rst similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/index.rst rename to boards/intel/intel_adsp_cavs25/doc/index.rst diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst b/boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst similarity index 93% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst rename to boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst index 6b0a4526fe40..375f73b0c103 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst +++ b/boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst @@ -141,7 +141,7 @@ undocumented rimage precedence rules it's best to use only one way at a time. - For board-specific needs you can define WEST_SIGN_OPTS in ``boards/my/board/board.cmake``, see example in - ``soc/xtensa/intel_adsp/common/CMakeLists.txt`` + ``soc/intel/intel_adsp/common/CMakeLists.txt`` Starting with Zephyr 3.6.0, ``west flash`` does not invoke ``west sign`` anymore and you cannot pass rimage parameters to ``west flash`` anymore. To @@ -162,16 +162,16 @@ this point onward, we will refer to the board as the "remote host" and your development machine as the "local host". Copy the below scripts to the cAVS board. -:zephyr_file:`soc/xtensa/intel_adsp/tools/remote-fw-service.py` will receive +:zephyr_file:`soc/intel/intel_adsp/tools/remote-fw-service.py` will receive the binary sent over the network by West and invoke -:zephyr_file:`soc/xtensa/intel_adsp/tools/cavstool.py` (referred to as the +:zephyr_file:`soc/intel/intel_adsp/tools/cavstool.py` (referred to as the "cAVS tool"), which performs the flash and captures the log. Start :file:`remote-fw-service.py`. .. code-block:: console - scp -r $ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool.py username@remotehostname - scp -r $ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/remote-fw-service.py username@remotehostname + scp -r $ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool.py username@remotehostname + scp -r $ZEPHYR_BASE/soc/intel/intel_adsp/tools/remote-fw-service.py username@remotehostname ssh username@remotehostname sudo ./remote-fw-service.py @@ -179,7 +179,7 @@ the binary sent over the network by West and invoke communicate. It forwards logs collected by :file:`cavstool.py` on port 9999 (referred to as its "log port") and services requests on port 10000 (its "requests port"). When you run West or Twister on your local host, -it sends requests using the :zephyr_file:`soc/xtensa/intel_adsp/tools/cavstool_client.py` +it sends requests using the :zephyr_file:`soc/intel/intel_adsp/tools/cavstool_client.py` script (referred to as "cAVS tool client"). It also uses ports 9999 and 10000 on your local host, so be sure those ports are free. @@ -193,7 +193,7 @@ Running tests with Twister is slightly more complicated. .. code-block:: console - twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world + twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world If your network is set up such that the TCP connection from :file:`cavstool_client.py` to :file:`remote-fw-service.py` is forwarded through @@ -204,7 +204,7 @@ the port numbers to the intermediate host name. .. code-block:: console west flash --remote-host intermediatehost:reqport --pty remotehostname:logport - twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world + twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world You can also save this information to a hardware map file and pass that to Twister. @@ -222,7 +222,7 @@ Here's a sample ``cavs.map``: platform: intel_adsp_cavs25 product: None runner: intel_adsp - serial_pty: "/home/zephyrus/zephyrproject/zephyr/soc/xtensa/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" + serial_pty: "/home/zephyrus/zephyrproject/zephyr/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" runner_params: - --remote-host=remotehostname:reqport diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25.dts b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.dts similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25.dts rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.dts diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25.yaml b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.yaml similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25.yaml rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.yaml diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig similarity index 76% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig index 18a587061767..4951facc8820 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_defconfig +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig @@ -2,10 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y -CONFIG_SOC_INTEL_CAVS_V25=y -CONFIG_BOARD_INTEL_ADSP_CAVS25=y - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig similarity index 76% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig index 2787e3649f9d..18b17fb4d09b 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig @@ -2,11 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_INTEL_CAVS_V25=y -CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH=y -CONFIG_SOC_SERIES_INTEL_ADSP_CAVS=y - - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/boards_legacy/xtensa/intel_adsp_cavs25/pre_dt_board.cmake b/boards/intel/intel_adsp_cavs25/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_cavs25/pre_dt_board.cmake rename to boards/intel/intel_adsp_cavs25/pre_dt_board.cmake From 689cc2bdb8b1e2f42dfcfe0c8b17ef14be3733ed Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 16:50:42 +0100 Subject: [PATCH 04/18] boards: xtensa: intel_adsp_cavs25_tgph: change to board variant Change `intel_adsp_cavs25_tgph` board definition to be HWMv2 board variant `intel_adsp_cavs25/intel_tgl_adsp/tgph` Signed-off-by: Dmitrii Golovanov --- .../Kconfig.intel_adsp_cavs25_tgph | 5 ----- boards/intel/intel_adsp_cavs25/board.cmake | 2 +- boards/intel/intel_adsp_cavs25/board.yml | 18 +++++++----------- .../intel_adsp_cavs25_defconfig | 2 ++ ...intel_adsp_cavs25_intel_tgl_adsp_tgph.dts} | 0 ...ntel_adsp_cavs25_intel_tgl_adsp_tgph.yaml} | 2 +- ..._adsp_cavs25_intel_tgl_adsp_tgph_defconfig | 8 ++++++++ .../intel_adsp_cavs25_tgph_defconfig | 19 ------------------- 8 files changed, 19 insertions(+), 37 deletions(-) delete mode 100644 boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph rename boards/intel/intel_adsp_cavs25/{intel_adsp_cavs25_tgph.dts => intel_adsp_cavs25_intel_tgl_adsp_tgph.dts} (100%) rename boards/intel/intel_adsp_cavs25/{intel_adsp_cavs25_tgph.yaml => intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml} (81%) create mode 100644 boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig delete mode 100644 boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph b/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph deleted file mode 100644 index 409d6937099c..000000000000 --- a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25_tgph +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_CAVS25_TGPH - select SOC_INTEL_CAVS_V25 diff --git a/boards/intel/intel_adsp_cavs25/board.cmake b/boards/intel/intel_adsp_cavs25/board.cmake index 1bdb2698c12f..b42b72ccc609 100644 --- a/boards/intel/intel_adsp_cavs25/board.cmake +++ b/boards/intel/intel_adsp_cavs25/board.cmake @@ -13,7 +13,7 @@ if(CONFIG_BOARD_INTEL_ADSP_CAVS25) board_set_rimage_target(tgl) endif() -if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) +if(CONFIG_BOARD_INTEL_ADSP_CAVS25_INTEL_TGL_ADSP_TGPH) board_set_rimage_target(tgl-h) endif() diff --git a/boards/intel/intel_adsp_cavs25/board.yml b/boards/intel/intel_adsp_cavs25/board.yml index 0886ab10677f..8a06f8d11856 100644 --- a/boards/intel/intel_adsp_cavs25/board.yml +++ b/boards/intel/intel_adsp_cavs25/board.yml @@ -1,11 +1,7 @@ -boards: - - - name: intel_adsp_cavs25 - vendor: intel - socs: - - name: intel_tgl_adsp - - - name: intel_adsp_cavs25_tgph - vendor: intel - socs: - - name: intel_tgl_adsp +board: + name: intel_adsp_cavs25 + vendor: intel + socs: + - name: intel_tgl_adsp + variants: + - name: 'tgph' diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig index 4951facc8820..24443bce131f 100644 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig @@ -1,3 +1,5 @@ +# Copyright (c) 2020-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 CONFIG_MAIN_STACK_SIZE=2048 diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.dts similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.dts diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml similarity index 81% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml index f11256de9bf2..934af98edf04 100644 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph.yaml +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_cavs25_tgph +identifier: intel_adsp_cavs25/intel_tgl_adsp/tgph name: cAVS 2.5 Audio DSP for Tiger Lake H PCH (Converged Audio Voice and Speech) type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig new file mode 100644 index 000000000000..a0b722300911 --- /dev/null +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig @@ -0,0 +1,8 @@ +# Copyright (c) 2020-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +CONFIG_DAI_SSP_HAS_POWER_CONTROL=y + +CONFIG_MP_MAX_NUM_CPUS=2 +CONFIG_CORE_COUNT=2 diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig deleted file mode 100644 index 18b17fb4d09b..000000000000 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_tgph_defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -CONFIG_MAIN_STACK_SIZE=2048 - -CONFIG_GEN_ISR_TABLES=y -CONFIG_GEN_IRQ_VECTOR_TABLE=n - -CONFIG_XTENSA_RESET_VECTOR=y - -CONFIG_XTENSA_USE_CORE_CRT1=y - -CONFIG_MULTI_LEVEL_INTERRUPTS=y -CONFIG_2ND_LEVEL_INTERRUPTS=y - -CONFIG_BUILD_OUTPUT_BIN=n - -CONFIG_DAI_SSP_HAS_POWER_CONTROL=y - -CONFIG_DCACHE_LINE_SIZE=64 From 87dd953c97ec7492bc59287943f36cd18db8e52f Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 16:55:24 +0100 Subject: [PATCH 05/18] boards: xtensa: intel_adsp_ace15_mtpm: move and convert to HWMv2 Move and convert to HWMv2 intel_adsp_ace15_mptm board configuration. Signed-off-by: Dmitrii Golovanov --- .../xtensa/intel_adsp_ace15_mtpm/Kconfig.board | 8 -------- .../intel_adsp_ace15_mtpm/Kconfig.defconfig | 17 ----------------- .../intel_adsp_ace15_mtpm/Kconfig.defconfig | 10 ++++++++++ .../Kconfig.intel_adsp_ace15_mtpm | 7 +++++++ .../intel_adsp_ace15_mtpm/board.cmake | 0 boards/intel/intel_adsp_ace15_mtpm/board.yml | 5 +++++ .../intel_adsp_ace15_mtpm/doc/index.rst | 0 .../intel_adsp_ace15_mtpm.dts | 0 .../intel_adsp_ace15_mtpm.yaml | 0 .../intel_adsp_ace15_mtpm_defconfig | 4 ---- .../intel_adsp_ace15_mtpm/pre_dt_board.cmake | 0 11 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.board delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/board.cmake (100%) create mode 100644 boards/intel/intel_adsp_ace15_mtpm/board.yml rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/doc/index.rst (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig (68%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace15_mtpm/pre_dt_board.cmake (100%) diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.board b/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.board deleted file mode 100644 index d51735c9caa0..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE15_MTPM - bool "Intel ADSP ACE 1.5 Meteor PCH M" - depends on SOC_SERIES_INTEL_ACE diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig b/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig deleted file mode 100644 index ca7aa07cd95e..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/Kconfig.defconfig +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_INTEL_ADSP_ACE15_MTPM - -config BOARD - default "intel_adsp_ace15_mtpm" - -if DAI_INTEL_SSP - -config DAI_SSP_HAS_POWER_CONTROL - def_bool y - -endif - -endif # BOARD_INTEL_ADSP_ACE15_MTPM diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig new file mode 100644 index 000000000000..3408fb44a467 --- /dev/null +++ b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig @@ -0,0 +1,10 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +if DAI_INTEL_SSP + +config DAI_SSP_HAS_POWER_CONTROL + def_bool y + +endif diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm new file mode 100644 index 000000000000..2fa6580f6a41 --- /dev/null +++ b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm @@ -0,0 +1,7 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_ACE15_MTPM + bool + select SOC_INTEL_ACE15_MTPM diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/board.cmake b/boards/intel/intel_adsp_ace15_mtpm/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/board.cmake rename to boards/intel/intel_adsp_ace15_mtpm/board.cmake diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.yml b/boards/intel/intel_adsp_ace15_mtpm/board.yml new file mode 100644 index 000000000000..70aa727a7e05 --- /dev/null +++ b/boards/intel/intel_adsp_ace15_mtpm/board.yml @@ -0,0 +1,5 @@ +board: + name: intel_adsp_ace15_mtpm + vendor: intel + socs: + - name: intel_ace15_mtpm diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/doc/index.rst b/boards/intel/intel_adsp_ace15_mtpm/doc/index.rst similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/doc/index.rst rename to boards/intel/intel_adsp_ace15_mtpm/doc/index.rst diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts b/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts rename to boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml b/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml rename to boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig b/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig similarity index 68% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig rename to boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig index b544d3db403c..2237dfb963a2 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig +++ b/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig @@ -2,10 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ACE=y -CONFIG_SOC_INTEL_ACE15_MTPM=y -CONFIG_BOARD_INTEL_ADSP_ACE15_MTPM=y - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/pre_dt_board.cmake b/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/pre_dt_board.cmake rename to boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake From e4af371e4bcc97da2adb58a77945d1cb643fa30f Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 6 Feb 2024 17:02:33 +0100 Subject: [PATCH 06/18] boards: xtensa: intel_adsp_ace20_lnl: move and convert to HWMv2 Move and convert to HWMv2 intel_adsp_ace20_lnl board configuration. Signed-off-by: Dmitrii Golovanov --- .../xtensa/intel_adsp_ace20_lnl/Kconfig.board | 8 -------- .../xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig | 10 ---------- .../intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl | 5 +++++ .../xtensa => intel}/intel_adsp_ace20_lnl/board.cmake | 0 boards/intel/intel_adsp_ace20_lnl/board.yml | 5 +++++ .../intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts | 0 .../intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml | 0 .../intel_adsp_ace20_lnl_defconfig | 4 ---- 8 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board delete mode 100644 boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig create mode 100644 boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/board.cmake (100%) create mode 100644 boards/intel/intel_adsp_ace20_lnl/board.yml rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml (100%) rename boards/{boards_legacy/xtensa => intel}/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig (70%) diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board b/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board deleted file mode 100644 index 26994dfb6c5f..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.board +++ /dev/null @@ -1,8 +0,0 @@ -# Xtensa board configuration - -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE20_LNL - bool "Intel ADSP ACE 2.0 Lunar Lake PCH" - depends on SOC_SERIES_INTEL_ACE diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig b/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig deleted file mode 100644 index 756481eba01f..000000000000 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if BOARD_INTEL_ADSP_ACE20_LNL - -config BOARD - default "intel_adsp_ace20_lnl" - -endif # BOARD_INTEL_ADSP_ACE20_LNL diff --git a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl new file mode 100644 index 000000000000..49b40b941d1c --- /dev/null +++ b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl @@ -0,0 +1,5 @@ +# Copyright (c) 2022-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config BOARD_INTEL_ADSP_ACE20_LNL + select SOC_INTEL_ACE20_LNL diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/board.cmake b/boards/intel/intel_adsp_ace20_lnl/board.cmake similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/board.cmake rename to boards/intel/intel_adsp_ace20_lnl/board.cmake diff --git a/boards/intel/intel_adsp_ace20_lnl/board.yml b/boards/intel/intel_adsp_ace20_lnl/board.yml new file mode 100644 index 000000000000..aadbf829f397 --- /dev/null +++ b/boards/intel/intel_adsp_ace20_lnl/board.yml @@ -0,0 +1,5 @@ +board: + name: intel_adsp_ace20_lnl + vendor: intel + socs: + - name: intel_ace20_lnl diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml similarity index 100% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml diff --git a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig similarity index 70% rename from boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig rename to boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig index 9be759e2e9ab..3d897eb96732 100644 --- a/boards/boards_legacy/xtensa/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig +++ b/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig @@ -2,10 +2,6 @@ CONFIG_MAIN_STACK_SIZE=2048 -CONFIG_SOC_SERIES_INTEL_ACE=y -CONFIG_SOC_INTEL_ACE20_LNL=y -CONFIG_BOARD_INTEL_ADSP_ACE20_LNL=y - CONFIG_GEN_ISR_TABLES=y CONFIG_GEN_IRQ_VECTOR_TABLE=n From 95a94d1ab911c1cb6c1a29def0b4a25233986d0b Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 13 Feb 2024 01:49:08 +0100 Subject: [PATCH 07/18] scripts: west: runners: intel_adsp: Adjust path to HWMv2 Adjust script path to HWMv2 location at `soc/intel/intel_adsp/tools` Signed-off-by: Dmitrii Golovanov --- scripts/west_commands/runners/intel_adsp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/west_commands/runners/intel_adsp.py b/scripts/west_commands/runners/intel_adsp.py index f7587331dc36..13dbe07819ec 100644 --- a/scripts/west_commands/runners/intel_adsp.py +++ b/scripts/west_commands/runners/intel_adsp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # # SPDX-License-Identifier: Apache-2.0 @@ -14,7 +14,7 @@ from runners.core import ZephyrBinaryRunner, RunnerCaps from zephyr_ext_common import ZEPHYR_BASE -DEFAULT_CAVSTOOL='soc/xtensa/intel_adsp/tools/cavstool_client.py' +DEFAULT_CAVSTOOL='soc/intel/intel_adsp/tools/cavstool_client.py' class SignParamError(argparse.Action): 'User-friendly feedback when trying to sign with west flash' From 43069dd80d1bd9aecf9ed4bc1b1a2bd0042c61a6 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Tue, 13 Feb 2024 22:24:29 +0100 Subject: [PATCH 08/18] soc: boards: xtensa: intel_adsp_cavs25: Rename with HWMv2 Rename for better HWMv2 use: SoC - `intel_tgl_adsp` to `cavs25` Resulting name changes for boards: `intel_adsp_cavs25/intel_tgl_adsp` -> `intel_adsp_cavs25/cavs25` `intel_adsp_cavs25/intel_tgl_adsp/tgph` -> `intel_adsp_cavs25/cavs25/tgph` Signed-off-by: Dmitrii Golovanov --- boards/intel/intel_adsp_cavs25/board.cmake | 2 +- boards/intel/intel_adsp_cavs25/board.yml | 2 +- ...ntel_tgl_adsp_tgph.dts => intel_adsp_cavs25_cavs25_tgph.dts} | 0 ...el_tgl_adsp_tgph.yaml => intel_adsp_cavs25_cavs25_tgph.yaml} | 2 +- ...p_tgph_defconfig => intel_adsp_cavs25_cavs25_tgph_defconfig} | 0 soc/intel/intel_adsp/cavs/CMakeLists.txt | 2 +- soc/intel/intel_adsp/cavs/Kconfig.soc | 2 +- soc/intel/intel_adsp/soc.yml | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename boards/intel/intel_adsp_cavs25/{intel_adsp_cavs25_intel_tgl_adsp_tgph.dts => intel_adsp_cavs25_cavs25_tgph.dts} (100%) rename boards/intel/intel_adsp_cavs25/{intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml => intel_adsp_cavs25_cavs25_tgph.yaml} (81%) rename boards/intel/intel_adsp_cavs25/{intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig => intel_adsp_cavs25_cavs25_tgph_defconfig} (100%) diff --git a/boards/intel/intel_adsp_cavs25/board.cmake b/boards/intel/intel_adsp_cavs25/board.cmake index b42b72ccc609..46692b0b0289 100644 --- a/boards/intel/intel_adsp_cavs25/board.cmake +++ b/boards/intel/intel_adsp_cavs25/board.cmake @@ -13,7 +13,7 @@ if(CONFIG_BOARD_INTEL_ADSP_CAVS25) board_set_rimage_target(tgl) endif() -if(CONFIG_BOARD_INTEL_ADSP_CAVS25_INTEL_TGL_ADSP_TGPH) +if(CONFIG_BOARD_INTEL_ADSP_CAVS25_CAVS25_TGPH) board_set_rimage_target(tgl-h) endif() diff --git a/boards/intel/intel_adsp_cavs25/board.yml b/boards/intel/intel_adsp_cavs25/board.yml index 8a06f8d11856..22394a4fc5eb 100644 --- a/boards/intel/intel_adsp_cavs25/board.yml +++ b/boards/intel/intel_adsp_cavs25/board.yml @@ -2,6 +2,6 @@ board: name: intel_adsp_cavs25 vendor: intel socs: - - name: intel_tgl_adsp + - name: cavs25 variants: - name: 'tgph' diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.dts b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.dts similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.dts rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.dts diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml similarity index 81% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml index 934af98edf04..ff05000c0459 100644 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph.yaml +++ b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_cavs25/intel_tgl_adsp/tgph +identifier: intel_adsp_cavs25/cavs25/tgph name: cAVS 2.5 Audio DSP for Tiger Lake H PCH (Converged Audio Voice and Speech) type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig b/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph_defconfig similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_intel_tgl_adsp_tgph_defconfig rename to boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph_defconfig diff --git a/soc/intel/intel_adsp/cavs/CMakeLists.txt b/soc/intel/intel_adsp/cavs/CMakeLists.txt index 5226f1b05352..5c253147aeee 100644 --- a/soc/intel/intel_adsp/cavs/CMakeLists.txt +++ b/soc/intel/intel_adsp/cavs/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 zephyr_include_directories(include) -zephyr_include_directories(include/${SOC_NAME}) +zephyr_include_directories(include/${SOC_TOOLCHAIN_NAME}) zephyr_library_include_directories(${ZEPHYR_BASE}/drivers) zephyr_library_sources( diff --git a/soc/intel/intel_adsp/cavs/Kconfig.soc b/soc/intel/intel_adsp/cavs/Kconfig.soc index a8c7f0b469b7..74065dfe81af 100644 --- a/soc/intel/intel_adsp/cavs/Kconfig.soc +++ b/soc/intel/intel_adsp/cavs/Kconfig.soc @@ -16,7 +16,7 @@ config SOC_INTEL_CAVS_V25 Intel Tiger Lake config SOC - default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 + default "cavs25" if SOC_INTEL_CAVS_V25 config SOC_TOOLCHAIN_NAME default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml index 33418d53a367..a29f650a2fe4 100644 --- a/soc/intel/intel_adsp/soc.yml +++ b/soc/intel/intel_adsp/soc.yml @@ -7,4 +7,4 @@ family: - name: intel_ace20_lnl - name: cavs socs: - - name: intel_tgl_adsp + - name: cavs25 From a236ebb70454c9d4f3f9d99edc360ad548cb77b9 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 14 Feb 2024 08:22:10 +0100 Subject: [PATCH 09/18] boards: xtensa: intel_adsp_cavs25: Rename board with HWMv2 Rename for better HWMv2 use: board - `intel_adsp_cavs25` to `intel_adsp` Resulting name changes for boards: `intel_adsp_cavs25/cavs25` -> `intel_adsp/cavs25` `intel_adsp_cavs25/cavs25/tgph` -> `intel_adsp/cavs25/tgph` Signed-off-by: Dmitrii Golovanov --- .../Kconfig.defconfig | 0 .../Kconfig.intel_adsp} | 2 +- .../{intel_adsp_cavs25 => intel_adsp}/board.cmake | 2 +- .../{intel_adsp_cavs25 => intel_adsp}/board.yml | 2 +- .../doc/chromebooks_adsp.rst | 4 ++-- .../doc/intel_adsp_cavs25.rst} | 0 .../doc/intel_adsp_generic.rst | 12 ++++++------ .../intel_adsp_cavs25.dts | 0 .../intel_adsp_cavs25.yaml | 2 +- .../intel_adsp_cavs25_cavs25_tgph.dts | 0 .../intel_adsp_cavs25_defconfig | 0 .../intel_adsp_cavs25_tgph.yaml} | 2 +- .../intel_adsp_cavs25_tgph_defconfig} | 0 .../pre_dt_board.cmake | 0 14 files changed, 13 insertions(+), 13 deletions(-) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/Kconfig.defconfig (100%) rename boards/intel/{intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 => intel_adsp/Kconfig.intel_adsp} (77%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/board.cmake (90%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/board.yml (77%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/doc/chromebooks_adsp.rst (99%) rename boards/intel/{intel_adsp_cavs25/doc/index.rst => intel_adsp/doc/intel_adsp_cavs25.rst} (100%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/doc/intel_adsp_generic.rst (97%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/intel_adsp_cavs25.dts (100%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/intel_adsp_cavs25.yaml (87%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/intel_adsp_cavs25_cavs25_tgph.dts (100%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/intel_adsp_cavs25_defconfig (100%) rename boards/intel/{intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml => intel_adsp/intel_adsp_cavs25_tgph.yaml} (83%) rename boards/intel/{intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph_defconfig => intel_adsp/intel_adsp_cavs25_tgph_defconfig} (100%) rename boards/intel/{intel_adsp_cavs25 => intel_adsp}/pre_dt_board.cmake (100%) diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.defconfig b/boards/intel/intel_adsp/Kconfig.defconfig similarity index 100% rename from boards/intel/intel_adsp_cavs25/Kconfig.defconfig rename to boards/intel/intel_adsp/Kconfig.defconfig diff --git a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 b/boards/intel/intel_adsp/Kconfig.intel_adsp similarity index 77% rename from boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 rename to boards/intel/intel_adsp/Kconfig.intel_adsp index a408d1b70462..f37f54227ed5 100644 --- a/boards/intel/intel_adsp_cavs25/Kconfig.intel_adsp_cavs25 +++ b/boards/intel/intel_adsp/Kconfig.intel_adsp @@ -1,5 +1,5 @@ # Copyright (c) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -config BOARD_INTEL_ADSP_CAVS25 +config BOARD_INTEL_ADSP select SOC_INTEL_CAVS_V25 diff --git a/boards/intel/intel_adsp_cavs25/board.cmake b/boards/intel/intel_adsp/board.cmake similarity index 90% rename from boards/intel/intel_adsp_cavs25/board.cmake rename to boards/intel/intel_adsp/board.cmake index 46692b0b0289..1bdb2698c12f 100644 --- a/boards/intel/intel_adsp_cavs25/board.cmake +++ b/boards/intel/intel_adsp/board.cmake @@ -13,7 +13,7 @@ if(CONFIG_BOARD_INTEL_ADSP_CAVS25) board_set_rimage_target(tgl) endif() -if(CONFIG_BOARD_INTEL_ADSP_CAVS25_CAVS25_TGPH) +if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) board_set_rimage_target(tgl-h) endif() diff --git a/boards/intel/intel_adsp_cavs25/board.yml b/boards/intel/intel_adsp/board.yml similarity index 77% rename from boards/intel/intel_adsp_cavs25/board.yml rename to boards/intel/intel_adsp/board.yml index 22394a4fc5eb..cb496cd3346d 100644 --- a/boards/intel/intel_adsp_cavs25/board.yml +++ b/boards/intel/intel_adsp/board.yml @@ -1,5 +1,5 @@ board: - name: intel_adsp_cavs25 + name: intel_adsp vendor: intel socs: - name: cavs25 diff --git a/boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst b/boards/intel/intel_adsp/doc/chromebooks_adsp.rst similarity index 99% rename from boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst rename to boards/intel/intel_adsp/doc/chromebooks_adsp.rst index b796a9de5fd0..ec9ad373d3c2 100644 --- a/boards/intel/intel_adsp_cavs25/doc/chromebooks_adsp.rst +++ b/boards/intel/intel_adsp/doc/chromebooks_adsp.rst @@ -386,7 +386,7 @@ a "zephyr.ri" file to be copied to the device. .. code-block:: console - dev$ west build -b intel_adsp_cavs25 samples/hello_world + dev$ west build -b intel_adsp/cavs25 samples/hello_world dev$ west sign --tool-data=~/rimage/config -t ~/rimage/rimage -- \ -k $ZEPHYR_BASE/../modules/audio/sof/keys/otc_private_key_3k.pem @@ -401,7 +401,7 @@ the logging script. .. code-block:: console dev$ west flash --remote-host crouton - Hello World! intel_adsp_cavs25 + Hello World! intel_adsp Misc References *************** diff --git a/boards/intel/intel_adsp_cavs25/doc/index.rst b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst similarity index 100% rename from boards/intel/intel_adsp_cavs25/doc/index.rst rename to boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst diff --git a/boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst b/boards/intel/intel_adsp/doc/intel_adsp_generic.rst similarity index 97% rename from boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst rename to boards/intel/intel_adsp/doc/intel_adsp_generic.rst index 375f73b0c103..e5918478e3c4 100644 --- a/boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_generic.rst @@ -115,7 +115,7 @@ Build as usual. .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: intel_adsp_cavs25 + :board: intel_adsp/cavs25 :goals: build Signing @@ -193,7 +193,7 @@ Running tests with Twister is slightly more complicated. .. code-block:: console - twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world + twister -p intel_adsp/cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname,-l" --west-flash="--remote-host=remotehostname" -T samples/hello_world If your network is set up such that the TCP connection from :file:`cavstool_client.py` to :file:`remote-fw-service.py` is forwarded through @@ -204,14 +204,14 @@ the port numbers to the intermediate host name. .. code-block:: console west flash --remote-host intermediatehost:reqport --pty remotehostname:logport - twister -p intel_adsp_cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world + twister -p intel_adsp/cavs25 --device-testing --device-serial-pty="$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" --west-flash="--remote-host=remotehostname:reqport" -T samples/hello_world You can also save this information to a hardware map file and pass that to Twister. .. code-block:: console - twister -p intel_adsp_cavs25 --hardware-map cavs.map --device-testing -T samples/hello_world + twister -p intel_adsp/cavs25 --hardware-map cavs.map --device-testing -T samples/hello_world Here's a sample ``cavs.map``: @@ -219,7 +219,7 @@ Here's a sample ``cavs.map``: - connected: true id: None - platform: intel_adsp_cavs25 + platform: intel_adsp/cavs25 product: None runner: intel_adsp serial_pty: "/home/zephyrus/zephyrproject/zephyr/soc/intel/intel_adsp/tools/cavstool_client.py,-s,remotehostname:logport,-l" @@ -247,7 +247,7 @@ You should see the following at the end of the log if you are successful: .. code-block:: console ***** Booting Zephyr OS vx.x.x-xxx-gxxxxxxxxxxxx ***** - Hello World! intel_adsp_cavs25 + Hello World! intel_adsp Flashing to ACE-based ADSP -------------------------- diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.dts b/boards/intel/intel_adsp/intel_adsp_cavs25.dts similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.dts rename to boards/intel/intel_adsp/intel_adsp_cavs25.dts diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.yaml b/boards/intel/intel_adsp/intel_adsp_cavs25.yaml similarity index 87% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.yaml rename to boards/intel/intel_adsp/intel_adsp_cavs25.yaml index 8d175cbc6216..79982b426e7d 100644 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25.yaml +++ b/boards/intel/intel_adsp/intel_adsp_cavs25.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_cavs25 +identifier: intel_adsp/cavs25 name: cAVS 2.5 Audio DSP (converged Audio Voice and Speech) type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.dts b/boards/intel/intel_adsp/intel_adsp_cavs25_cavs25_tgph.dts similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.dts rename to boards/intel/intel_adsp/intel_adsp_cavs25_cavs25_tgph.dts diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig b/boards/intel/intel_adsp/intel_adsp_cavs25_defconfig similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_defconfig rename to boards/intel/intel_adsp/intel_adsp_cavs25_defconfig diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml b/boards/intel/intel_adsp/intel_adsp_cavs25_tgph.yaml similarity index 83% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml rename to boards/intel/intel_adsp/intel_adsp_cavs25_tgph.yaml index ff05000c0459..db3d32fad8fa 100644 --- a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph.yaml +++ b/boards/intel/intel_adsp/intel_adsp_cavs25_tgph.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_cavs25/cavs25/tgph +identifier: intel_adsp/cavs25/tgph name: cAVS 2.5 Audio DSP for Tiger Lake H PCH (Converged Audio Voice and Speech) type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph_defconfig b/boards/intel/intel_adsp/intel_adsp_cavs25_tgph_defconfig similarity index 100% rename from boards/intel/intel_adsp_cavs25/intel_adsp_cavs25_cavs25_tgph_defconfig rename to boards/intel/intel_adsp/intel_adsp_cavs25_tgph_defconfig diff --git a/boards/intel/intel_adsp_cavs25/pre_dt_board.cmake b/boards/intel/intel_adsp/pre_dt_board.cmake similarity index 100% rename from boards/intel/intel_adsp_cavs25/pre_dt_board.cmake rename to boards/intel/intel_adsp/pre_dt_board.cmake From 28c5fd366145a57636c0593c9683b0ab0fafad59 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 14 Feb 2024 09:03:30 +0100 Subject: [PATCH 10/18] tests: samples: boards: intel_adsp_cavs25: Rename with HWMv2 Adjust tests and samples to HWMv2 board rename: `intel_adsp_cavs25` -> `intel_adsp/cavs25` `intel_adsp_cavs25_tgph` -> `intel_adsp/cavs25/tgph` Signed-off-by: Dmitrii Golovanov --- samples/boards/intel_adsp/code_relocation/README.rst | 2 +- samples/boards/intel_adsp/code_relocation/sample.yaml | 2 +- samples/net/sockets/dumb_http_server/sample.yaml | 2 +- samples/net/sockets/websocket_client/sample.yaml | 2 +- tests/boards/intel_adsp/cache/testcase.yaml | 4 ++-- tests/boards/intel_adsp/hda/testcase.yaml | 4 ++-- tests/boards/intel_adsp/mm/testcase.yaml | 2 +- tests/boards/intel_adsp/smoke/testcase.yaml | 4 ++-- tests/boards/intel_adsp/ssp/testcase.yaml | 4 ++-- tests/drivers/clock_control/adsp_clock/testcase.yaml | 4 ++-- tests/drivers/dma/scatter_gather/testcase.yaml | 4 ++-- tests/kernel/smp_boot_delay/testcase.yaml | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/samples/boards/intel_adsp/code_relocation/README.rst b/samples/boards/intel_adsp/code_relocation/README.rst index 3ab0025f3c5d..84797018e7c5 100644 --- a/samples/boards/intel_adsp/code_relocation/README.rst +++ b/samples/boards/intel_adsp/code_relocation/README.rst @@ -20,7 +20,7 @@ This application can be built and executed as follows: .. zephyr-app-commands:: :zephyr-app: samples/hello_world - :board: intel_adsp_cavs25 + :board: intel_adsp/cavs25 :goals: build :compact: diff --git a/samples/boards/intel_adsp/code_relocation/sample.yaml b/samples/boards/intel_adsp/code_relocation/sample.yaml index 5fab5d98767e..6c0dfd6c7569 100644 --- a/samples/boards/intel_adsp/code_relocation/sample.yaml +++ b/samples/boards/intel_adsp/code_relocation/sample.yaml @@ -3,5 +3,5 @@ sample: name: cavs_code_reloc tests: sample.intel_adsp.code_relocation: - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 tags: linker diff --git a/samples/net/sockets/dumb_http_server/sample.yaml b/samples/net/sockets/dumb_http_server/sample.yaml index 13fd552b8aa0..23eee0b0d482 100644 --- a/samples/net/sockets/dumb_http_server/sample.yaml +++ b/samples/net/sockets/dumb_http_server/sample.yaml @@ -9,7 +9,7 @@ common: tags: - net - socket - platform_exclude: intel_adsp_cavs25 + platform_exclude: intel_adsp/cavs25 tests: sample.net.sockets.dumb_http_server: extra_configs: diff --git a/samples/net/sockets/websocket_client/sample.yaml b/samples/net/sockets/websocket_client/sample.yaml index 41ea3a113e98..a0472b856f96 100644 --- a/samples/net/sockets/websocket_client/sample.yaml +++ b/samples/net/sockets/websocket_client/sample.yaml @@ -12,5 +12,5 @@ sample: name: websocket_client tests: sample.net.sockets.websocket_client: - platform_exclude: intel_adsp_cavs25 + platform_exclude: intel_adsp/cavs25 harness: net diff --git a/tests/boards/intel_adsp/cache/testcase.yaml b/tests/boards/intel_adsp/cache/testcase.yaml index 93aaae71841b..7c2b30614faf 100644 --- a/tests/boards/intel_adsp/cache/testcase.yaml +++ b/tests/boards/intel_adsp/cache/testcase.yaml @@ -2,6 +2,6 @@ common: tags: boards tests: boards.intel_adsp.cache: - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 diff --git a/tests/boards/intel_adsp/hda/testcase.yaml b/tests/boards/intel_adsp/hda/testcase.yaml index 7e801157de5a..fd657b95b25e 100644 --- a/tests/boards/intel_adsp/hda/testcase.yaml +++ b/tests/boards/intel_adsp/hda/testcase.yaml @@ -1,7 +1,7 @@ common: - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 tests: boards.intel_adsp.hda: tags: diff --git a/tests/boards/intel_adsp/mm/testcase.yaml b/tests/boards/intel_adsp/mm/testcase.yaml index f7a80b8139fd..c714f41fe009 100644 --- a/tests/boards/intel_adsp/mm/testcase.yaml +++ b/tests/boards/intel_adsp/mm/testcase.yaml @@ -2,4 +2,4 @@ common: tags: boards tests: boards.intel_adsp.mm: - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 diff --git a/tests/boards/intel_adsp/smoke/testcase.yaml b/tests/boards/intel_adsp/smoke/testcase.yaml index 4339486839fa..9561d1c2d577 100644 --- a/tests/boards/intel_adsp/smoke/testcase.yaml +++ b/tests/boards/intel_adsp/smoke/testcase.yaml @@ -1,5 +1,5 @@ tests: boards.intel_adsp.smoke: - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 diff --git a/tests/boards/intel_adsp/ssp/testcase.yaml b/tests/boards/intel_adsp/ssp/testcase.yaml index d196a487aff7..e524a87784f7 100644 --- a/tests/boards/intel_adsp/ssp/testcase.yaml +++ b/tests/boards/intel_adsp/ssp/testcase.yaml @@ -7,6 +7,6 @@ tests: depends_on: - dai - dma - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 diff --git a/tests/drivers/clock_control/adsp_clock/testcase.yaml b/tests/drivers/clock_control/adsp_clock/testcase.yaml index 48df05a84623..04de6e55838f 100644 --- a/tests/drivers/clock_control/adsp_clock/testcase.yaml +++ b/tests/drivers/clock_control/adsp_clock/testcase.yaml @@ -3,6 +3,6 @@ tests: tags: - drivers - clock_control - platform_allow: intel_adsp_cavs25 + platform_allow: intel_adsp/cavs25 integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 diff --git a/tests/drivers/dma/scatter_gather/testcase.yaml b/tests/drivers/dma/scatter_gather/testcase.yaml index 6b05448a96ca..78b5e0f115ef 100644 --- a/tests/drivers/dma/scatter_gather/testcase.yaml +++ b/tests/drivers/dma/scatter_gather/testcase.yaml @@ -5,7 +5,7 @@ tests: - drivers - dma platform_allow: - - intel_adsp_cavs25 + - intel_adsp/cavs25 - frdm_k64f - mimxrt1060_evk - lpcxpresso55s36 @@ -13,6 +13,6 @@ tests: - native_posix_64 filter: dt_alias_exists("dma0") integration_platforms: - - intel_adsp_cavs25 + - intel_adsp/cavs25 - native_posix - native_posix_64 diff --git a/tests/kernel/smp_boot_delay/testcase.yaml b/tests/kernel/smp_boot_delay/testcase.yaml index 3aef08bc67e0..ea84c6d2cf03 100644 --- a/tests/kernel/smp_boot_delay/testcase.yaml +++ b/tests/kernel/smp_boot_delay/testcase.yaml @@ -3,7 +3,7 @@ tests: tags: - kernel - smp - platform_allow: intel_adsp_cavs25 qemu_x86_64 + platform_allow: intel_adsp/cavs25 qemu_x86_64 integration_platforms: - qemu_x86_64 kernel.multiprocessing.smp_boot_delay.minimallibc: @@ -12,7 +12,7 @@ tests: - kernel - smp - libc - platform_allow: intel_adsp_cavs25 qemu_x86_64 + platform_allow: intel_adsp/cavs25 qemu_x86_64 integration_platforms: - qemu_x86_64 extra_configs: From abff69a3f7c71e99539bdcc2d95ab2c02517b078 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 14 Feb 2024 09:06:28 +0100 Subject: [PATCH 11/18] doc: soc: boards: intel_adsp_cavs25: Rename with HWMv2 Adjust documentation to HWMv2 board rename: `intel_adsp_cavs25` -> `intel_adsp/cavs25` `intel_adsp_cavs25_tgph` -> `intel_adsp/cavs25/tgph` Signed-off-by: Dmitrii Golovanov --- doc/develop/sca/sparse.rst | 2 +- doc/develop/test/twister.rst | 6 +++--- soc/intel/intel_adsp/tools/cavstwist.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/develop/sca/sparse.rst b/doc/develop/sca/sparse.rst index 38b720d4448f..4af699fc3432 100644 --- a/doc/develop/sca/sparse.rst +++ b/doc/develop/sca/sparse.rst @@ -23,4 +23,4 @@ called with a ``-DZEPHYR_SCA_VARIANT=sparse`` parameter, e.g. .. code-block:: shell - west build -d hello -b intel_adsp_cavs25 zephyr/samples/hello_world -- -DZEPHYR_SCA_VARIANT=sparse + west build -d hello -b intel_adsp/cavs25 zephyr/samples/hello_world -- -DZEPHYR_SCA_VARIANT=sparse diff --git a/doc/develop/test/twister.rst b/doc/develop/test/twister.rst index b7f9fc733058..4f689b40d862 100644 --- a/doc/develop/test/twister.rst +++ b/doc/develop/test/twister.rst @@ -839,7 +839,7 @@ In this case you can run twister with the following options: .. code-block:: bash scripts/twister --device-testing --device-serial-pty "script.py" \ - -p intel_adsp_cavs25 -T tests/kernel + -p intel_adsp/cavs25 -T tests/kernel .. group-tab:: Windows @@ -1008,7 +1008,7 @@ hardware map: - connected: true id: None - platform: intel_adsp_cavs25 + platform: intel_adsp/cavs25 product: None runner: intel_adsp serial_pty: path/to/script.py @@ -1029,7 +1029,7 @@ work. It is equivalent to following west and twister commands. west flash --remote-host remote_host_ip_addr --key /path/to/key.pem - twister -p intel_adsp_cavs25 --device-testing --device-serial-pty script.py + twister -p intel_adsp/cavs25 --device-testing --device-serial-pty script.py --west-flash="--remote-host=remote_host_ip_addr,--key=/path/to/key.pem" .. group-tab:: Windows diff --git a/soc/intel/intel_adsp/tools/cavstwist.sh b/soc/intel/intel_adsp/tools/cavstwist.sh index 6854fa2fbb9a..89af3434317e 100755 --- a/soc/intel/intel_adsp/tools/cavstwist.sh +++ b/soc/intel/intel_adsp/tools/cavstwist.sh @@ -12,7 +12,7 @@ set -e # export CAVS_KEY=$HOME/otc_private_key_3k.pem # export CAVS_RIMAGE=$HOME/rimage # -# twister -p intel_adsp_cavs25 --device-testing \ +# twister -p intel_adsp/cavs25 --device-testing \ # --device-serial-pty=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh \ # --west-flash=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh # From bcf87e122aa25c7956c926e5c13adfc5d919dd5d Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sat, 17 Feb 2024 13:00:19 +0100 Subject: [PATCH 12/18] soc: boards: xtensa: intel_adsp_ace: Rename with HWMv2 Rename for better HWMv2 use: SoC - `intel_ace15_mtpm` --> `ace15_mtpm` SoC - `intel_ace20_lnl` --> `ace20_lnl` Resulting shortened name for boards: `intel_adsp_ace15_mtpm/intel_ace15_mtpm` --> `intel_adsp_ace15_mtpm/ace15_mtpm` `intel_adsp_ace20_lnl/intel_ace20_lnl` --> `intel_adsp_ace20_lnl/ace20_lnl` Signed-off-by: Dmitrii Golovanov --- boards/intel/intel_adsp_ace15_mtpm/board.yml | 2 +- boards/intel/intel_adsp_ace20_lnl/board.yml | 2 +- soc/intel/intel_adsp/ace/CMakeLists.txt | 4 ++-- soc/intel/intel_adsp/ace/Kconfig.soc | 4 ++-- soc/intel/intel_adsp/soc.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.yml b/boards/intel/intel_adsp_ace15_mtpm/board.yml index 70aa727a7e05..61857a04c407 100644 --- a/boards/intel/intel_adsp_ace15_mtpm/board.yml +++ b/boards/intel/intel_adsp_ace15_mtpm/board.yml @@ -2,4 +2,4 @@ board: name: intel_adsp_ace15_mtpm vendor: intel socs: - - name: intel_ace15_mtpm + - name: ace15_mtpm diff --git a/boards/intel/intel_adsp_ace20_lnl/board.yml b/boards/intel/intel_adsp_ace20_lnl/board.yml index aadbf829f397..6b3b748c7959 100644 --- a/boards/intel/intel_adsp_ace20_lnl/board.yml +++ b/boards/intel/intel_adsp_ace20_lnl/board.yml @@ -2,4 +2,4 @@ board: name: intel_adsp_ace20_lnl vendor: intel socs: - - name: intel_ace20_lnl + - name: ace20_lnl diff --git a/soc/intel/intel_adsp/ace/CMakeLists.txt b/soc/intel/intel_adsp/ace/CMakeLists.txt index 28626787c5e6..78d3d5b9d1e9 100644 --- a/soc/intel/intel_adsp/ace/CMakeLists.txt +++ b/soc/intel/intel_adsp/ace/CMakeLists.txt @@ -1,6 +1,6 @@ # Intel ACE SoC family CMake file # -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -15,7 +15,7 @@ zephyr_library_sources( ) zephyr_include_directories(include) -zephyr_include_directories(include/${SOC_NAME}) +zephyr_include_directories(include/${SOC_TOOLCHAIN_NAME}) zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget.c) zephyr_library_sources_ifdef(CONFIG_SOC_INTEL_COMM_WIDGET comm_widget_messages.c) diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc index 571a76991385..c8a9f785c607 100644 --- a/soc/intel/intel_adsp/ace/Kconfig.soc +++ b/soc/intel/intel_adsp/ace/Kconfig.soc @@ -24,5 +24,5 @@ config SOC_INTEL_ACE20_LNL ACE 2.0 Lunar Lake PCH config SOC - default "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM - default "intel_ace20_lnl" if SOC_INTEL_ACE20_LNL + default "ace15_mtpm" if SOC_INTEL_ACE15_MTPM + default "ace20_lnl" if SOC_INTEL_ACE20_LNL diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml index a29f650a2fe4..f65f1b97cf8e 100644 --- a/soc/intel/intel_adsp/soc.yml +++ b/soc/intel/intel_adsp/soc.yml @@ -3,8 +3,8 @@ family: series: - name: ace socs: - - name: intel_ace15_mtpm - - name: intel_ace20_lnl + - name: ace15_mtpm + - name: ace20_lnl - name: cavs socs: - name: cavs25 From b30f4c0037fb7ece7a49979ffef80c1621db8e9b Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sat, 17 Feb 2024 14:22:51 +0100 Subject: [PATCH 13/18] hwmv2: boards: intel_adsp: Overhaul board configurations Rename and join configurations for intel_adsp CAVS and ACE boards to benefit from HWMv2 shortened names with resulting names change: `intel_adsp_ace15_mtpm` --> `intel_adsp/ace15_mtpm` `intel_adsp_ace20_lnl` --> `intel_adsp/ace20_lnl` Signed-off-by: Dmitrii Golovanov --- boards/intel/intel_adsp/Kconfig.intel_adsp | 5 +- boards/intel/intel_adsp/board.cmake | 48 ++++++++++++++----- boards/intel/intel_adsp/board.yml | 16 ++++--- .../doc/intel_adsp_ace15_mtpm.rst} | 2 + .../intel_adsp/doc/intel_adsp_cavs25.rst | 2 + .../intel_adsp_ace15_mtpm.dts | 0 .../intel_adsp_ace15_mtpm.yaml | 2 +- .../intel_adsp_ace15_mtpm_defconfig | 0 .../intel_adsp_ace20_lnl.dts | 0 .../intel_adsp_ace20_lnl.yaml | 2 +- .../intel_adsp_ace20_lnl_defconfig | 0 boards/intel/intel_adsp/pre_dt_board.cmake | 4 ++ .../intel_adsp_ace15_mtpm/Kconfig.defconfig | 10 ---- .../Kconfig.intel_adsp_ace15_mtpm | 7 --- .../intel/intel_adsp_ace15_mtpm/board.cmake | 9 ---- boards/intel/intel_adsp_ace15_mtpm/board.yml | 5 -- .../intel_adsp_ace15_mtpm/pre_dt_board.cmake | 6 --- .../Kconfig.intel_adsp_ace20_lnl | 5 -- boards/intel/intel_adsp_ace20_lnl/board.cmake | 7 --- boards/intel/intel_adsp_ace20_lnl/board.yml | 5 -- 20 files changed, 58 insertions(+), 77 deletions(-) rename boards/intel/{intel_adsp_ace15_mtpm/doc/index.rst => intel_adsp/doc/intel_adsp_ace15_mtpm.rst} (99%) rename boards/intel/{intel_adsp_ace15_mtpm => intel_adsp}/intel_adsp_ace15_mtpm.dts (100%) rename boards/intel/{intel_adsp_ace15_mtpm => intel_adsp}/intel_adsp_ace15_mtpm.yaml (84%) rename boards/intel/{intel_adsp_ace15_mtpm => intel_adsp}/intel_adsp_ace15_mtpm_defconfig (100%) rename boards/intel/{intel_adsp_ace20_lnl => intel_adsp}/intel_adsp_ace20_lnl.dts (100%) rename boards/intel/{intel_adsp_ace20_lnl => intel_adsp}/intel_adsp_ace20_lnl.yaml (85%) rename boards/intel/{intel_adsp_ace20_lnl => intel_adsp}/intel_adsp_ace20_lnl_defconfig (100%) delete mode 100644 boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig delete mode 100644 boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm delete mode 100644 boards/intel/intel_adsp_ace15_mtpm/board.cmake delete mode 100644 boards/intel/intel_adsp_ace15_mtpm/board.yml delete mode 100644 boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake delete mode 100644 boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl delete mode 100644 boards/intel/intel_adsp_ace20_lnl/board.cmake delete mode 100644 boards/intel/intel_adsp_ace20_lnl/board.yml diff --git a/boards/intel/intel_adsp/Kconfig.intel_adsp b/boards/intel/intel_adsp/Kconfig.intel_adsp index f37f54227ed5..2e4c98447203 100644 --- a/boards/intel/intel_adsp/Kconfig.intel_adsp +++ b/boards/intel/intel_adsp/Kconfig.intel_adsp @@ -2,4 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 config BOARD_INTEL_ADSP - select SOC_INTEL_CAVS_V25 + select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25 + select SOC_INTEL_CAVS_V25 if BOARD_INTEL_ADSP_CAVS25_TGPH + select SOC_INTEL_ACE15_MTPM if BOARD_INTEL_ADSP_ACE15_MTPM + select SOC_INTEL_ACE20_LNL if BOARD_INTEL_ADSP_ACE20_LNL diff --git a/boards/intel/intel_adsp/board.cmake b/boards/intel/intel_adsp/board.cmake index 1bdb2698c12f..bcdfc3286467 100644 --- a/boards/intel/intel_adsp/board.cmake +++ b/boards/intel/intel_adsp/board.cmake @@ -1,20 +1,42 @@ +# Copyright (c) 2022-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 -if($ENV{CAVS_OLD_FLASHER}) - board_set_flasher_ifnset(misc-flasher) - board_finalize_runner_args(misc-flasher) -endif() +if(CONFIG_BOARD_INTEL_ADSP_CAVS25 OR CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) -board_set_flasher_ifnset(intel_adsp) + if($ENV{CAVS_OLD_FLASHER}) + board_set_flasher_ifnset(misc-flasher) + board_finalize_runner_args(misc-flasher) + endif() -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake") + board_set_flasher_ifnset(intel_adsp) -if(CONFIG_BOARD_INTEL_ADSP_CAVS25) -board_set_rimage_target(tgl) -endif() + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake") -if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) -board_set_rimage_target(tgl-h) -endif() + if(CONFIG_BOARD_INTEL_ADSP_CAVS25) + board_set_rimage_target(tgl) + endif() + + if(CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH) + board_set_rimage_target(tgl-h) + endif() + + board_finalize_runner_args(intel_adsp) + +elseif(CONFIG_BOARD_INTEL_ADSP_ACE15_MTPM) + + board_set_rimage_target(mtl) -board_finalize_runner_args(intel_adsp) + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace15_mtpm/board.cmake") + + board_finalize_runner_args(intel_adsp) + +elseif(CONFIG_BOARD_INTEL_ADSP_ACE20_LNL) + + set(SUPPORTED_EMU_PLATFORMS acesim) + + board_set_rimage_target(lnl) + + set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace20_lnl/board.cmake") + +endif() diff --git a/boards/intel/intel_adsp/board.yml b/boards/intel/intel_adsp/board.yml index cb496cd3346d..9295ae0c3eb2 100644 --- a/boards/intel/intel_adsp/board.yml +++ b/boards/intel/intel_adsp/board.yml @@ -1,7 +1,9 @@ -board: - name: intel_adsp - vendor: intel - socs: - - name: cavs25 - variants: - - name: 'tgph' +boards: + - name: intel_adsp + vendor: intel + socs: + - name: cavs25 + variants: + - name: 'tgph' + - name: ace15_mtpm + - name: ace20_lnl diff --git a/boards/intel/intel_adsp_ace15_mtpm/doc/index.rst b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst similarity index 99% rename from boards/intel/intel_adsp_ace15_mtpm/doc/index.rst rename to boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst index d31783cd944a..f1f7b77de0da 100644 --- a/boards/intel/intel_adsp_ace15_mtpm/doc/index.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst @@ -1,3 +1,5 @@ +:orphan: + .. _intel_adsp_ace15: Intel ADSP ACE 1.5 diff --git a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst index 437560562e09..df60b4f46467 100644 --- a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst @@ -1,3 +1,5 @@ +:orphan: + .. _intel_adsp_cavs25: Intel ADSP CAVS 2.5 diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.dts similarity index 100% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.dts rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm.dts diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml similarity index 84% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml index 9493e4c08da8..3449cda35f7b 100644 --- a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml +++ b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_ace15_mtpm +identifier: intel_adsp/ace15_mtpm name: ACE 1.5 MTL M Audio DSP type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig b/boards/intel/intel_adsp/intel_adsp_ace15_mtpm_defconfig similarity index 100% rename from boards/intel/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig rename to boards/intel/intel_adsp/intel_adsp_ace15_mtpm_defconfig diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.dts similarity index 100% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.dts rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl.dts diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml similarity index 85% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml index 693f3ad2ce63..47a025636544 100644 --- a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl.yaml +++ b/boards/intel/intel_adsp/intel_adsp_ace20_lnl.yaml @@ -1,4 +1,4 @@ -identifier: intel_adsp_ace20_lnl +identifier: intel_adsp/ace20_lnl name: ACE 2.0 LNL Audio DSP type: mcu arch: xtensa diff --git a/boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig b/boards/intel/intel_adsp/intel_adsp_ace20_lnl_defconfig similarity index 100% rename from boards/intel/intel_adsp_ace20_lnl/intel_adsp_ace20_lnl_defconfig rename to boards/intel/intel_adsp/intel_adsp_ace20_lnl_defconfig diff --git a/boards/intel/intel_adsp/pre_dt_board.cmake b/boards/intel/intel_adsp/pre_dt_board.cmake index 7a471ca8758f..9a917df707b0 100644 --- a/boards/intel/intel_adsp/pre_dt_board.cmake +++ b/boards/intel/intel_adsp/pre_dt_board.cmake @@ -1,6 +1,10 @@ # Copyright (c) 2022 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +if(NOT CONFIG_BOARD_INTEL_ADSP_ACE20_LNL) + # Suppress "unique_unit_address_if_enabled" to handle the following overlaps: # - dmic0: dmic0@10000 & dmic1: dmic1@10000 list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") + +endif() diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig deleted file mode 100644 index 3408fb44a467..000000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.defconfig +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -if DAI_INTEL_SSP - -config DAI_SSP_HAS_POWER_CONTROL - def_bool y - -endif diff --git a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm b/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm deleted file mode 100644 index 2fa6580f6a41..000000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/Kconfig.intel_adsp_ace15_mtpm +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE15_MTPM - bool - select SOC_INTEL_ACE15_MTPM diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.cmake b/boards/intel/intel_adsp_ace15_mtpm/board.cmake deleted file mode 100644 index e9778da4d844..000000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/board.cmake +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# -# SPDX-License-Identifier: Apache-2.0 - -board_set_rimage_target(mtl) - -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace15_mtpm/board.cmake") - -board_finalize_runner_args(intel_adsp) diff --git a/boards/intel/intel_adsp_ace15_mtpm/board.yml b/boards/intel/intel_adsp_ace15_mtpm/board.yml deleted file mode 100644 index 61857a04c407..000000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: intel_adsp_ace15_mtpm - vendor: intel - socs: - - name: ace15_mtpm diff --git a/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake b/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake deleted file mode 100644 index 7a471ca8758f..000000000000 --- a/boards/intel/intel_adsp_ace15_mtpm/pre_dt_board.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Suppress "unique_unit_address_if_enabled" to handle the following overlaps: -# - dmic0: dmic0@10000 & dmic1: dmic1@10000 -list(APPEND EXTRA_DTC_FLAGS "-Wno-unique_unit_address_if_enabled") diff --git a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl b/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl deleted file mode 100644 index 49b40b941d1c..000000000000 --- a/boards/intel/intel_adsp_ace20_lnl/Kconfig.intel_adsp_ace20_lnl +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2022-2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config BOARD_INTEL_ADSP_ACE20_LNL - select SOC_INTEL_ACE20_LNL diff --git a/boards/intel/intel_adsp_ace20_lnl/board.cmake b/boards/intel/intel_adsp_ace20_lnl/board.cmake deleted file mode 100644 index 04d679fba023..000000000000 --- a/boards/intel/intel_adsp_ace20_lnl/board.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: Apache-2.0 - -set(SUPPORTED_EMU_PLATFORMS acesim) - -board_set_rimage_target(lnl) - -set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in ace20_lnl/board.cmake") diff --git a/boards/intel/intel_adsp_ace20_lnl/board.yml b/boards/intel/intel_adsp_ace20_lnl/board.yml deleted file mode 100644 index 6b3b748c7959..000000000000 --- a/boards/intel/intel_adsp_ace20_lnl/board.yml +++ /dev/null @@ -1,5 +0,0 @@ -board: - name: intel_adsp_ace20_lnl - vendor: intel - socs: - - name: ace20_lnl From cafc135b4480898ceb19d5d9d472da071d670550 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sat, 17 Feb 2024 15:17:07 +0100 Subject: [PATCH 14/18] hwmv2: tests: boards: intel_adsp: Adjust board names Adjust tests to HWMv2 intel_adsp_ace board name changes. Signed-off-by: Dmitrii Golovanov --- tests/drivers/mm/sys_mm_drv_api/testcase.yaml | 2 +- tests/drivers/mm/sys_mm_drv_bank/testcase.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/drivers/mm/sys_mm_drv_api/testcase.yaml b/tests/drivers/mm/sys_mm_drv_api/testcase.yaml index e25212a3e0a4..10c9480cc1ee 100644 --- a/tests/drivers/mm/sys_mm_drv_api/testcase.yaml +++ b/tests/drivers/mm/sys_mm_drv_api/testcase.yaml @@ -5,4 +5,4 @@ tests: - mm filter: dt_compat_enabled("intel,adsp-mtl-tlb") or dt_compat_enabled("intel,adsp-tlb") integration_platforms: - - intel_adsp_ace15_mtpm + - intel_adsp/ace15_mtpm diff --git a/tests/drivers/mm/sys_mm_drv_bank/testcase.yaml b/tests/drivers/mm/sys_mm_drv_bank/testcase.yaml index 73ce465b0e65..3bdd847797d2 100644 --- a/tests/drivers/mm/sys_mm_drv_bank/testcase.yaml +++ b/tests/drivers/mm/sys_mm_drv_bank/testcase.yaml @@ -5,4 +5,4 @@ tests: - mm filter: dt_compat_enabled("intel,adsp-mtl-tlb") or dt_compat_enabled("intel,adsp-tlb") integration_platforms: - - intel_adsp_ace15_mtpm + - intel_adsp/ace15_mtpm From 5766c007d63885eb8531fb7d6bb71c502d22592c Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sat, 17 Feb 2024 16:19:41 +0100 Subject: [PATCH 15/18] soc: intel_adsp: tools: pylint compliance workaround Disable Pylint compliance check warning `R0801:Similar lines`. Signed-off-by: Dmitrii Golovanov --- soc/intel/intel_adsp/tools/acetool.py | 2 ++ soc/intel/intel_adsp/tools/cavstool.py | 2 ++ soc/intel/intel_adsp/tools/remote-fw-service.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/soc/intel/intel_adsp/tools/acetool.py b/soc/intel/intel_adsp/tools/acetool.py index 0d0897c02342..9dd184b9685f 100755 --- a/soc/intel/intel_adsp/tools/acetool.py +++ b/soc/intel/intel_adsp/tools/acetool.py @@ -35,6 +35,8 @@ INBOX_OFFSET = (512 + (1 * 128)) * 1024 WINSTREAM_OFFSET = WINDOW_BASE + WINDOW_STRIDE*3 +# pylint: disable=duplicate-code + # ADSPCS bits CRST = 0 CSTALL = 8 diff --git a/soc/intel/intel_adsp/tools/cavstool.py b/soc/intel/intel_adsp/tools/cavstool.py index a28d3c203210..97ce91343791 100755 --- a/soc/intel/intel_adsp/tools/cavstool.py +++ b/soc/intel/intel_adsp/tools/cavstool.py @@ -31,6 +31,8 @@ INBOX_OFFSET = (512 + (1 * 128)) * 1024 WINSTREAM_OFFSET = (512 + (3 * 128)) * 1024 +# pylint: disable=duplicate-code + # ADSPCS bits CRST = 0 CSTALL = 8 diff --git a/soc/intel/intel_adsp/tools/remote-fw-service.py b/soc/intel/intel_adsp/tools/remote-fw-service.py index 21e3569721ca..1d68a7db2a1d 100755 --- a/soc/intel/intel_adsp/tools/remote-fw-service.py +++ b/soc/intel/intel_adsp/tools/remote-fw-service.py @@ -17,6 +17,8 @@ # Global variable use to sync between log and request services. runner = None +# pylint: disable=duplicate-code + # INADDR_ANY as default HOST = '' PORT_LOG = 9999 From 6748ee9e75da8563d0bd431f8c82e59bdd5bd4b4 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Fri, 16 Feb 2024 14:38:52 +0100 Subject: [PATCH 16/18] MAINTAINERS: intel_adsp: Adjust to HWMv2 move Adjust intel_adsp paths to HWMv2 move. Signed-off-by: Dmitrii Golovanov --- MAINTAINERS.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index 26b34f70fde0..bc7ed55fc9c9 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -3209,8 +3209,8 @@ Intel Platforms (Xtensa): - jxstelter - marcinszkudlinski files: - - boards/xtensa/intel_*/ - - soc/xtensa/intel_*/ + - boards/intel/intel_adsp/ + - soc/intel/intel_adsp/ - dts/xtensa/intel/ - tests/boards/intel_adsp/ - samples/boards/intel_adsp/ From d143b2b96c8b951dc40ae017e6e3fea82457474e Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Sat, 17 Feb 2024 17:23:53 +0100 Subject: [PATCH 17/18] doc: boards: intel_adsp: Re-order pages Index boards/intel/intel_adsp pages. Signed-off-by: Dmitrii Golovanov --- boards/intel/intel_adsp/doc/chromebooks_adsp.rst | 2 -- boards/intel/intel_adsp/doc/index.rst | 11 +++++++++++ boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst | 2 -- boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst | 2 -- boards/intel/intel_adsp/doc/intel_adsp_generic.rst | 2 -- 5 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 boards/intel/intel_adsp/doc/index.rst diff --git a/boards/intel/intel_adsp/doc/chromebooks_adsp.rst b/boards/intel/intel_adsp/doc/chromebooks_adsp.rst index ec9ad373d3c2..a89d2b758811 100644 --- a/boards/intel/intel_adsp/doc/chromebooks_adsp.rst +++ b/boards/intel/intel_adsp/doc/chromebooks_adsp.rst @@ -1,5 +1,3 @@ -:orphan: - .. _zephyr-audio-dsp-development-on-chromebooks: Zephyr Audio DSP Development on Chromebooks diff --git a/boards/intel/intel_adsp/doc/index.rst b/boards/intel/intel_adsp/doc/index.rst new file mode 100644 index 000000000000..3145b7637cd1 --- /dev/null +++ b/boards/intel/intel_adsp/doc/index.rst @@ -0,0 +1,11 @@ +.. _boards-intel-adsp: + +Intel ADSP +########## + +.. toctree:: + + intel_adsp_generic + chromebooks_adsp + intel_adsp_cavs25 + intel_adsp_ace15_mtpm diff --git a/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst index f1f7b77de0da..d31783cd944a 100644 --- a/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_ace15_mtpm.rst @@ -1,5 +1,3 @@ -:orphan: - .. _intel_adsp_ace15: Intel ADSP ACE 1.5 diff --git a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst index df60b4f46467..437560562e09 100644 --- a/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_cavs25.rst @@ -1,5 +1,3 @@ -:orphan: - .. _intel_adsp_cavs25: Intel ADSP CAVS 2.5 diff --git a/boards/intel/intel_adsp/doc/intel_adsp_generic.rst b/boards/intel/intel_adsp/doc/intel_adsp_generic.rst index e5918478e3c4..8a7557d21d8b 100644 --- a/boards/intel/intel_adsp/doc/intel_adsp_generic.rst +++ b/boards/intel/intel_adsp/doc/intel_adsp_generic.rst @@ -1,5 +1,3 @@ -:orphan: - .. _intel_adsp_generic: Intel ADSP cAVS and ACE From 9823a6b9e155cbea56836e1b145f6a359e022cf1 Mon Sep 17 00:00:00 2001 From: Dmitrii Golovanov Date: Wed, 14 Feb 2024 15:21:24 +0100 Subject: [PATCH 18/18] hwmv2: sof: intel_adsp: submanifest provisional link Provisional link to SOF with adjustment to the HWMv2 new intel_adsp board names. Signed-off-by: Dmitrii Golovanov --- submanifests/optional.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml index 4297d7b01351..f0ba3b0ea27c 100644 --- a/submanifests/optional.yaml +++ b/submanifests/optional.yaml @@ -34,7 +34,7 @@ manifest: groups: - optional - name: sof - revision: 0606152d4aafc1f7ed43df1b1813252bfc74e154 + revision: pull/38/head path: modules/audio/sof remote: upstream groups: