Commit ea6942da authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul

soundwire: intel: fix potential race condition during power down

The power down sequence sets the link_up flag as false outside of the
mutex_lock. This is potentially unsafe.

In additional the flow in that sequence can be improved by first
testing if the link was powered, setting the link_up flag as false and
proceeding with the power down. In case the CPA bits cannot be
cleared, we only flag an error since we cannot deal with interrupts
any longer.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210818024954.16873-2-yung-chuan.liao@linux.intel.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent dd81e7c3
...@@ -538,12 +538,14 @@ static int intel_link_power_down(struct sdw_intel *sdw) ...@@ -538,12 +538,14 @@ static int intel_link_power_down(struct sdw_intel *sdw)
mutex_lock(sdw->link_res->shim_lock); mutex_lock(sdw->link_res->shim_lock);
intel_shim_master_ip_to_glue(sdw);
if (!(*shim_mask & BIT(link_id))) if (!(*shim_mask & BIT(link_id)))
dev_err(sdw->cdns.dev, dev_err(sdw->cdns.dev,
"%s: Unbalanced power-up/down calls\n", __func__); "%s: Unbalanced power-up/down calls\n", __func__);
sdw->cdns.link_up = false;
intel_shim_master_ip_to_glue(sdw);
*shim_mask &= ~BIT(link_id); *shim_mask &= ~BIT(link_id);
if (!*shim_mask) { if (!*shim_mask) {
...@@ -560,18 +562,19 @@ static int intel_link_power_down(struct sdw_intel *sdw) ...@@ -560,18 +562,19 @@ static int intel_link_power_down(struct sdw_intel *sdw)
link_control &= spa_mask; link_control &= spa_mask;
ret = intel_clear_bit(shim, SDW_SHIM_LCTL, link_control, cpa_mask); ret = intel_clear_bit(shim, SDW_SHIM_LCTL, link_control, cpa_mask);
}
mutex_unlock(sdw->link_res->shim_lock);
if (ret < 0) { if (ret < 0) {
dev_err(sdw->cdns.dev, "%s: could not power down link\n", __func__); dev_err(sdw->cdns.dev, "%s: could not power down link\n", __func__);
return ret; /*
* we leave the sdw->cdns.link_up flag as false since we've disabled
* the link at this point and cannot handle interrupts any longer.
*/
}
} }
sdw->cdns.link_up = false; mutex_unlock(sdw->link_res->shim_lock);
return 0;
return ret;
} }
static void intel_shim_sync_arm(struct sdw_intel *sdw) static void intel_shim_sync_arm(struct sdw_intel *sdw)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment