Skip to content

Pr4838 debug #4845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
plbossart wants to merge 6 commits into from
Closed

Pr4838 debug #4845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2a734e
soundwire: intel_auxdevice: use pm_resume_resume to resume child
bardliao Feb 29, 2024
6b1b861
soundwire: intel: export intel_resume_child_device
bardliao Feb 29, 2024
94afd7f
ASoC/soundwire: Intel: add sdw_intel_pre_exit helper
bardliao Feb 23, 2024
18c1ac2
[HACK] add traces to debug race conditions
plbossart Mar 5, 2024
ab3714f
more traces
plbossart Mar 5, 2024
2e6c5c5
ASoC: SOF: Intel: hda: disable SoundWire interrupt later
plbossart Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions drivers/soundwire/bus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1761,9 +1761,14 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
goto io_err;
}

dev_dbg(&slave->dev, "SDW_SCP_INT1 write successful iteration %d\n",
count);

/* at this point all initial interrupt sources were handled */
slave->first_interrupt_done = true;

dev_dbg(&slave->dev, "SDW_SCP_INT1 read started iteration %d\n",
count);
/*
* Read status again to ensure no new interrupts arrived
* while servicing interrupts.
Expand All @@ -1774,6 +1779,10 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
"SDW_SCP_INT1 recheck read failed:%d\n", ret);
goto io_err;
}

dev_dbg(&slave->dev, "SDW_SCP_INT1 read done iteration %d\n",
count);

buf = ret;

ret = sdw_nread_no_pm(slave, SDW_SCP_INTSTAT2, 2, buf2);
Expand Down
10 changes: 7 additions & 3 deletions drivers/soundwire/intel_auxdevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ int intel_link_process_wakeen_event(struct auxiliary_device *auxdev)
* PM calls
*/

static int intel_resume_child_device(struct device *dev, void *data)
int intel_resume_child_device(struct device *dev, void *data)
{
int ret;
struct sdw_slave *slave = dev_to_sdw_dev(dev);
Expand All @@ -454,12 +454,16 @@ static int intel_resume_child_device(struct device *dev, void *data)
return 0;
}

ret = pm_request_resume(dev);
dev_dbg(dev, "runtime_resume started\n");

ret = pm_runtime_resume(dev);
if (ret < 0) {
dev_err(dev, "%s: pm_request_resume failed: %d\n", __func__, ret);
dev_err(dev, "%s: pm_runtime_resume failed: %d\n", __func__, ret);
return ret;
}

dev_dbg(dev, "runtime_resume done\n");

return 0;
}

Expand Down
1 change: 1 addition & 0 deletions drivers/soundwire/intel_auxdevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

int intel_link_startup(struct auxiliary_device *auxdev);
int intel_link_process_wakeen_event(struct auxiliary_device *auxdev);
int intel_resume_child_device(struct device *dev, void *data);

struct sdw_intel_link_dev {
struct auxiliary_device auxdev;
Expand Down
17 changes: 17 additions & 0 deletions drivers/soundwire/intel_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/pm_runtime.h>
#include <linux/soundwire/sdw_intel.h>
#include "cadence_master.h"
#include "bus.h"
#include "intel.h"
#include "intel_auxdevice.h"

Expand Down Expand Up @@ -363,6 +364,22 @@ void sdw_intel_exit(struct sdw_intel_ctx *ctx)
}
EXPORT_SYMBOL_NS(sdw_intel_exit, SOUNDWIRE_INTEL_INIT);

void sdw_intel_pre_exit(struct sdw_intel_ctx *ctx)
{
struct sdw_intel_link_res *link;

list_for_each_entry(link, &ctx->link_list, list) {
struct sdw_bus *bus = &link->cdns->bus;
int ret;

ret = device_for_each_child(bus->dev, NULL, intel_resume_child_device);
if (ret < 0)
dev_err(bus->dev, "%s: intel_resume_child_device failed: %d\n",
__func__, ret);
}
}
EXPORT_SYMBOL_NS(sdw_intel_pre_exit, SOUNDWIRE_INTEL_INIT);

void sdw_intel_process_wakeen_event(struct sdw_intel_ctx *ctx)
{
struct sdw_intel_link_dev *ldev;
Expand Down
1 change: 1 addition & 0 deletions include/linux/soundwire/sdw_intel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ sdw_intel_probe(struct sdw_intel_res *res);
int sdw_intel_startup(struct sdw_intel_ctx *ctx);

void sdw_intel_exit(struct sdw_intel_ctx *ctx);
void sdw_intel_pre_exit(struct sdw_intel_ctx *ctx);

irqreturn_t sdw_intel_thread(int irq, void *dev_id);

Expand Down
8 changes: 8 additions & 0 deletions sound/soc/codecs/rt1308-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,8 +742,12 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,

static int rt1308_sdw_remove(struct sdw_slave *slave)
{
dev_dbg(&slave->dev, "remove started\n");

pm_runtime_disable(&slave->dev);

dev_dbg(&slave->dev, "remove done\n");

return 0;
}

Expand Down Expand Up @@ -773,6 +777,8 @@ static int __maybe_unused rt1308_dev_resume(struct device *dev)
struct rt1308_sdw_priv *rt1308 = dev_get_drvdata(dev);
unsigned long time;

dev_dbg(&slave->dev, "Resume started\n");

if (!rt1308->first_hw_init)
return 0;

Expand All @@ -793,6 +799,8 @@ static int __maybe_unused rt1308_dev_resume(struct device *dev)
regcache_cache_only(rt1308->regmap, false);
regcache_sync_region(rt1308->regmap, 0xc000, 0xcfff);

dev_dbg(&slave->dev, "Resume done\n");

return 0;
}

Expand Down
8 changes: 8 additions & 0 deletions sound/soc/codecs/rt700-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,17 @@ static int rt700_sdw_remove(struct sdw_slave *slave)
{
struct rt700_priv *rt700 = dev_get_drvdata(&slave->dev);

dev_dbg(&slave->dev, "remove started\n");

if (rt700->hw_init) {
cancel_delayed_work_sync(&rt700->jack_detect_work);
cancel_delayed_work_sync(&rt700->jack_btn_check_work);
}

pm_runtime_disable(&slave->dev);

dev_dbg(&slave->dev, "remove done\n");

return 0;
}

Expand Down Expand Up @@ -526,6 +530,8 @@ static int __maybe_unused rt700_dev_resume(struct device *dev)
struct rt700_priv *rt700 = dev_get_drvdata(dev);
unsigned long time;

dev_dbg(&slave->dev, "Resume started\n");

if (!rt700->first_hw_init)
return 0;

Expand All @@ -547,6 +553,8 @@ static int __maybe_unused rt700_dev_resume(struct device *dev)
regcache_sync_region(rt700->regmap, 0x3000, 0x8fff);
regcache_sync_region(rt700->regmap, 0x752010, 0x75206b);

dev_dbg(&slave->dev, "Resume done\n");

return 0;
}

Expand Down
8 changes: 8 additions & 0 deletions sound/soc/codecs/rt711-sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@ static int rt711_sdw_remove(struct sdw_slave *slave)
{
struct rt711_priv *rt711 = dev_get_drvdata(&slave->dev);

dev_dbg(&slave->dev, "remove started\n");

if (rt711->hw_init) {
cancel_delayed_work_sync(&rt711->jack_detect_work);
cancel_delayed_work_sync(&rt711->jack_btn_check_work);
Expand All @@ -471,6 +473,8 @@ static int rt711_sdw_remove(struct sdw_slave *slave)
mutex_destroy(&rt711->calibrate_mutex);
mutex_destroy(&rt711->disable_irq_lock);

dev_dbg(&slave->dev, "remove done\n");

return 0;
}

Expand Down Expand Up @@ -532,6 +536,8 @@ static int __maybe_unused rt711_dev_resume(struct device *dev)
struct rt711_priv *rt711 = dev_get_drvdata(dev);
unsigned long time;

dev_dbg(&slave->dev, "Resume started\n");

if (!rt711->first_hw_init)
return 0;

Expand All @@ -558,6 +564,8 @@ static int __maybe_unused rt711_dev_resume(struct device *dev)
regcache_sync_region(rt711->regmap, 0x3000, 0x8fff);
regcache_sync_region(rt711->regmap, 0x752009, 0x752091);

dev_dbg(&slave->dev, "Resume done\n");

return 0;
}

Expand Down
5 changes: 4 additions & 1 deletion sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,15 @@ static int hda_sdw_exit(struct snd_sof_dev *sdev)

hdev = sdev->pdata->hw_pdata;

hda_sdw_int_enable(sdev, false);
if (hdev->sdw)
sdw_intel_pre_exit(hdev->sdw);

if (hdev->sdw)
sdw_intel_exit(hdev->sdw);
hdev->sdw = NULL;

hda_sdw_int_enable(sdev, false);

return 0;
}

Expand Down