Skip to content

[TEST] soundwire: intel: waiting for all Slaves be attached #2526

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
bardliao wants to merge 1 commit into from
Closed

[TEST] soundwire: intel: waiting for all Slaves be attached #2526

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions drivers/soundwire/intel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,8 @@ static int __maybe_unused intel_resume(struct device *dev)
struct sdw_cdns *cdns = dev_get_drvdata(dev);
struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_bus *bus = &cdns->bus;
struct sdw_slave *slave;
unsigned long time;
int link_flags;
bool multi_link;
int ret;
Expand Down Expand Up @@ -1781,6 +1783,18 @@ static int __maybe_unused intel_resume(struct device *dev)
}
}

/* Waiting for all Slaves be attached */
list_for_each_entry(slave, &bus->slaves, node) {
if (!slave->unattach_request)
continue;
time = wait_for_completion_timeout(&slave->enumeration_complete,
500);
if (!time) {
dev_err(&slave->dev, "enumeration not complete, timed out\n");
return -ETIMEDOUT;
}
}

/*
* after system resume, the pm_runtime suspend() may kick in
* during the enumeration, before any children device force the
Expand All @@ -1801,6 +1815,8 @@ static int intel_resume_runtime(struct device *dev)
struct sdw_cdns *cdns = dev_get_drvdata(dev);
struct sdw_intel *sdw = cdns_to_intel(cdns);
struct sdw_bus *bus = &cdns->bus;
struct sdw_slave *slave;
unsigned long time;
u32 clock_stop_quirks;
bool clock_stop0;
int link_flags;
Expand Down Expand Up @@ -1966,6 +1982,18 @@ static int intel_resume_runtime(struct device *dev)
ret = -EINVAL;
}

/* Waiting for all Slaves be attached */
list_for_each_entry(slave, &bus->slaves, node) {
if (!slave->unattach_request)
continue;
time = wait_for_completion_timeout(&slave->enumeration_complete,
500);
if (!time) {
dev_err(&slave->dev, "enumeration not complete, timed out\n");
return -ETIMEDOUT;
}
}

return ret;
}

Expand Down