intel_adsp20: Enable LNL (ACE 2.0) platform in sof #7479

jxstelter · 2023-04-20T12:15:57Z

This patch contains changes required to enable LNL (ACE 2.0) platform in SOF
and bring-up basic interfaces and features.

Required zephyr change:

intel_adsp: ace20_lnl: Add imr layout header to LNL zephyrproject-rtos/zephyr#57066

Signed-off-by: Jaroslaw Stelter [email protected]

src/include/sof/lib/dai-zephyr.h

src/ipc/ipc4/dai.c

src/ipc/ipc4/helper.c

plbossart

ok for SSP/DMIC, NAK on SoundWire/ALH

src/audio/copier/copier.c

plbossart

couple of misses in the LNL definitions @jxstelter

app/boards/intel_adsp_ace20_lnl.conf

src/platform/Kconfig

src/platform/lunarlake/include/platform/lib/dai.h

src/platform/lunarlake/include/platform/lib/dma.h

src/platform/lunarlake/lib/clk.c

src/include/sof/audio/ipc-config.h

src/platform/lunarlake/include/platform/lib/memory.h

src/platform/lunarlake/include/platform/lib/pm_runtime.h

kv2019i

I think this looks good to go (no blocking issues aside the ones already pointed out by other reviewers). In general, the src/platform part could be slimmed down further, but I'd not start doing this work in this LNL PR as the actions need to be done on MTL as well (relates to #7248 ).

app/boards/intel_adsp_ace20_lnl.conf

src/include/sof/audio/ipc-config.h

zephyr/CMakeLists.txt

app/boards/intel_adsp_ace20_lnl.conf

Add initial LNL configuration. Enable building for xt-clang. Signed-off-by: Jaroslaw Stelter <[email protected]>

The LNL platform added to RI_INFO_FIXME list in build script. Signed-off-by: Jaroslaw Stelter <[email protected]>

src/include/sof/audio/ipc-config.h

src/ipc/ipc4/dai.c

lyakh

the only remaining request from me is that dai_set_link_hda_config() should be implemented in the HDA driver

jxstelter · 2023-05-17T10:49:01Z

The problem with this is that depending on interface (DMIC vs SSP) different fields of IPC4 (Init Instance) needs to be used to calculate the link config value. If moved to zephyr driver, we need to pass there several parameters instead of single uint16_t value. Therefore I prepare it here and pass to driver which programs HW register. Drivers do not understand IPC4 payload structure so anyway we needs to parse it in SOF.

src/ipc/ipc4/helper.c

jxstelter · 2023-05-19T09:57:40Z

@plbossart Pierre, is your change request resolved?

wszypelt · 2023-05-19T10:04:59Z

SOFCI TEST

kv2019i · 2023-05-23T11:13:48Z

@lyakh Ok with the response on link_config? This is anyways the current DAI interface in Zephyr, so I'd say even if we'd change it, this would have to be in different pr.

@plbossart Ping?

src/audio/copier/copier.c

src/ipc/ipc4/dai.c

src/audio/dai-zephyr.c

src/include/sof/audio/ipc-config.h

src/ipc/ipc4/helper.c

lyakh · 2023-05-24T06:43:20Z

@lyakh Ok with the response on link_config? This is anyways the current DAI interface in Zephyr, so I'd say even if we'd change it, this would have to be in different pr.

@kv2019i yep, just let's address comments from @ujfalusi

src/audio/copier/copier.c

In LNL the GPDMA engine was removed. Instead HD Audio Link DMA is used to transport data over audio interfaces. Since HD Audio is a Host managed engine, the link configuration is passed through IPCv4. The configuration must be forwarded to appropriate interface driver to configure HW. Signed-off-by: Jaroslaw Stelter <[email protected]>

ujfalusi

Only couple of 'I prefer to write code in a different way' type of things, but those are subjective I guess as no one pointed out those.

I don't have further comments.

No re-review in a week

kv2019i · 2023-05-24T15:52:48Z

Known error in https://sof-ci.01.org/sofpr/PR7479/build8442/devicetest/index.html and https://sof-ci.01.org/sofpr/PR7479/build8443/devicetest/index.html , proceeding with merge.

marc-hb · 2023-05-25T00:34:51Z

This unused variable 'copier_config' warning looks trivial after all. I suspected some hard to fix, platform-dependent macrobatics but I found none, this local variable is just unused always.

fixed

Somehow it came back. Fixed (again?) in

[SKIP SOF-TEST] .github: add LNL compilation #7685

jxstelter force-pushed the lnl-enable-in-sof branch 4 times, most recently from eab1abd to 7f4e774 Compare April 20, 2023 14:20

lgirdwood reviewed Apr 24, 2023

View reviewed changes

src/include/sof/lib/dai-zephyr.h Show resolved Hide resolved

src/ipc/ipc4/dai.c Outdated Show resolved Hide resolved

src/ipc/ipc4/dai.c Outdated Show resolved Hide resolved

src/ipc/ipc4/helper.c Outdated Show resolved Hide resolved

plbossart requested changes Apr 24, 2023

View reviewed changes

src/audio/copier/copier.c Outdated Show resolved Hide resolved

jxstelter force-pushed the lnl-enable-in-sof branch 2 times, most recently from dc70f5c to 79e8611 Compare April 26, 2023 10:05

jxstelter marked this pull request as ready for review April 26, 2023 13:02

jxstelter requested review from akloniex, marc-hb, aborisovich, kv2019i, lyakh, iuliana-prodan, dbaluta, abonislawski, libinyang, RanderWang, pblaszko, marcinszkudlinski, mmaka1 and lbetlej as code owners April 26, 2023 13:02

jxstelter force-pushed the lnl-enable-in-sof branch from 79e8611 to 0d700b4 Compare April 26, 2023 13:14

plbossart requested changes Apr 26, 2023

View reviewed changes

lyakh reviewed Apr 27, 2023

View reviewed changes

src/include/sof/audio/ipc-config.h Outdated Show resolved Hide resolved

src/include/sof/audio/ipc-config.h Outdated Show resolved Hide resolved

RanderWang reviewed Apr 28, 2023

View reviewed changes

src/platform/lunarlake/include/platform/lib/memory.h Show resolved Hide resolved

src/platform/lunarlake/include/platform/lib/pm_runtime.h Outdated Show resolved Hide resolved

kv2019i requested changes Apr 28, 2023

View reviewed changes

jxstelter force-pushed the lnl-enable-in-sof branch 2 times, most recently from be8fef4 to 78b4659 Compare April 28, 2023 13:24

jxstelter force-pushed the lnl-enable-in-sof branch from 32b358e to 5306b2b Compare May 15, 2023 10:10

jxstelter added 2 commits May 15, 2023 14:20

lnl: Lunarlake configuration

39f796e

Add initial LNL configuration. Enable building for xt-clang. Signed-off-by: Jaroslaw Stelter <[email protected]>

LNL: Add new platform to RI_INFO_FIXME

c2e2b23

The LNL platform added to RI_INFO_FIXME list in build script. Signed-off-by: Jaroslaw Stelter <[email protected]>

jxstelter force-pushed the lnl-enable-in-sof branch 2 times, most recently from 211b10b to 3a578c4 Compare May 15, 2023 12:26

tmleman approved these changes May 15, 2023

View reviewed changes

btian1 approved these changes May 16, 2023

View reviewed changes

lyakh reviewed May 16, 2023

View reviewed changes

src/include/sof/audio/ipc-config.h Outdated Show resolved Hide resolved

src/ipc/ipc4/dai.c Outdated Show resolved Hide resolved

jxstelter mentioned this pull request May 16, 2023

xtensa: Set CONFIG_DCACHE_LINE_SIZE for NXP/Intel boards used in SOF module zephyrproject-rtos/zephyr#57926

Merged

jxstelter force-pushed the lnl-enable-in-sof branch from 3a578c4 to de2a84c Compare May 16, 2023 17:00

lyakh reviewed May 17, 2023

View reviewed changes

aborisovich reviewed May 17, 2023

View reviewed changes

src/ipc/ipc4/helper.c Outdated Show resolved Hide resolved

aborisovich approved these changes May 17, 2023

View reviewed changes

ujfalusi reviewed May 23, 2023

View reviewed changes

marcinszkudlinski approved these changes May 24, 2023

View reviewed changes

jxstelter force-pushed the lnl-enable-in-sof branch from de2a84c to 8b71fab Compare May 24, 2023 10:35

ujfalusi reviewed May 24, 2023

View reviewed changes

src/audio/copier/copier.c Outdated Show resolved Hide resolved

src/audio/copier/copier.c Outdated Show resolved Hide resolved

jxstelter force-pushed the lnl-enable-in-sof branch from 8b71fab to ab41814 Compare May 24, 2023 12:42

ujfalusi approved these changes May 24, 2023

View reviewed changes

kv2019i merged commit 22ad526 into thesofproject:main May 24, 2023

marc-hb mentioned this pull request May 30, 2023

zephyr: add SoC overlay for intel_ace20_lnl zephyrproject-rtos/hal_xtensa#19

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

intel_adsp20: Enable LNL (ACE 2.0) platform in sof #7479

intel_adsp20: Enable LNL (ACE 2.0) platform in sof #7479

jxstelter commented Apr 20, 2023 •

edited by tmleman

Loading

plbossart left a comment

plbossart left a comment

kv2019i left a comment

lyakh left a comment

jxstelter commented May 17, 2023 •

edited

Loading

jxstelter commented May 19, 2023

wszypelt commented May 19, 2023

kv2019i commented May 23, 2023

lyakh commented May 24, 2023

ujfalusi left a comment

kv2019i commented May 24, 2023

marc-hb commented May 25, 2023

intel_adsp20: Enable LNL (ACE 2.0) platform in sof #7479

intel_adsp20: Enable LNL (ACE 2.0) platform in sof #7479

Conversation

jxstelter commented Apr 20, 2023 • edited by tmleman Loading

plbossart left a comment

Choose a reason for hiding this comment

plbossart left a comment

Choose a reason for hiding this comment

kv2019i left a comment

Choose a reason for hiding this comment

lyakh left a comment

Choose a reason for hiding this comment

jxstelter commented May 17, 2023 • edited Loading

jxstelter commented May 19, 2023

wszypelt commented May 19, 2023

kv2019i commented May 23, 2023

lyakh commented May 24, 2023

ujfalusi left a comment

Choose a reason for hiding this comment

kv2019i commented May 24, 2023

marc-hb commented May 25, 2023

jxstelter commented Apr 20, 2023 •

edited by tmleman

Loading

jxstelter commented May 17, 2023 •

edited

Loading