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

soundwire: bus: only clear valid DPN interrupts 



Mirror the changes made for DP0 and don't modify reserved fields.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20201124013318.8963-6-yung-chuan.liao@linux.intel.com


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

drivers/soundwire/bus.c

+5 −3
Original line number Diff line number Diff line
@@ -1353,7 +1353,7 @@ static int sdw_handle_dp0_interrupt(struct sdw_slave *slave, u8 *slave_status) 
static int sdw_handle_port_interrupt(struct sdw_slave *slave,

				     int port, u8 *slave_status)

{

	u8 clear = 0, impl_int_mask;

	u8 clear, impl_int_mask;

	int status, status2, ret, count = 0;

	u32 addr;
@@ -1370,6 +1370,8 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, 
	}



	do {

		clear = status & ~SDW_DPN_INTERRUPTS;



		if (status & SDW_DPN_INT_TEST_FAIL) {

			dev_err(&slave->dev, "Test fail for port:%d\n", port);

			clear |= SDW_DPN_INT_TEST_FAIL;
@@ -1392,7 +1394,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, 
			*slave_status = clear;

		}



		/* clear the interrupt */

		/* clear the interrupt but don't touch reserved fields */

		ret = sdw_write(slave, addr, clear);

		if (ret < 0) {

			dev_err(slave->bus->dev,
@@ -1413,7 +1415,7 @@ static int sdw_handle_port_interrupt(struct sdw_slave *slave, 
		count++;



		/* we can get alerts while processing so keep retrying */

	} while (status != 0 && count < SDW_READ_INTR_CLEAR_RETRY);

	} while ((status & SDW_DPN_INTERRUPTS) && (count < SDW_READ_INTR_CLEAR_RETRY));



	if (count == SDW_READ_INTR_CLEAR_RETRY)

		dev_warn(slave->bus->dev, "Reached MAX_RETRY on port read");