~binli/ubuntu/+source/linux/+git/mantic:master-next

Last commit made on 2023-12-01
Get this branch:
git clone -b master-next https://git.launchpad.net/~binli/ubuntu/+source/linux/+git/mantic
Only Bin Li can upload to this branch. If you are Bin Li please log in for upload directions.

Branch merges

Branch information

Name:
master-next
Repository:
lp:~binli/ubuntu/+source/linux/+git/mantic

Recent commits

fec8193... by Dimitri John Ledkov

UBUNTU: [Packaging] make ZSTD module compression conditional

BugLink: https://bugs.launchpad.net/bugs/2045412

Make ZSTD module compression conditional. Only enable it when building
on recent series, such that backports of v6.5 kernels to jammy keep
uncompressed modules, with zstd compressed .deb.

Fixes: b2638e9702 ("UBUNTU: [Packaging] ZSTD compress modules")
Ignore: yes
Signed-off-by: Dimitri John Ledkov <email address hidden>
Acked-by: Andrea Righi <email address hidden>
Acked-by: Roxana Nicolescu <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

0c7fd02... by Stefan Binding <email address hidden>

ASoC: cs35l41: Detect CSPL errors when sending CSPL commands

BugLink: https://bugs.launchpad.net/bugs/2042060

The existing code checks for the correct state transition after sending
a command. However, it is possible for the message box to return -1,
which indicates an error, if an error has occurred in the firmware.
We can detect if the error has occurred, and return a different error.
In addition, there is no recovering from a CSPL error, so the retry
mechanism is not needed in this case, and we can return immediately.

Signed-off-by: Stefan Binding <email address hidden>
Acked-by: Mark Brown <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit 76c121821a3128eb9d0183a525cf334beb9ccc47)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

d5c9468... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Check CSPL state after loading firmware

BugLink: https://bugs.launchpad.net/bugs/2042060

CSPL firmware should be in RUNNING or PAUSED state after loading.
If not, the firmware has not been loaded correctly, and we can unload
it and pass the error up.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit a51d8ba03a4fc92940d5e349f0325f36e85a89cb)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

5aea559... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Do not unload firmware before reset in system suspend

BugLink: https://bugs.launchpad.net/bugs/2042060

Given the part is about to reset due to system suspend, and we are
already in hibernate, there is no need to wake up the amp, just to get
it ready to be reset. We just need to ensure cs_dsp is ready for reset
by resetting the states.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit 33790d1f039114a829433b89fc55a0d781d38d62)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

89af901... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Force a software reset after hardware reset

BugLink: https://bugs.launchpad.net/bugs/2042060

To ensure the chip has correctly reset during probe and system suspend,
we need to force a software reset, in case of systems where the
hardware reset is not available.

The software reset register was labelled as volatile but not readable,
however, it is readable, (just returns 0x0). Adding it to readable
registers means it will be correctly treated as volatile, and thus
will not be cached.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit 2ee06ff5d7cf5f68bab2bf65a946bb2ffe9982dd)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

56fe8ef... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Run boot process during resume callbacks

BugLink: https://bugs.launchpad.net/bugs/2042060

During initial probe, after reset is asserted for the first time, the
driver goes through a boot process to ensure the amp is ready to be
used. This involves verifying a boot flag, as well as verifying the
chip ids.

This is necessary since it is possible for the amp to have been fully
reset by the system suspend calls.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(backported from commit 881b7bce0c250386680b49b637455d31238a4b30 linux-next)
[Chris Chiu: ignore the conflict of dev_err_probe and dev_err]
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

83f49f0... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Assert Reset prior to de-asserting in probe and system resume

BugLink: https://bugs.launchpad.net/bugs/2042060

To ensure we are in a known state, exiting from reset at the point of
probe or in system resume, assert reset before we de-assert it.

Since the BIOS may enter into a pre-boot environment to control the
amps (for example for boot beep), we need to ensure we start from a
known, reset state prior to probe or system resume.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit fff393db71c1d53a13f9eb2f8da77c1f5e4e30bc)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

8c26f26... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Assert reset before system suspend

BugLink: https://bugs.launchpad.net/bugs/2042060

Some system suspend modes may remove power supplies.
To ensure we are not running during this time, we should assert reset.

Note: since the amps use a shared reset, asserting reset prior to
system suspend only works if the amps are suspended in the reverse
order to probe.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit a7423e9019a9a595919da44104725eef8a518652)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

3ba23a7... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Use reset label to get GPIO for HP Zbook Fury 17 G9

BugLink: https://bugs.launchpad.net/bugs/2042060

This laptop has an incorrect setting in its _DSD for boost type, but
the rest of the _DSD is correct, and we can still use the reset label
to obtain the reset gpio.

Also fix channel map so that amp 0 is right, and amp 1 is left.

Fixes: 581523ee3652 ("ALSA: hda: cs35l41: Override the _DSD for HP Zbook Fury 17 G9 to correct boost type")

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit f01b371b0794f43586d4f0b7dd0d9226c25553e5)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

836ddab... by Stefan Binding <email address hidden>

ALSA: hda: cs35l41: Override the _DSD for HP Zbook Fury 17 G9 to correct boost type

BugLink: https://bugs.launchpad.net/bugs/2042060

CS35L41 HDA driver requires ACPI to contain correct _DSD properties to
correctly configure the device. Whilst the HP Zbook Fury 17 G9 contains
valid _DSD properties, the boost type has been configured incorrectly
in the _DSD for this laptop. We can override these properties to fix
the boost type.

Signed-off-by: Stefan Binding <email address hidden>
Link: https://<email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>

(cherry picked from commit 581523ee3652ea6c1012b2ccbb8588c9c77ef4bb)
Signed-off-by: Chris Chiu <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>