Skip to content

Conversation

@singalsu
Copy link
Collaborator

No description provided.

@singalsu
Copy link
Collaborator Author

Note: This needs an alsa-utils update that is not yet publicly available. I'm working on a cleaned-up version to be shared soon.

@marc-hb
Copy link
Collaborator

marc-hb commented Jul 16, 2024

The two commits ending with 4658143 seem to have only topology changes (as expected).

Yet most compilation checks have C failures?!?

https://github.com/thesofproject/sof/actions/runs/9959983293/job/27518100450?pr=9306
https://github.com/thesofproject/sof/actions/runs/9959983307/job/27518099481?pr=9306

https://github.com/thesofproject/sof/actions/runs/9959983317/job/27518101723?pr=9306
Etc.

#9305 submitted around the same time is fine. Daily build is fine: https://github.com/thesofproject/sof/actions/runs/9948774464

Something somewhere went terribly wrong..

@marc-hb
Copy link
Collaborator

marc-hb commented Jul 16, 2024

OK, I got it. Unlike #9305, this PR is not targeted at the main branch.

This gets me EVERY TIME!

EDIT: if the ptl-001-drop-stable branch is not temporary, please remove most .github/workflows/ from it.

@marc-hb marc-hb changed the title Tools: Topology2: Add topologies builds for PTL [PTL STABLE] Tools: Topology2: Add topologies builds for PTL Jul 16, 2024
@plbossart
Copy link
Member

I don't think it makes sense to apply topology patches on what is essentially a curated firmware release. We might as well push all the topology changes to main, and do the work once.

@marc-hb
Copy link
Collaborator

marc-hb commented Jul 16, 2024

Note: This needs an alsa-utils update that is not yet publicly available.

I don't think it makes sense to apply topology patches on what is essentially a curated firmware release. We might as well push all the topology changes to main, and do the work once.

Well, submitting to this branch achieves at least one thing: it publishes the changes without breaking the build on the main branch :-D

But yeah: the less branching always the better (branching is just duplication under source control) and this particular divergence does not seem solve any problem besides avoiding the alsa-utils upgrade for the main branch.

@singalsu
Copy link
Collaborator Author

@marc-hb @plbossart This PR needs a new version of alsa-utils, so the topologies build produces unusable ones for PTL ACE3.x until updated. The SSP configuration blob format is quite different now from previous platforms.

@singalsu singalsu force-pushed the add_ptl_topologies_for_001_drop_stable branch 2 times, most recently from 43b4ca8 to 18b6ccd Compare July 17, 2024 14:07
@singalsu singalsu requested a review from plbossart July 17, 2024 14:09
@ujfalusi
Copy link
Contributor

@singalsu, can you include this as well to this PR:

From abcf1d6c9943181d7fb851741cee0799460fcc05 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Date: Thu, 18 Jul 2024 09:48:06 +0300
Subject: [PATCH] topology2: development: Add SSP nocodec topology for PTL

Generic SSP topology for PTL.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
---
 tools/topology/topology2/development/tplg-targets.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
index f4ad040136b5..2942940e57b5 100644
--- a/tools/topology/topology2/development/tplg-targets.cmake
+++ b/tools/topology/topology2/development/tplg-targets.cmake
@@ -55,6 +55,10 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
 
 "cavs-sdw\;sof-lnl-fpga-rt711-l0\;PLATFORM=lnl,NUM_HDMIS=0,PASSTHROUGH=true"
 
+# SSP topology for PTL
+"cavs-nocodec\;sof-ptl-nocodec\;PLATFORM=ptl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
+PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-ptl-nocodec.bin"
+
 # SSP topology for PTL FPGA with lower DMIC IO clock of 19.2MHz, 2ch PDM0 enabled
 "cavs-nocodec\;sof-ptl-nocodec-fpga-2ch-pdm0\;PLATFORM=ptl,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,\
 NHLT_BIN=nhlt-sof-ptl-nocodec-fpga-2ch-pdm0.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000"
-- 
2.45.2

This patch builds test topologies sof-ptl-nocodec.tplg,
sof-ptl-nocodec-fpga-2ch-pdm0.tplg, and sof-ptl-nocodec-fpga-4ch.tplg.
The changes include:

- New ptl.conf where DMIC and SSP versions are updated
  vs. LNL and MTL.
- The definitions for blob 3.0 format are added to
  instruct alsa-utils to process a new format SSP blob.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu singalsu force-pushed the add_ptl_topologies_for_001_drop_stable branch from 18b6ccd to 0905b1f Compare July 19, 2024 11:56
@singalsu singalsu requested a review from plbossart July 19, 2024 11:56
@singalsu singalsu marked this pull request as ready for review July 19, 2024 11:57
@singalsu singalsu requested review from jsarha and ranj063 as code owners July 19, 2024 11:57
The topology is built into development to be used for testing and
further development.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@singalsu singalsu force-pushed the add_ptl_topologies_for_001_drop_stable branch from 0905b1f to 6049b29 Compare July 23, 2024 14:02
@lgirdwood
Copy link
Member

@ranj063 @kv2019i psl review

@lgirdwood
Copy link
Member

SOFCI TEST

@kv2019i
Copy link
Collaborator

kv2019i commented Sep 13, 2024

@lgirdwood This is for ptl-001-drop-stable, so for @mwasko to approve. I think we should submit to mainline first if alsa-utils dependencies are met. @singalsu ?

@lgirdwood
Copy link
Member

@lgirdwood This is for ptl-001-drop-stable, so for @mwasko to approve. I think we should submit to mainline first if alsa-utils dependencies are met. @singalsu ?

Ack - lets upstream in main.

@singalsu
Copy link
Collaborator Author

Closing

@singalsu singalsu closed this Sep 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants