Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: SDCA: Correct FDL locking in sdca_fdl_process() 

The current locking in sdca_fdl_process() locks over
sdca_ump_cancel_timeout() and the timeout work function takes the same
lock, this can lead to a deadlock if the work runs as part of the
cancel. To fix this use scoped_guard and move the cancel timeout to be
outside the lock.

Fixes: e92e25f777 ("ASoC: SDCA: Add UMP timeout handling for FDL")
Tested-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Tested-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20251120153023.2105663-5-ckeepax@opensource.cirrus.com
Reviewed-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2025-11-20 15:30:13 +00:00 committed by Mark Brown
parent 5fe65824b7
commit cc58055bfe
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
sound/soc/sdca/sdca_fdl.c
View File

@ -402,8 +402,6 @@ int sdca_fdl_process(struct sdca_interrupt *interrupt)
unsigned int reg, status;
int response, ret;
guard(mutex)(&fdl_state->lock);
ret = sdca_ump_get_owner_host(dev, interrupt->function_regmap,
interrupt->function, interrupt->entity,
interrupt->control);
@ -412,56 +410,59 @@ int sdca_fdl_process(struct sdca_interrupt *interrupt)
sdca_ump_cancel_timeout(&fdl_state->timeout);
reg = SDW_SDCA_CTL(interrupt->function->desc->adr, interrupt->entity->id,
SDCA_CTL_XU_FDL_STATUS, 0);
ret = regmap_read(interrupt->function_regmap, reg, &status);
if (ret < 0) {
dev_err(dev, "failed to read FDL status: %d\n", ret);
return ret;
}
dev_dbg(dev, "FDL status: %#x\n", status);
ret = fdl_status_process(interrupt, status);
if (ret < 0)
goto reset_function;
response = ret;
dev_dbg(dev, "FDL response: %#x\n", response);
ret = regmap_write(interrupt->function_regmap, reg,
response | (status & ~SDCA_CTL_XU_FDLH_MASK));
if (ret < 0) {
dev_err(dev, "failed to set FDL status signal: %d\n", ret);
return ret;
}
ret = sdca_ump_set_owner_device(dev, interrupt->function_regmap,
interrupt->function, interrupt->entity,
interrupt->control);
if (ret)
return ret;
switch (response) {
case SDCA_CTL_XU_FDLH_RESET_ACK:
dev_dbg(dev, "FDL request reset\n");
switch (xu->reset_mechanism) {
default:
dev_warn(dev, "Requested reset mechanism not implemented\n");
fallthrough;
case SDCA_XU_RESET_FUNCTION:
goto reset_function;
scoped_guard(mutex, &fdl_state->lock) {
reg = SDW_SDCA_CTL(interrupt->function->desc->adr,
interrupt->entity->id, SDCA_CTL_XU_FDL_STATUS, 0);
ret = regmap_read(interrupt->function_regmap, reg, &status);
if (ret < 0) {
dev_err(dev, "failed to read FDL status: %d\n", ret);
return ret;
}
case SDCA_CTL_XU_FDLH_COMPLETE:
if (status & SDCA_CTL_XU_FDLD_REQ_ABORT ||
status == SDCA_CTL_XU_FDLD_COMPLETE)
dev_dbg(dev, "FDL status: %#x\n", status);
ret = fdl_status_process(interrupt, status);
if (ret < 0)
goto reset_function;
response = ret;
dev_dbg(dev, "FDL response: %#x\n", response);
ret = regmap_write(interrupt->function_regmap, reg,
response | (status & ~SDCA_CTL_XU_FDLH_MASK));
if (ret < 0) {
dev_err(dev, "failed to set FDL status signal: %d\n", ret);
return ret;
}
ret = sdca_ump_set_owner_device(dev, interrupt->function_regmap,
interrupt->function,
interrupt->entity,
interrupt->control);
if (ret)
return ret;
switch (response) {
case SDCA_CTL_XU_FDLH_RESET_ACK:
dev_dbg(dev, "FDL request reset\n");
switch (xu->reset_mechanism) {
default:
dev_warn(dev, "Requested reset mechanism not implemented\n");
fallthrough;
case SDCA_XU_RESET_FUNCTION:
goto reset_function;
}
case SDCA_CTL_XU_FDLH_COMPLETE:
if (status & SDCA_CTL_XU_FDLD_REQ_ABORT ||
status == SDCA_CTL_XU_FDLD_COMPLETE)
return 0;
fallthrough;
default:
sdca_ump_schedule_timeout(&fdl_state->timeout, xu->max_delay);
return 0;
fallthrough;
default:
sdca_ump_schedule_timeout(&fdl_state->timeout, xu->max_delay);
return 0;
}
}
reset_function: