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

soundwire: bus: use sdw_write_no_pm when setting the bus scale registers 



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.

This patch fixes the same problem as the previous one, but is split to
make the life of linux-stable maintainers less painful.

Fixes: 29d158f9 ('soundwire: bus: initialize bus clock base and scale registers')
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-3-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -1220,7 +1220,7 @@ static int sdw_slave_set_frequency(struct sdw_slave *slave) 
	}

	scale_index++;



	ret = sdw_write(slave, SDW_SCP_BUS_CLOCK_BASE, base);

	ret = sdw_write_no_pm(slave, SDW_SCP_BUS_CLOCK_BASE, base);

	if (ret < 0) {

		dev_err(&slave->dev,

			"SDW_SCP_BUS_CLOCK_BASE write failed:%d\n", ret);
@@ -1228,13 +1228,13 @@ static int sdw_slave_set_frequency(struct sdw_slave *slave) 
	}



	/* initialize scale for both banks */

	ret = sdw_write(slave, SDW_SCP_BUSCLOCK_SCALE_B0, scale_index);

	ret = sdw_write_no_pm(slave, SDW_SCP_BUSCLOCK_SCALE_B0, scale_index);

	if (ret < 0) {

		dev_err(&slave->dev,

			"SDW_SCP_BUSCLOCK_SCALE_B0 write failed:%d\n", ret);

		return ret;

	}

	ret = sdw_write(slave, SDW_SCP_BUSCLOCK_SCALE_B1, scale_index);

	ret = sdw_write_no_pm(slave, SDW_SCP_BUSCLOCK_SCALE_B1, scale_index);

	if (ret < 0)

		dev_err(&slave->dev,

			"SDW_SCP_BUSCLOCK_SCALE_B1 write failed:%d\n", ret);