Skip to content

Commit

Permalink
soundwire: fix enumeration completion
Browse files Browse the repository at this point in the history
The soundwire subsystem uses two completion structures that allow
drivers to wait for soundwire device to become enumerated on the bus and
initialised by their drivers, respectively.

The code implementing the signalling is currently broken as it does not
signal all current and future waiters and also uses the wrong
reinitialisation function, which can potentially lead to memory
corruption if there are still waiters on the queue.

Not signalling future waiters specifically breaks sound card probe
deferrals as codec drivers can not tell that the soundwire device is
already attached when being reprobed. Some codec runtime PM
implementations suffer from similar problems as waiting for enumeration
during resume can also timeout despite the device already having been
enumerated.

Fixes: fb9469e ("soundwire: bus: fix race condition with enumeration_complete signaling")
Fixes: a90def0 ("soundwire: bus: fix race condition with initialization_complete signaling")
Cc: stable@vger.kernel.org      # 5.7
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Rander Wang <rander.wang@linux.intel.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230705123018.30903-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
  • Loading branch information
jhovold authored and vinodkoul committed Jul 12, 2023
1 parent 06c2afb commit c40d6b3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/soundwire/bus.c
Expand Up @@ -922,16 +922,16 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,
"initializing enumeration and init completion for Slave %d\n",
slave->dev_num);

init_completion(&slave->enumeration_complete);
init_completion(&slave->initialization_complete);
reinit_completion(&slave->enumeration_complete);
reinit_completion(&slave->initialization_complete);

} else if ((status == SDW_SLAVE_ATTACHED) &&
(slave->status == SDW_SLAVE_UNATTACHED)) {
dev_dbg(&slave->dev,
"signaling enumeration completion for Slave %d\n",
slave->dev_num);

complete(&slave->enumeration_complete);
complete_all(&slave->enumeration_complete);
}
slave->status = status;
mutex_unlock(&bus->bus_lock);
Expand Down Expand Up @@ -1951,7 +1951,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
"signaling initialization completion for Slave %d\n",
slave->dev_num);

complete(&slave->initialization_complete);
complete_all(&slave->initialization_complete);

/*
* If the manager became pm_runtime active, the peripherals will be
Expand Down

0 comments on commit c40d6b3

Please sign in to comment.