5.18-stable patches

added patches:
	soundwire-qcom-check-device-status-before-reading-devid.patch

diff --git a/queue-5.18/series b/queue-5.18/series
index e4903a2413d17e28ccdaa66e6bcb907050e4c49e..ea3d21ce7eb718eb12f55b9e1e40d362477452cd 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -95,3 +95,4 @@ scsi-lpfc-remove-extra-atomic_inc-on-cmd_pending-in-queuecommand-after-vmid.patc
 scsi-sg-allow-waiting-for-commands-to-complete-on-removed-device.patch
 scsi-qla2xxx-fix-incorrect-display-of-max-frame-size.patch
 scsi-qla2xxx-zero-undefined-mailbox-in-registers.patch
+soundwire-qcom-check-device-status-before-reading-devid.patch

diff --git a/queue-5.18/soundwire-qcom-check-device-status-before-reading-devid.patch b/queue-5.18/soundwire-qcom-check-device-status-before-reading-devid.patch
new file mode 100644 (file)
index 0000000..86d8d91
--- /dev/null
+++ b/queue-5.18/soundwire-qcom-check-device-status-before-reading-devid.patch
@@ -0,0 +1,38 @@
+From aa1262ca66957183ea1fb32a067e145b995f3744 Mon Sep 17 00:00:00 2001
+From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Date: Wed, 6 Jul 2022 10:56:44 +0100
+Subject: soundwire: qcom: Check device status before reading devid
+
+From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+
+commit aa1262ca66957183ea1fb32a067e145b995f3744 upstream.
+
+As per hardware datasheet its recommended that we check the device
+status before reading devid assigned by auto-enumeration.
+
+Without this patch we see SoundWire devices with invalid enumeration
+addresses on the bus.
+
+Cc: stable@vger.kernel.org
+Fixes: a6e6581942ca ("soundwire: qcom: add auto enumeration support")
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Link: https://lore.kernel.org/r/20220706095644.5852-1-srinivas.kandagatla@linaro.org
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/soundwire/qcom.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/soundwire/qcom.c
++++ b/drivers/soundwire/qcom.c
+@@ -471,6 +471,10 @@ static int qcom_swrm_enumerate(struct sd
+       char *buf1 = (char *)&val1, *buf2 = (char *)&val2;
+ 
+       for (i = 1; i <= SDW_MAX_DEVICES; i++) {
++              /* do not continue if the status is Not Present  */
++              if (!ctrl->status[i])
++                      continue;
++
+               /*SCP_Devid5 - Devid 4*/
+               ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_1(i), &val1);
+