2022-07-14 01:28:09

by Bard Liao

[permalink] [raw]

Subject: [PATCH 4/4] ASoC: codecs: show PING status on resume failures

---

From: Pierre-Louis Bossart <[email protected]>

This helper should help identify cases where devices fall off the bus
and don't resync.

BugLink: https://github.com/thesofproject/linux/issues/3638
Signed-off-by: Pierre-Louis Bossart <[email protected]>
Reviewed-by: Rander Wang <[email protected]>
Signed-off-by: Bard Liao <[email protected]>
---
sound/soc/codecs/max98373-sdw.c | 2 ++
sound/soc/codecs/rt1308-sdw.c | 2 ++
sound/soc/codecs/rt1316-sdw.c | 2 ++
sound/soc/codecs/rt5682-sdw.c | 2 ++
sound/soc/codecs/rt700-sdw.c | 2 ++
sound/soc/codecs/rt711-sdca-sdw.c | 2 ++
sound/soc/codecs/rt715-sdca-sdw.c | 2 ++
sound/soc/codecs/rt715-sdw.c | 2 ++
8 files changed, 16 insertions(+)

diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
index f47e956d4f55..7bed8e146b78 100644
--- a/sound/soc/codecs/max98373-sdw.c
+++ b/sound/soc/codecs/max98373-sdw.c
@@ -281,6 +281,8 @@ static __maybe_unused int max98373_resume(struct device *dev)
msecs_to_jiffies(MAX98373_PROBE_TIMEOUT));
if (!time) {
dev_err(dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index 1c11b42dd76e..0049c6c66855 100644
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -727,6 +727,8 @@ static int __maybe_unused rt1308_dev_resume(struct device *dev)
msecs_to_jiffies(RT1308_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c
index 60baa9ff1907..34ca2b77ee4f 100644
--- a/sound/soc/codecs/rt1316-sdw.c
+++ b/sound/soc/codecs/rt1316-sdw.c
@@ -712,6 +712,8 @@ static int __maybe_unused rt1316_dev_resume(struct device *dev)
msecs_to_jiffies(RT1316_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt5682-sdw.c b/sound/soc/codecs/rt5682-sdw.c
index 248257a2e4e0..b4e722bb7e25 100644
--- a/sound/soc/codecs/rt5682-sdw.c
+++ b/sound/soc/codecs/rt5682-sdw.c
@@ -790,6 +790,8 @@ static int __maybe_unused rt5682_dev_resume(struct device *dev)
msecs_to_jiffies(RT5682_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt700-sdw.c b/sound/soc/codecs/rt700-sdw.c
index bda594899664..132e60f72c03 100644
--- a/sound/soc/codecs/rt700-sdw.c
+++ b/sound/soc/codecs/rt700-sdw.c
@@ -538,6 +538,8 @@ static int __maybe_unused rt700_dev_resume(struct device *dev)
msecs_to_jiffies(RT700_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt711-sdca-sdw.c b/sound/soc/codecs/rt711-sdca-sdw.c
index aaf5af153d3f..d1d8327cf72f 100644
--- a/sound/soc/codecs/rt711-sdca-sdw.c
+++ b/sound/soc/codecs/rt711-sdca-sdw.c
@@ -442,6 +442,8 @@ static int __maybe_unused rt711_sdca_dev_resume(struct device *dev)
msecs_to_jiffies(RT711_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt715-sdca-sdw.c b/sound/soc/codecs/rt715-sdca-sdw.c
index 0ecd2948f7aa..796b5e982b8a 100644
--- a/sound/soc/codecs/rt715-sdca-sdw.c
+++ b/sound/soc/codecs/rt715-sdca-sdw.c
@@ -233,6 +233,8 @@ static int __maybe_unused rt715_dev_resume(struct device *dev)
msecs_to_jiffies(RT715_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Enumeration not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index a7b21b03c08b..42b8c176b821 100644
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -551,6 +551,8 @@ static int __maybe_unused rt715_dev_resume(struct device *dev)
msecs_to_jiffies(RT715_PROBE_TIMEOUT));
if (!time) {
dev_err(&slave->dev, "Initialization not complete, timed out\n");
+ sdw_show_ping_status(slave->bus, true);
+
return -ETIMEDOUT;
}

--
2.25.1

2022-07-14 20:03:21

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH 4/4] ASoC: codecs: show PING status on resume failures

---

On Thu, Jul 14, 2022 at 09:10:43AM +0800, Bard Liao wrote:
> From: Pierre-Louis Bossart <[email protected]>
>
> This helper should help identify cases where devices fall off the bus
> and don't resync.

Acked-by: Mark Brown <[email protected]>

If this is applied to the Soundwire tree it might be good to get a pull
request in case of conflicts, though I guess they are relatively
unlikely here.

---

Attachments:

(No filename) (429.00 B)
signature.asc (499.00 B)
Download all attachments

2022-07-18 06:07:00

by Vinod Koul

[permalink] [raw]

Subject: Re: [PATCH 4/4] ASoC: codecs: show PING status on resume failures

---

Hey Mark,

On 14-07-22, 20:21, Mark Brown wrote:
> On Thu, Jul 14, 2022 at 09:10:43AM +0800, Bard Liao wrote:
> > From: Pierre-Louis Bossart <[email protected]>
> >
> > This helper should help identify cases where devices fall off the bus
> > and don't resync.
>
> Acked-by: Mark Brown <[email protected]>
>
> If this is applied to the Soundwire tree it might be good to get a pull
> request in case of conflicts, though I guess they are relatively
> unlikely here.

It is bit late for sdw tree (we are closed for this cycle now), if you
are okay, pls feel free to take thru ASoC tree:

You may use:
git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git tags/soundwire-5.20-rc1

--
~Vinod