Skip to content

Commit

Permalink
soundwire: intel: fix potential race condition during power down
Browse files Browse the repository at this point in the history
[ Upstream commit ea6942d ]

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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210818024954.16873-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
plbossart authored and gregkh committed Sep 18, 2021
1 parent b225eea commit d72afec
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/soundwire/intel.c
Expand Up @@ -537,12 +537,14 @@ static int intel_link_power_down(struct sdw_intel *sdw)

mutex_lock(sdw->link_res->shim_lock);

intel_shim_master_ip_to_glue(sdw);

if (!(*shim_mask & BIT(link_id)))
dev_err(sdw->cdns.dev,
"%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);

if (!*shim_mask) {
Expand All @@ -559,20 +561,21 @@ static int intel_link_power_down(struct sdw_intel *sdw)
link_control &= spa_mask;

ret = intel_clear_bit(shim, SDW_SHIM_LCTL, link_control, cpa_mask);
if (ret < 0) {
dev_err(sdw->cdns.dev, "%s: could not power down link\n", __func__);

/*
* 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.
*/
}
}

link_control = intel_readl(shim, SDW_SHIM_LCTL);

mutex_unlock(sdw->link_res->shim_lock);

if (ret < 0) {
dev_err(sdw->cdns.dev, "%s: could not power down link\n", __func__);

return ret;
}

sdw->cdns.link_up = false;
return 0;
return ret;
}

static void intel_shim_sync_arm(struct sdw_intel *sdw)
Expand Down

0 comments on commit d72afec

Please sign in to comment.