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

soundwire: cadence: revisit parity injection 



We want to wait for the CONFIG_UPDATE bit to clear before doing
something else.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230518024119.164160-4-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/cadence_master.c

+10 −9
Original line number Diff line number Diff line
@@ -456,9 +456,9 @@ static int cdns_parity_error_injection(void *data, u64 value) 
			CDNS_IP_MCP_CMDCTRL_INSERT_PARITY_ERR);



	/* commit changes */

	cdns_updatel(cdns, CDNS_MCP_CONFIG_UPDATE,

		     CDNS_MCP_CONFIG_UPDATE_BIT,

		     CDNS_MCP_CONFIG_UPDATE_BIT);

	ret = cdns_clear_bit(cdns, CDNS_MCP_CONFIG_UPDATE, CDNS_MCP_CONFIG_UPDATE_BIT);

	if (ret < 0)

		goto unlock;



	/* do a broadcast dummy read to avoid bus clashes */

	ret = sdw_bread_no_pm_unlocked(&cdns->bus, 0xf, SDW_SCP_DEVID_0);
@@ -470,16 +470,17 @@ static int cdns_parity_error_injection(void *data, u64 value) 
			0);



	/* commit changes */

	cdns_updatel(cdns, CDNS_MCP_CONFIG_UPDATE,

		     CDNS_MCP_CONFIG_UPDATE_BIT,

		     CDNS_MCP_CONFIG_UPDATE_BIT);



	/* Continue bus operation with parity error injection disabled */

	mutex_unlock(&bus->bus_lock);

	ret = cdns_clear_bit(cdns, CDNS_MCP_CONFIG_UPDATE, CDNS_MCP_CONFIG_UPDATE_BIT);

	if (ret < 0)

		goto unlock;



	/* Userspace changed the hardware state behind the kernel's back */

	add_taint(TAINT_USER, LOCKDEP_STILL_OK);



unlock:

	/* Continue bus operation with parity error injection disabled */

	mutex_unlock(&bus->bus_lock);



	/*

	 * allow Master device to enter pm_runtime suspend. This may

	 * also result in Slave devices suspending.