- Alsa-devel - mailman.alsa-project.org

[PATCH v1] ALSA: hda/tas2781: Add new vendor_id and subsystem_id to support ThinkPad ICE-1
by Shenghao Ding 18 Apr '24

18 Apr '24

Add new vendor_id and subsystem_id to support new Lenovo laptop ThinkPad ICE-1 Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index cdcb28aa9d7b..051ca23c8cfa 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10333,6 +10333,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x222e, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x2231, "Thinkpad T560", ALC292_FIXUP_TPT460), SND_PCI_QUIRK(0x17aa, 0x2233, "Thinkpad", ALC292_FIXUP_TPT460), + SND_PCI_QUIRK(0x17aa, 0x2234, "Thinkpad ICE-1", ALC287_FIXUP_TAS2781_I2C), SND_PCI_QUIRK(0x17aa, 0x2245, "Thinkpad T470", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x2246, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x2247, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), -- 2.34.1

2 1

[PATCH v1 RESEND] slimbus: stream: Add null pointer check for client functions
by Viken Dadhaniya 17 Apr '24

17 Apr '24

There is a possible scenario where client driver is calling slimbus stream APIs in incorrect sequence and it might lead to invalid null access of the stream pointer in slimbus enable/disable/prepare/unprepare/free function. Fix this by checking validity of the stream before accessing in all function API’s exposed to client. Signed-off-by: Viken Dadhaniya <quic_vdadhani(a)quicinc.com> --- drivers/slimbus/stream.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c index 1d6b38657917..c5a436fd0952 100644 --- a/drivers/slimbus/stream.c +++ b/drivers/slimbus/stream.c @@ -202,10 +202,16 @@ static int slim_get_prate_code(int rate) int slim_stream_prepare(struct slim_stream_runtime *rt, struct slim_stream_config *cfg) { - struct slim_controller *ctrl = rt->dev->ctrl; + struct slim_controller *ctrl; struct slim_port *port; int num_ports, i, port_id, prrate; + if (!rt || !cfg) { + pr_err("%s: Stream or cfg is NULL, Check from client side\n", __func__); + return -EINVAL; + } + + ctrl = rt->dev->ctrl; if (rt->ports) { dev_err(&rt->dev->dev, "Stream already Prepared\n"); return -EINVAL; @@ -358,9 +364,15 @@ int slim_stream_enable(struct slim_stream_runtime *stream) { DEFINE_SLIM_BCAST_TXN(txn, SLIM_MSG_MC_BEGIN_RECONFIGURATION, 3, SLIM_LA_MANAGER, NULL); - struct slim_controller *ctrl = stream->dev->ctrl; + struct slim_controller *ctrl; int ret, i; + if (!stream) { + pr_err("%s: Stream is NULL, Check from client side\n", __func__); + return -EINVAL; + } + + ctrl = stream->dev->ctrl; if (ctrl->enable_stream) { ret = ctrl->enable_stream(stream); if (ret) @@ -411,12 +423,18 @@ int slim_stream_disable(struct slim_stream_runtime *stream) { DEFINE_SLIM_BCAST_TXN(txn, SLIM_MSG_MC_BEGIN_RECONFIGURATION, 3, SLIM_LA_MANAGER, NULL); - struct slim_controller *ctrl = stream->dev->ctrl; + struct slim_controller *ctrl; int ret, i; + if (!stream) { + pr_err("%s: Stream is NULL, Check from client side\n", __func__); + return -EINVAL; + } + if (!stream->ports || !stream->num_ports) return -EINVAL; + ctrl = stream->dev->ctrl; if (ctrl->disable_stream) ctrl->disable_stream(stream); @@ -448,6 +466,11 @@ int slim_stream_unprepare(struct slim_stream_runtime *stream) { int i; + if (!stream) { + pr_err("%s: Stream is NULL, Check from client side\n", __func__); + return -EINVAL; + } + if (!stream->ports || !stream->num_ports) return -EINVAL; @@ -476,8 +499,14 @@ EXPORT_SYMBOL_GPL(slim_stream_unprepare); */ int slim_stream_free(struct slim_stream_runtime *stream) { - struct slim_device *sdev = stream->dev; + struct slim_device *sdev; + + if (!stream) { + pr_err("%s: Stream is NULL, Check from client side\n", __func__); + return -EINVAL; + } + sdev = stream->dev; spin_lock(&sdev->stream_list_lock); list_del(&stream->node); spin_unlock(&sdev->stream_list_lock); -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation

3 5

[PATCH v2] slimbus: stream: Add null pointer check for client APIs
by Viken Dadhaniya 17 Apr '24

17 Apr '24

Due to incorrect sequrnce of slimbus APIs called by client driver, facing system crash in slimbus framework APIs. To prevent system crash, add NULL pointer check in enable/disable/prepare/unprepare/free APIs. Signed-off-by: Viken Dadhaniya <quic_vdadhani(a)quicinc.com> --- v1 -> v2: - Update commit log. - Update debug logs. v1 Link: https://lore.kernel.org/linux-arm-msm/ZhgIHHP1FUeCr+vx@hu-bjorande-lv.qualc… --- --- drivers/slimbus/stream.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c index 1d6b38657917..76d0579cbf53 100644 --- a/drivers/slimbus/stream.c +++ b/drivers/slimbus/stream.c @@ -202,10 +202,16 @@ static int slim_get_prate_code(int rate) int slim_stream_prepare(struct slim_stream_runtime *rt, struct slim_stream_config *cfg) { - struct slim_controller *ctrl = rt->dev->ctrl; + struct slim_controller *ctrl; struct slim_port *port; int num_ports, i, port_id, prrate; + if (!rt || !cfg) { + pr_err("Invalid stream rt or cfg\n"); + return -EINVAL; + } + + ctrl = rt->dev->ctrl; if (rt->ports) { dev_err(&rt->dev->dev, "Stream already Prepared\n"); return -EINVAL; @@ -358,9 +364,15 @@ int slim_stream_enable(struct slim_stream_runtime *stream) { DEFINE_SLIM_BCAST_TXN(txn, SLIM_MSG_MC_BEGIN_RECONFIGURATION, 3, SLIM_LA_MANAGER, NULL); - struct slim_controller *ctrl = stream->dev->ctrl; + struct slim_controller *ctrl; int ret, i; + if (!stream) { + pr_err("Invalid stream\n"); + return -EINVAL; + } + + ctrl = stream->dev->ctrl; if (ctrl->enable_stream) { ret = ctrl->enable_stream(stream); if (ret) @@ -411,12 +423,18 @@ int slim_stream_disable(struct slim_stream_runtime *stream) { DEFINE_SLIM_BCAST_TXN(txn, SLIM_MSG_MC_BEGIN_RECONFIGURATION, 3, SLIM_LA_MANAGER, NULL); - struct slim_controller *ctrl = stream->dev->ctrl; + struct slim_controller *ctrl; int ret, i; + if (!stream) { + pr_err("Invalid stream"); + return -EINVAL; + } + if (!stream->ports || !stream->num_ports) return -EINVAL; + ctrl = stream->dev->ctrl; if (ctrl->disable_stream) ctrl->disable_stream(stream); @@ -448,6 +466,11 @@ int slim_stream_unprepare(struct slim_stream_runtime *stream) { int i; + if (!stream) { + pr_err("Invalid stream\n"); + return -EINVAL; + } + if (!stream->ports || !stream->num_ports) return -EINVAL; @@ -476,8 +499,14 @@ EXPORT_SYMBOL_GPL(slim_stream_unprepare); */ int slim_stream_free(struct slim_stream_runtime *stream) { - struct slim_device *sdev = stream->dev; + struct slim_device *sdev; + + if (!stream) { + pr_err("Invalid stream\n"); + return -EINVAL; + } + sdev = stream->dev; spin_lock(&sdev->stream_list_lock); list_del(&stream->node); spin_unlock(&sdev->stream_list_lock); -- 2.17.1

1 0

[PATCH 0/7] Xperia 1 V support
by Konrad Dybcio 17 Apr '24

17 Apr '24

DTS for the phone and some fly-by fixes Patch 1 for Mark/sound Rest for qcom Signed-off-by: Konrad Dybcio <konrad.dybcio(a)linaro.org> --- Konrad Dybcio (7): dt-bindings: ASoC: cs35l45: Add interrupts dt-bindings: arm: qcom: Add Xperia 1 V arm64: dts: qcom: sm8550: Mark QUPs and GPI dma-coherent arm64: dts: qcom: sm8550: Mark APPS SMMU as dma-coherent arm64: dts: qcom: sm8550: Add missing DWC3 quirks arm64: dts: qcom: sm8550: Mark DWC3 as dma-coherent arm64: dts: qcom: Add SM8550 Xperia 1 V Documentation/devicetree/bindings/arm/qcom.yaml | 1 + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 3 + arch/arm64/boot/dts/qcom/Makefile | 1 + .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 779 +++++++++++++++++++++ arch/arm64/boot/dts/qcom/sm8550.dtsi | 20 +- 5 files changed, 801 insertions(+), 3 deletions(-) --- base-commit: ae00c445390b349e070a64dc62f08aa878db7248 change-id: 20240210-topic-1v-18e9697d2056 Best regards, -- Konrad Dybcio <konrad.dybcio(a)linaro.org>

8 20

[PATCH ver.2 6.1.y 0/6] ASoC: codecs: es8326: fix support (backport from v6.6)
by kovalev＠altlinux.org 17 Apr '24

17 Apr '24

Without these patches, all tested laptop models using the es8326 audio codec have no sound from the speakers and headphones, and the headset microphone does not work. Although the initialization of the sound card is successful. -- ver.2: drop a commit that does not affect the fix of functionality; added an explanation that does not work on the current version of the kernel without patches. -- Patches have been successfully tested on the latest 6.1.86 kernel. [PATCH 6.1.y 1/6] ASoC: codecs: ES8326: Add es8326_mute function [PATCH 6.1.y 2/6] ASoC: codecs: ES8326: Change Hp_detect register names [PATCH 6.1.y 3/6] ASoC: codecs: ES8326: Change Volatile Reg function [PATCH 6.1.y 4/6] ASoC: codecs: ES8326: Fix power-up sequence [PATCH 6.1.y 5/6] ASOC: codecs: ES8326: Add calibration support for [PATCH 6.1.y 6/6] ASoC: codecs: ES8326: Update jact detection function

1 6

[PATCH v3 71/74] x86/cpu/vfm: Update sound/soc/intel/avs/boards/es8336.c
by Tony Luck 17 Apr '24

17 Apr '24

New CPU #defines encode vendor and family as well as model. Signed-off-by: Tony Luck <tony.luck(a)intel.com> --- sound/soc/intel/avs/boards/es8336.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 5c90a6007577..6c86c581877e 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -18,6 +18,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/soc-acpi.h> +#include <asm/cpu_device_id.h> #include <asm/intel-family.h> #include "../utils.h" @@ -153,9 +154,9 @@ static int avs_es8336_hw_params(struct snd_pcm_substream *substream, int clk_freq; int ret; - switch (boot_cpu_data.x86_model) { - case INTEL_FAM6_KABYLAKE_L: - case INTEL_FAM6_KABYLAKE: + switch (boot_cpu_data.x86_vfm) { + case INTEL_KABYLAKE_L: + case INTEL_KABYLAKE: clk_freq = 24000000; break; default: -- 2.44.0

2 1

ucm2: HDA: Use Master volume control for dual speakers
by GitHub pull_request - opened 16 Apr '24

16 Apr '24

alsa-project/alsa-ucm-conf pull request #410 was opened from tuxedoxt: This PR extends the existing 'activate Bass Speaker' case with additional configuration - Use Master mixer for volume control (instead of only using Speaker) - Configure Speaker Volume and Bass Speaker volume to max since Master volume regulation is used It fixes a case where only the first speaker volume is changed using the system volume control. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/410 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/410.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] ASoC: rt715: add vendor clear control register
by Jack Yu 16 Apr '24

16 Apr '24

Add vendor clear control register in readable register's callback function. This prevents an access failure reported in Intel CI tests. Signed-off-by: Jack Yu <jack.yu(a)realtek.com> --- sound/soc/codecs/rt715-sdw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c index 24b3443aeb02..ec255ada44e0 100644 --- a/sound/soc/codecs/rt715-sdw.c +++ b/sound/soc/codecs/rt715-sdw.c @@ -111,6 +111,7 @@ static bool rt715_readable_register(struct device *dev, unsigned int reg) case 0x839d: case 0x83a7: case 0x83a9: + case 0x752001: case 0x752039: return true; default: -- 2.34.1

3 2

[PATCH 0/2] ASoC: fsl-asoc-card: add wm8904 codec support
by Shengjiu Wang 16 Apr '24

16 Apr '24

add wm8904 codec support in fsl-asoc-card. Shengjiu Wang (2): ASoC: fsl-asoc-card: add wm8904 codec support ASoC: dt-bindings: fsl-asoc-card: Add compatbile string for wm8904 codec .../devicetree/bindings/sound/fsl-asoc-card.yaml | 1 + sound/soc/fsl/fsl-asoc-card.c | 8 ++++++++ 2 files changed, 9 insertions(+) -- 2.34.1

2 3

[PATCH v2.5] ASoC: Replace dpcm_playback/capture to playback/capture_assertion
by Kuninori Morimoto 16 Apr '24

16 Apr '24

Hi Mark, Amadeusz, Jerome, Pierre-Louis This is v2.5 patch which is preparation for v3. Because full-patch-set has over 20 patches, to avoid posting huge patch-bomb, I try to post main patch only for preparation. In v2.5, it will use xxx_assertion flag, and exising dpcm_xxx and xxx_only flags will be converted to it. I think it can keep compatibility and possible to indicate link error same as before which was conserned by Pierre-Louis. Please let me know if it still not good match. One of my big consern is Amadeusz/Jerome's idea which uses "XXX | YYY" style. To avoid confusion, let's name each style as below here. [Flag style] unsigned int flags; #define SND_SOC_FLAGS_ASSERTION_PLAYBACK BIT(x) #define SND_SOC_FLAGS_ASSERTION_CAPTURE BIT(x) ... [BitField style] unsigned int playback_assertion:1; unsigned int capture_assertion:1; ... This v2.5 patch is using [BitField style] and I think it is not a big problem from "code point of view", but I think [Flag style] is better for "human understandable point of view", because we can define like below, for example. #define SND_SOC_FLAGS_AVAILABLE_PLAYBACK /* no flag is needed */ #define SND_SOC_FLAGS_AVAILABLE_PLAYBACK_WITH_ASSERTION SND_SOC_FLAGS_ASSERTION_PLAYBACK #define SND_SOC_FLAGS_AVAILABLE_CAPTURE /* no flag is needed */ #define SND_SOC_FLAGS_AVAILABLE_CAPTURE_WITH_ASSERTION SND_SOC_FLAGS_ASSERTION_CAPTURE #define SND_SOC_FLAGS_AVAILABLE_BIDIRECTIONAL /* no flag is needed */ #define SND_SOC_FLAGS_AVAILABLE_BIDIRECTIONAL_WITH_ASSERTION (SND_SOC_FLAGS_ASSERTION_PLAYBACK | SND_SOC_FLAGS_ASSERTION_CAPTURE) #define SND_SOC_FLAGS_AVAILABLE_PLAYBACK_ONLY SND_SOC_FLAGS_ASSERTION_PLAYBACK #define SND_SOC_FLAGS_AVAILABLE_CAPTURE_ONLY SND_SOC_FLAGS_ASSERTION_CAPTURE Switch to [Flag style] is OK for me, but one consern is that in such case, people will wonder "why ASoC is using both [Flag style] and [BitField style] in the same time ?", because we are using [BitField style] for other flags. So, my suggestion is that next v3 patch uses [Flag style]. And after that, post new patch-set to switch [BitField style] to [Flag style] for other flags. But I wonder is this good approach ? v2 -> v2.5 - use xxx_assertion flag - dpcm_xxx -> xxx_assertion - xxx_only -> xxx_assertion - only [01/xx] patch v1 -> v2 - based on latest ASoC branch - keep comment on Intel - tidyup patch title - tidyup DPCM BE warning output condition - Add new patch for Document Link: https://lore.kernel.org/r/87o7b353of.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/87zfuesz8y.wl-kuninori.morimoto.gx@renesas.com Thank you for your help !! Best regards --- Renesas Electronics Ph.D. Kuninori Morimoto

3 5