[SRU] cs42l43 and cs35l56 audio failed to work on questing

[Bin Li]

[Impact]
No audio input/output for cs42l43 and cs35l56 on Intel LNL of ThinkPad with 25.10.
The audio works fine on plucky and noble, but could not work on questing/resolute.

Here is the original issue: enable cs42l43 and cs35l56 audio on Intel LNL
https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2106394

[Fix]
Currently the version of alsa-ucm-conf in questing/resolute is still 1.2.12-1ubuntu2, it's older than the plucky one,the below patches are missed in questing.

With the v1.2.14 this issue could be fixed, we need bump the latest version(v1.2.14) for resolute.

alsa-ucm-conf (1.2.12-1ubuntu1.3) plucky; urgency=medium

  * Fix file mode of amd-soundwire.conf (LP: #2106394)
    amd-soundwire.conf should be a symlink to sof-soundwire.conf

 -- Atlas Yu <email address hidden> Thu, 05 Jun 2025 15:12:06 +0800

alsa-ucm-conf (1.2.12-1ubuntu1.2) plucky; urgency=medium

  * Import patches that have already been applied to noble and oracular,
    but not yet to plucky. This and previous uploads are dependent on
    these patches.
    - d/p/0001-sof-soundwire-Add-missing-match-for-cs42l43-speakers.patch
    - d/p/0002-sof-soundwire-Add-support-for-cs42l43-cs35l56-bridge.patch
    - d/p/0001-sof-soundwire-Change-map-control-names-to-make-them-.patch
    - d/p/0002-sof-soundwire-Add-sequence-for-controlling-Mic-Mute-.patch
    - d/p/0004-rt722-add-mic-led-support.patch

  * Add LED support for cs42l43 and cs35l56 (LP: #2106394)
    Some inapplicable patches were dropped in the previous upload. Now
    we include all its dependencies to make it work.

    Drop:
    - d/p/0001-sof-soundwire-Add-LED-support-for-cs35l56-amplifiers.patch

    Some upstream commits got modified due to contextual changes.
    Add:
    - d/p/0001-sof-soundwire-cs42l43-spk-Correct-PlaybackPCM-and-ro.patch
    - d/p/0002-sof-soundwire-cs42l43-Correct-CapturePCM-and-routing.patch
    - d/p/0003-ucm2-sof-soundwire-Correct-FixedBootSequence-for-dmi.patch
    - d/p/0004-sof-soundwire-Split-cs42l43-dmic-initialisation.patch
    - d/p/0005-sof-soundwire-Fix-cs42l43-dmic-initialisation.patch
    - d/p/0006-common-add-led.conf-with-SetLED-macro-to-hide-implem.patch
    - d/p/0007-ucm2-use-new-SetLED-macro-to-hide-the-implementation.patch
    - d/p/0008-sof-soundwire-cs42l43-Drop-headset-mic-from-mic-mute.patch
    - d/p/0009-sof-soundwire-Add-LED-support-for-cs35l56-amplifiers.patch
    - d/p/0010-sof-soundwire-cs42l43-Switch-mixer-based-on-output-v.patch

[Test]
Tested on Intel LNL:
1, hear the sound from
$ speaker-test -c 2
2, make sound and recorded, replay the file:
$ arecord -f cd test.wav
$ aplay test.wav
3, press speaker-mute and mic-mute key, the OSD are shown,
and the LED is on when it's muted.
4, plugin headset and restest the steps above for sound input and output.
sound ctl led is not controlled by headset, it's by design:
please refer to:
https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/common/ctl/led.conf

[Where problems could occur]
It may break cirrus audio support.

[Launchpad Janitor (janitor)]

Status changed to 'Confirmed' because the bug affects multiple users.

[Bin Li (binli)]

Here is the patches I synced from plucky for questing.

[Sebastien Bacher (seb128)]

Closing for the current series as 1.2.14 got synced from Debian

Could you clarify

+ * Import patches that have already been applied to noble and oracular,
+ but not yet to plucky. This and previous uploads are dependent on
+ these patches.

what do you mean by previous uploads? Do you mean the current version isn't working as expected/is missing patches? Do you have a reference to that issue?

[Bin Li (binli)]

Hi seb128,

Yes, some patches are missing in Questing.

Please check the bug below; the patches were only uploaded to Noble, Oracular, and Plucky.

https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2106394

So the package in Questing is still the old one from
https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2100732/comments/19 .

[Sebastien Bacher (seb128)]

How is that possible, by SRU guideline devel/newer series should be fixed first before doing a SRU. The SRU team is going to ask an explanation and context/bug reference/test plan for those patches. Could you update the changelog accordingly?

[Bin Li (binli)]

You’re absolutely right that we normally fix devel first.
The initial version of the patch was uploaded 1.2.12-1ubuntu2 under lp:2100732, but the fix(lp:2106394) was revised twice afterwards. Unfortunately, we missed carrying the final/revised fixes forward during the last SRU cycle.

Really sorry for the extra work and confusion this causes the SRU team and the sponsors – it was completely our oversight.

I've updated the debdiff with the clarification.

[Sebastien Bacher (seb128)]

@Bin, thanks, uploaded to the SRU queue now

[Bin Li (binli)]

@seb128 Hi, the 1.2.12-1ubuntu3 was rejected, because 1.2.12-1ubuntu2.1 was uploaded first from lp:2126737 .
https://launchpad.net/ubuntu/questing/+queue?queue_state=4&queue_text=

Please help upload it again when you have time, thanks!

[Sebastien Bacher (seb128)]

I started reviewing the new changes but also debcrafters got pinged about bug #2129952 which is also requesting for a questing upload with the same revision and different content. Can you work with Kai-Chuan on either merging the changes in one upload or deciding which one should be uploaded first and then rebase the other one?

[Bin Li (binli)]

Merged the patches from KC's fix.

https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2129952

[Bin Li (binli)]

Upload a new one for questing.

https://bugs.launchpad.net/ubuntu/+source/linux-oem-6.17/+bug/2129952/+attachment/5934741/+files/alsa-ucm-conf_1.2.12-1ubuntu2.2.debdiff

[Bin Li (binli)]

Upload a new one for questing from the review of @enr0n.

https://bugs.launchpad.net/ubuntu/+source/alsa-ucm-conf/+bug/2129952/+attachment/5938255/+files/alsa-ucm-conf_1.2.12-1ubuntu2.2.debdiff