soundwire: cadence: use directly bus sdw_defer structure

Copying the bus sdw_defer structure into the Cadence internals leads
to using stale pointers and kernel oopses on errors. It's just simpler
and safer to use the bus sdw_defer structure directly.

Link: https://github.com/thesofproject/linux/issues/4056
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230119073211.85979-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 9eb54dcbe0357f509becbc64903760246ec9f121..29d644bb4020118a084e6a874bcb3ad7f8e01110 100644 (file)
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -237,7 +237,7 @@ static inline int do_transfer_defer(struct sdw_bus *bus,
        init_completion(&defer->complete);
 
        for (i = 0; i <= retry; i++) {
-               resp = bus->ops->xfer_msg_defer(bus, msg, defer);
+               resp = bus->ops->xfer_msg_defer(bus, msg);
                ret = find_response_code(resp);
                /* if cmd is ok or ignored return */
                if (ret == 0 || ret == -ENODATA)

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index f44e8f9a1c098ec8fe7cb25ed360fd79f9f35bab..65fcb28c8f5824331c139d05220452b1267f0e12 100644 (file)
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -750,7 +750,7 @@ EXPORT_SYMBOL(cdns_xfer_msg);
 
 enum sdw_command_response
 cdns_xfer_msg_defer(struct sdw_bus *bus,
-                   struct sdw_msg *msg, struct sdw_defer *defer)
+                   struct sdw_msg *msg)
 {
        struct sdw_cdns *cdns = bus_to_cdns(bus);
        int cmd = 0, ret;
@@ -763,9 +763,6 @@ cdns_xfer_msg_defer(struct sdw_bus *bus,
        if (ret)
                return SDW_CMD_FAIL_OTHER;
 
-       cdns->defer = defer;
-       cdns->defer->length = msg->len;
-
        return _cdns_xfer_msg(cdns, msg, cmd, 0, msg->len, true);
 }
 EXPORT_SYMBOL(cdns_xfer_msg_defer);
@@ -879,13 +876,15 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)
                return IRQ_NONE;
 
        if (int_status & CDNS_MCP_INT_RX_WL) {
+               struct sdw_bus *bus = &cdns->bus;
+               struct sdw_defer *defer = &bus->defer_msg;
+
                cdns_read_response(cdns);
 
-               if (cdns->defer) {
-                       cdns_fill_msg_resp(cdns, cdns->defer->msg,
-                                          cdns->defer->length, 0);
-                       complete(&cdns->defer->complete);
-                       cdns->defer = NULL;
+               if (defer && defer->msg) {
+                       cdns_fill_msg_resp(cdns, defer->msg,
+                                          defer->length, 0);
+                       complete(&defer->complete);
                } else {
                        complete(&cdns->tx_complete);
                }

diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h
index 2efc857d21aa32e8893ec812bc70a4ce49093682..90289a3dd505751fd53dfda5d08023d40ac009c4 100644 (file)
--- a/drivers/soundwire/cadence_master.h
+++ b/drivers/soundwire/cadence_master.h
@@ -109,7 +109,6 @@ struct sdw_cdns_dai_runtime {
  * @instance: instance number
  * @response_buf: SoundWire response buffer
  * @tx_complete: Tx completion
- * @defer: Defer pointer
  * @ports: Data ports
  * @num_ports: Total number of data ports
  * @pcm: PCM streams
@@ -130,7 +129,6 @@ struct sdw_cdns {
        u32 response_buf[CDNS_MCP_IP_MAX_CMD_LEN + 2];
 
        struct completion tx_complete;
-       struct sdw_defer *defer;
 
        struct sdw_cdns_port *ports;
        int num_ports;
@@ -186,8 +184,7 @@ enum sdw_command_response
 cdns_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg);
 
 enum sdw_command_response
-cdns_xfer_msg_defer(struct sdw_bus *bus,
-                   struct sdw_msg *msg, struct sdw_defer *defer);
+cdns_xfer_msg_defer(struct sdw_bus *bus, struct sdw_msg *msg);
 
 u32 cdns_read_ping_status(struct sdw_bus *bus);
 

diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h
index a8d74635ea0de31fb10ec1ebb062e87546eabe2a..9e5fc03072845189299693a110af5cf032dcdc2e 100644 (file)
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@ -851,8 +851,7 @@ struct sdw_master_ops {
        enum sdw_command_response (*xfer_msg)
                        (struct sdw_bus *bus, struct sdw_msg *msg);
        enum sdw_command_response (*xfer_msg_defer)
-                       (struct sdw_bus *bus, struct sdw_msg *msg,
-                       struct sdw_defer *defer);
+                       (struct sdw_bus *bus, struct sdw_msg *msg);
        int (*set_bus_conf)(struct sdw_bus *bus,
                        struct sdw_bus_params *params);
        int (*pre_bank_switch)(struct sdw_bus *bus);