Intel: remove Intel XTOS platform code and drivers by kv2019i · Pull Request #8048 · thesofproject/sof

kv2019i · 2023-08-16T16:39:26Z

To complete the transition to Zephyr for Intel hardware targets, remove the bulk of platform code and drivers only used by Intel cAVS2.5 target in the non-Zephyr XTOS build. This is no longer supported (and hasn't been tested at all in recent times), so time to remove this.

Note: there is still some remaining bits in the codetree that will be removed in follow-up PRs. The platform driver headers need a bit more work to remove (due to depencies from rtos headers), the cAVS2.5 LPS code and a few other bits.

RanderWang

LGTM

ujfalusi

I was not brave enough to take on this, thanks!

kv2019i · 2023-08-17T07:46:52Z

Hmm. Intel internal test "fw_113_ssp/test_02_ssp_internal_loop.py::TestSspInternalLoop::test_113_02_simple_internal_loopback" fails, but seems unlikely to be related to this PR (platform this PR does not touch). Will need a rerun to check.

lyakh

TGL nocodec CI looks unhappy, optically looks good!

singalsu

Approve for DMIC, thanks Kai.

kv2019i · 2023-08-17T13:21:04Z

@wszypelt Can you check this? This is failing the same TestSspInternalLoop.test_113_02_simple_internal_loopback test again, but I simply can't see a connection to the patch. Any insight, if same test case passing on other runs?
UPDATE: there's something really wrong with SSP, so the test is correct. Debugging now.

btian1

like remove things, :)

lgirdwood · 2023-08-18T11:52:26Z

@wszypelt @lrudyX unused code removal so not expecting a failure. Good to merge ?

Memory window management has been moved to Zephyr drivers for this platform, so building this file on SOF side is no longer needed. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Remove all cmake rules to build SOF for Intel cAVS2.5 hardware using non-native drivers (i.e. use XTOS drivers from SOF tree instead of Zephyr native drivers). This is no longer supported nor tested, so can be removed. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

The IPC3 build is no longer supported for Intel cAVS2.5 target, so move the config overlay definitions as-is to the main board config file. To smoothen the transition, keep an empty IPC4 overlay file in the tree to allow developers to update build scripts. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Remove unused idc.h header for Intel IceLake platform (no longer supported in SOF main). Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Complete migration of Intel TigerLake platform to Zephyr RTOS by removing remaining platform definitions for XTOS for this platform. Link: thesofproject#7248 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Now that Intel cAVS2.5 has been migrated to use native Zephyr drivers, we have no need to keep the Intel specific XTOS drivers in the tree anymore. Adjust board configuration files to not refer to removed Kconfig options. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

kv2019i · 2023-08-18T12:24:54Z

V2:

found a weird (but real) issue in SSP driver that explains the fail -- will need to follow-up in Zephyr upstream to address this and then we can later remove the TODO entry in this series (but this is good for now)

kv2019i · 2023-08-18T13:57:34Z

Yiihaa, "Internal CI System" now passes, so the fix helped. Need to wait until Monday to get the SOF CI results.

kv2019i · 2023-08-21T07:26:43Z

SOFCI TEST

kv2019i · 2023-08-21T09:20:28Z

Proceeding with merge. Two known fails in https://sof-ci.01.org/sofpr/PR8048/build11827/devicetest/index.html

At the beginning, we have two build jobs in github action to build IPC3 and IPC4 firmware for TGL/TGL-H. The PR thesofproject#8048 switches cAVS2.5 configs to use IPC4 by default and empties the cAVS2.5 overlay files. After the change, the xtensa-build-zephyr.py script is building the same IPC4 firmware with or without '-i IPC4' option. So we have two jobs running different build command but build the same IPC4 firmware. Recently, commit 5004d0f ("zephyr.yml: remove ipc option for zephyr build") removes '-i IPC4' option in github action for TGL/TGL-H IPC4 build. So we have duplicated jobs to build firmware for TGL and TGL-H now. This patch removes the duplicated build job which previously is used to build IPC3 firmware for TGL/TGL-H. Signed-off-by: Chao Song <chao.song@linux.intel.com>

At the beginning, we have two build jobs in github action to build IPC3 and IPC4 firmware for TGL/TGL-H. The PR thesofproject#8048 switches cAVS2.5 configs to use IPC4 by default and empties the cAVS2.5 overlay files. After the change, the xtensa-build-zephyr.py script is building the same IPC4 firmware with or without '-i IPC4' option. So we have two jobs running different build command but build the same IPC4 firmware. Recently, commit 5004d0f ("zephyr.yml: remove ipc option for zephyr build") removes '-i IPC4' option in github action for TGL/TGL-H IPC4 build. So we have duplicated jobs to build firmware for TGL and TGL-H in the end. This patch removes the duplicated build job which previously is used to build IPC3 firmware for TGL/TGL-H. Signed-off-by: Chao Song <chao.song@linux.intel.com>

At the beginning, we have two build jobs in github action to build IPC3 and IPC4 firmware for TGL/TGL-H. The PR thesofproject#8048 switches cAVS2.5 configs to use IPC4 by default and empties the cAVS2.5 overlay files. After the change, the xtensa-build-zephyr.py script is building the same IPC4 firmware with or without '-i IPC4' option. So we have two jobs running different build command but build the same IPC4 firmware. Recently, commit 5004d0f ("zephyr.yml: remove ipc option for zephyr build") removes '-i IPC4' option in github action for TGL/TGL-H IPC4 build. So we have duplicated jobs to build firmware for TGL and TGL-H in the end. This patch removes the duplicated build job which previously is used to build IPC3 firmware for TGL/TGL-H and obsolete comments. Signed-off-by: Chao Song <chao.song@linux.intel.com>

At the beginning, we have two build jobs in github action to build IPC3 and IPC4 firmware for TGL/TGL-H. The PR #8048 switches cAVS2.5 configs to use IPC4 by default and empties the cAVS2.5 overlay files. After the change, the xtensa-build-zephyr.py script is building the same IPC4 firmware with or without '-i IPC4' option. So we have two jobs running different build command but build the same IPC4 firmware. Recently, commit 5004d0f ("zephyr.yml: remove ipc option for zephyr build") removes '-i IPC4' option in github action for TGL/TGL-H IPC4 build. So we have duplicated jobs to build firmware for TGL and TGL-H in the end. This patch removes the duplicated build job which previously is used to build IPC3 firmware for TGL/TGL-H and obsolete comments. Signed-off-by: Chao Song <chao.song@linux.intel.com>

kv2019i requested a review from lyakh August 16, 2023 16:39

kv2019i requested review from aborisovich, dbaluta, lbetlej, lgirdwood, marc-hb, mmaka1 and plbossart as code owners August 16, 2023 16:39

kv2019i requested review from RanderWang and ujfalusi August 16, 2023 16:39

kv2019i force-pushed the 202308-remote-intel-xtos-support branch from 1c0dfaa to ac5a268 Compare August 16, 2023 17:33

kv2019i mentioned this pull request Aug 16, 2023

CAVS2.5: Make the MEM_WND really optional and make it depends on non zephyr drivers #8043

Closed

btian1 reviewed Aug 17, 2023

View reviewed changes

Comment thread zephyr/CMakeLists.txt

RanderWang approved these changes Aug 17, 2023

View reviewed changes

ujfalusi approved these changes Aug 17, 2023

View reviewed changes

Comment thread zephyr/CMakeLists.txt

lyakh reviewed Aug 17, 2023

View reviewed changes

singalsu approved these changes Aug 17, 2023

View reviewed changes

kv2019i force-pushed the 202308-remote-intel-xtos-support branch from ac5a268 to 366ca76 Compare August 17, 2023 09:30

lgirdwood approved these changes Aug 17, 2023

View reviewed changes

btian1 reviewed Aug 18, 2023

View reviewed changes

ujfalusi reviewed Aug 18, 2023

View reviewed changes

Comment thread zephyr/CMakeLists.txt

kv2019i added 6 commits August 18, 2023 15:15

zephyr: remove mem_window.c from Intel cAVS2.5 build

348cdca

Memory window management has been moved to Zephyr drivers for this platform, so building this file on SOF side is no longer needed. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

platform: Intel: icelake: remove unused idc.h

8a74573

Remove unused idc.h header for Intel IceLake platform (no longer supported in SOF main). Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

platform: tigerlake: remove XTOS platform definitions

de11d51

Complete migration of Intel TigerLake platform to Zephyr RTOS by removing remaining platform definitions for XTOS for this platform. Link: thesofproject#7248 Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

kv2019i force-pushed the 202308-remote-intel-xtos-support branch from 366ca76 to 53c16ba Compare August 18, 2023 12:19

kv2019i merged commit 59028ad into thesofproject:main Aug 21, 2023

aiChaoSONG mentioned this pull request Sep 26, 2023

[SKIP CI]github action: remove duplicate build for TGL/TGL-H #8261

Merged

Conversation

kv2019i commented Aug 16, 2023

Uh oh!

Uh oh!

RanderWang left a comment

Choose a reason for hiding this comment

Uh oh!

ujfalusi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kv2019i commented Aug 17, 2023

Uh oh!

lyakh left a comment

Choose a reason for hiding this comment

Uh oh!

singalsu left a comment

Choose a reason for hiding this comment

Uh oh!

kv2019i commented Aug 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

btian1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lgirdwood commented Aug 18, 2023

Uh oh!

kv2019i commented Aug 18, 2023

Uh oh!

kv2019i commented Aug 18, 2023

Uh oh!

kv2019i commented Aug 21, 2023

Uh oh!

kv2019i commented Aug 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

kv2019i commented Aug 17, 2023 •

edited

Loading