hwmv2: intel_adsp: Port to HWMv2

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/

boards/intel/intel_adsp/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

boards/intel/intel_adsp/Kconfig.intel_adsp

@@ -0,0 +1,8 @@
+# Copyright (c) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_INTEL_ADSP
+	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

boards/intel/intel_adsp/board.cmake

@@ -0,0 +1,42 @@
+# Copyright (c) 2022-2024 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_BOARD_INTEL_ADSP_CAVS25 OR CONFIG_BOARD_INTEL_ADSP_CAVS25_TGPH)
+
+  if($ENV{CAVS_OLD_FLASHER})
+    board_set_flasher_ifnset(misc-flasher)
+    board_finalize_runner_args(misc-flasher)
+  endif()
+
+  board_set_flasher_ifnset(intel_adsp)
+
+  set(RIMAGE_SIGN_KEY "otc_private_key_3k.pem" CACHE STRING "default in cavs25/board.cmake")
+
+  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)
+
+  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()

boards/intel/intel_adsp/board.yml

@@ -0,0 +1,9 @@
+boards:
+  - name: intel_adsp
+    vendor: intel
+    socs:
+      - name: cavs25
+        variants:
+          - name: 'tgph'
+      - name: ace15_mtpm
+      - name: ace20_lnl

boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/chromebooks_adsp.rst → 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
@@ -366,7 +364,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:
 
@@ -386,7 +384,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 +399,7 @@ the logging script.
 .. code-block:: console
 
     dev$ west flash --remote-host crouton
-    Hello World! intel_adsp_cavs25
+    Hello World! intel_adsp
 
 Misc References
 ***************

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

boards/boards_legacy/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst → boards/intel/intel_adsp/doc/intel_adsp_generic.rst

@@ -1,5 +1,3 @@
-:orphan:
-
 .. _intel_adsp_generic:
 
 Intel ADSP cAVS and ACE
@@ -115,7 +113,7 @@ Build as usual.
 
 .. zephyr-app-commands::
    :zephyr-app: samples/hello_world
-   :board: intel_adsp_cavs25
+   :board: intel_adsp/cavs25
    :goals: build
 
 Signing
@@ -141,7 +139,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,24 +160,24 @@ 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
 
 :file:`remote-fw-service.py` uses ports 9999 and 10000 on the remote host to
 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 +191,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,25 +202,25 @@ 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.
 
 .. 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``:
 
 .. code-block:: console
 
    - connected: true
      id: None
-     platform: intel_adsp_cavs25
+     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
 
@@ -247,7 +245,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
 --------------------------

boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm.yaml → 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

boards/boards_legacy/xtensa/intel_adsp_ace15_mtpm/intel_adsp_ace15_mtpm_defconfig → boards/intel/intel_adsp/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