Skip to content

Commit a90def0

Browse files
plbossartvinodkoul
authored andcommitted
soundwire: bus: fix race condition with initialization_complete signaling
Waiting for the enumeration to be complete may not be enough for a Slave driver, there is a possible race condition between resume operations and initializations handled in an interrupt thread, which can results in settings not being fully restored after system or pm_runtime resume. This patch builds on the changes added for enumeration_complete, init_completion() is called when the Slave device becomes UNATTACHED, as done with enumeration_complete. The difference with the enumeration_complete case is that complete() is signaled after the Slave device is fully initialized after the .update_status() callback is called. A Slave device driver can decide to wait on either of the two complete() cases, depending on its initialization code and requirements. Signed-off-by: Rander Wang <rander.wang@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20200115000844.14695-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent fb9469e commit a90def0

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/soundwire/bus.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,
621621
__func__, slave->dev_num);
622622

623623
init_completion(&slave->enumeration_complete);
624+
init_completion(&slave->initialization_complete);
624625

625626
} else if ((status == SDW_SLAVE_ATTACHED) &&
626627
(slave->status == SDW_SLAVE_UNATTACHED)) {
@@ -1025,6 +1026,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
10251026
{
10261027
enum sdw_slave_status prev_status;
10271028
struct sdw_slave *slave;
1029+
bool attached_initializing;
10281030
int i, ret = 0;
10291031

10301032
/* first check if any Slaves fell off the bus */
@@ -1070,6 +1072,8 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
10701072
if (!slave)
10711073
continue;
10721074

1075+
attached_initializing = false;
1076+
10731077
switch (status[i]) {
10741078
case SDW_SLAVE_UNATTACHED:
10751079
if (slave->status == SDW_SLAVE_UNATTACHED)
@@ -1096,6 +1100,8 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
10961100
if (prev_status == SDW_SLAVE_ALERT)
10971101
break;
10981102

1103+
attached_initializing = true;
1104+
10991105
ret = sdw_initialize_slave(slave);
11001106
if (ret)
11011107
dev_err(bus->dev,
@@ -1114,6 +1120,8 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
11141120
if (ret)
11151121
dev_err(slave->bus->dev,
11161122
"Update Slave status failed:%d\n", ret);
1123+
if (attached_initializing)
1124+
complete(&slave->initialization_complete);
11171125
}
11181126

11191127
return ret;

drivers/soundwire/slave.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ static int sdw_slave_add(struct sdw_bus *bus,
4747
slave->bus = bus;
4848
slave->status = SDW_SLAVE_UNATTACHED;
4949
init_completion(&slave->enumeration_complete);
50+
init_completion(&slave->initialization_complete);
5051
slave->dev_num = 0;
5152
init_completion(&slave->probe_complete);
5253
slave->probed = false;

0 commit comments

Comments
 (0)