soundwire: slave: add first_interrupt_done status

Some Slaves report incorrect information in their interrupt status
registers after a master/bus reset, track the initial interrupt
handling so that quirks can be introduced to filter out incorrect
information while keeping interrupts enabled in steady state.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20200908134521.6781-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 029818b1f5685edb3f164a3dc4f880639d16f43d..30b0bed1663064c41766154ed655043f9195875c 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -1472,6 +1472,9 @@ static int sdw_handle_slave_alerts(struct sdw_slave *slave)
                        goto io_err;
                }
 
+               /* at this point all initial interrupt sources were handled */
+               slave->first_interrupt_done = true;
+
                /*
                 * Read status again to ensure no new interrupts arrived
                 * while servicing interrupts.
@@ -1674,8 +1677,10 @@ void sdw_clear_slave_status(struct sdw_bus *bus, u32 request)
                if (!slave)
                        continue;
 
-               if (slave->status != SDW_SLAVE_UNATTACHED)
+               if (slave->status != SDW_SLAVE_UNATTACHED) {
                        sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED);
+                       slave->first_interrupt_done = false;
+               }
 
                /* keep track of request, used in pm_runtime resume */
                slave->unattach_request = request;

diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c
index 2191dd6e7aa497a5c34b2e84f43e2e530b3017d3..4a250d33de5d0731e351ed286bec934847e5ba6e 100644 (file)
--- a/drivers/soundwire/slave.c
+++ b/drivers/soundwire/slave.c
@@ -58,6 +58,7 @@ static int sdw_slave_add(struct sdw_bus *bus,
        slave->dev_num = 0;
        init_completion(&slave->probe_complete);
        slave->probed = false;
+       slave->first_interrupt_done = false;
 
        for (i = 0; i < SDW_MAX_PORTS; i++)
                init_completion(&slave->port_ready[i]);

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index 9d94cdf6346f4eea86147d9d232098b0749f33c6..2b93a8ef7fad4f8eb6cbc99b97b2f7a84034c003 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -616,6 +616,8 @@ struct sdw_slave_ops {
  * between the Master suspending and the codec resuming, and make sure that
  * when the Master triggered a reset the Slave is properly enumerated and
  * initialized
+ * @first_interrupt_done: status flag tracking if the interrupt handling
+ * for a Slave happens for the first time after enumeration
  */
 struct sdw_slave {
        struct sdw_slave_id id;
@@ -637,6 +639,7 @@ struct sdw_slave {
        struct completion enumeration_complete;
        struct completion initialization_complete;
        u32 unattach_request;
+       bool first_interrupt_done;
 };
 
 #define dev_to_sdw_dev(_dev) container_of(_dev, struct sdw_slave, dev)