This is a note to let you know that I've just added the patch titled
ASoC: qcom: q6prm: fix incorrect clk_root passed to ADSP
to the 6.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-qcom-q6prm-fix-incorrect-clk_root-passed-to-adsp.patch
and it can be found in the queue-6.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 65882134bc622a1e57bd5928ac588855ea2e3ddd Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Date: Thu, 2 Mar 2023 13:29:08 +0100
Subject: ASoC: qcom: q6prm: fix incorrect clk_root passed to ADSP
From: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
commit 65882134bc622a1e57bd5928ac588855ea2e3ddd upstream.
The second to last argument is clk_root (root of the clock), however the
code called q6prm_request_lpass_clock() with clk_attr instead
(copy-paste error). This effectively was passing value of 1 as root
clock which worked on some of the SoCs (e.g. SM8450) but fails on
others, depending on the ADSP. For example on SM8550 this "1" as root
clock is not accepted and results in errors coming from ADSP.
Fixes: 2f20640491ed ("ASoC: qdsp6: qdsp6: q6prm: handle clk disable correctly")
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230302122908.221398-1-krzysztof.kozlowski@xxxxxxxxxx
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/soc/qcom/qdsp6/q6prm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/qcom/qdsp6/q6prm.c
+++ b/sound/soc/qcom/qdsp6/q6prm.c
@@ -183,9 +183,9 @@ int q6prm_set_lpass_clock(struct device
unsigned int freq)
{
if (freq)
- return q6prm_request_lpass_clock(dev, clk_id, clk_attr, clk_attr, freq);
+ return q6prm_request_lpass_clock(dev, clk_id, clk_attr, clk_root, freq);
- return q6prm_release_lpass_clock(dev, clk_id, clk_attr, clk_attr, freq);
+ return q6prm_release_lpass_clock(dev, clk_id, clk_attr, clk_root, freq);
}
EXPORT_SYMBOL_GPL(q6prm_set_lpass_clock);
Patches currently in stable-queue which might be from krzysztof.kozlowski@xxxxxxxxxx are
queue-6.2/memory-tegra20-emc-fix-interconnect-registration-race.patch
queue-6.2/memory-tegra124-emc-fix-interconnect-registration-race.patch
queue-6.2/interconnect-exynos-fix-registration-race.patch
queue-6.2/memory-tegra30-emc-fix-interconnect-registration-race.patch
queue-6.2/memory-tegra-fix-interconnect-registration-race.patch
queue-6.2/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch
queue-6.2/hwmon-tmp512-drop-of_match_ptr-for-id-table.patch
queue-6.2/nfc-st-nci-fix-use-after-free-bug-in-ndlc_remove-due.patch
queue-6.2/asoc-qcom-q6prm-fix-incorrect-clk_root-passed-to-adsp.patch
