Commit b04c975e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: bus: use sdw_update_no_pm when initializing a device 



When a Slave device is resumed, it may resume the bus and restart the
enumeration. During that process, we absolutely don't want to call
regular read/write routines which will wait for the resume to
complete, otherwise a deadlock occurs.

Fixes: 60ee9be2 ('soundwire: bus: add PM/no-PM versions of read/write functions')
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210122070634.12825-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent a1d9fda2

drivers/soundwire/bus.c

+14 −2
Original line number Diff line number Diff line
@@ -491,6 +491,18 @@ sdw_read_no_pm(struct sdw_slave *slave, u32 addr) 
		return buf;

}



static int sdw_update_no_pm(struct sdw_slave *slave, u32 addr, u8 mask, u8 val)

{

	int tmp;



	tmp = sdw_read_no_pm(slave, addr);

	if (tmp < 0)

		return tmp;



	tmp = (tmp & ~mask) | val;

	return sdw_write_no_pm(slave, addr, tmp);

}



/**

 * sdw_nread() - Read "n" contiguous SDW Slave registers

 * @slave: SDW Slave
@@ -1254,7 +1266,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave) 
	val = slave->prop.scp_int1_mask;



	/* Enable SCP interrupts */

	ret = sdw_update(slave, SDW_SCP_INTMASK1, val, val);

	ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, val, val);

	if (ret < 0) {

		dev_err(slave->bus->dev,

			"SDW_SCP_INTMASK1 write failed:%d\n", ret);
@@ -1269,7 +1281,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave) 
	val = prop->dp0_prop->imp_def_interrupts;

	val |= SDW_DP0_INT_PORT_READY | SDW_DP0_INT_BRA_FAILURE;



	ret = sdw_update(slave, SDW_DP0_INTMASK, val, val);

	ret = sdw_update_no_pm(slave, SDW_DP0_INTMASK, val, val);

	if (ret < 0)

		dev_err(slave->bus->dev,

			"SDW_DP0_INTMASK read failed:%d\n", ret);