10 files changed, 162 insertions, 64 deletions

diff --git a/Documentation/driver-api/soundwire/locking.rst b/Documentation/driver-api/soundwire/locking.rst
index 253f73555255..3a7ffb3d87f3 100644
--- a/Documentation/driver-api/soundwire/locking.rst
+++ b/Documentation/driver-api/soundwire/locking.rst
@@ -44,7 +44,9 @@ Message transfer.
      b. Transfer message (Read/Write) to Slave1 or broadcast message on
         Bus in case of bank switch.
 
-     c. Release Message lock ::
+     c. Release Message lock
+
+     ::
 
         +----------+                    +---------+
         |          |                    |         |
diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index aac35fc3cf22..fe745830a261 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -87,7 +87,7 @@ int sdw_add_bus_master(struct sdw_bus *bus)
 
         /*
          * Initialize clock values based on Master properties. The max
-         * frequency is read from max_freq property. Current assumption
+         * frequency is read from max_clk_freq property. Current assumption
          * is that the bus will start at highest clock frequency when
          * powered on.
          *
@@ -95,7 +95,7 @@ int sdw_add_bus_master(struct sdw_bus *bus)
          * to start with bank 0 (Table 40 of Spec)
          */
         prop = &bus->prop;
-        bus->params.max_dr_freq = prop->max_freq * SDW_DOUBLE_RATE_FACTOR;
+        bus->params.max_dr_freq = prop->max_clk_freq * SDW_DOUBLE_RATE_FACTOR;
         bus->params.curr_dr_freq = bus->params.max_dr_freq;
         bus->params.curr_bank = SDW_BANK0;
         bus->params.next_bank = SDW_BANK1;
@@ -648,7 +648,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
                 return 0;
 
         /* Enable DP0 interrupts */
-        val = prop->dp0_prop->device_interrupts;
+        val = prop->dp0_prop->imp_def_interrupts;
         val |= SDW_DP0_INT_PORT_READY | SDW_DP0_INT_BRA_FAILURE;
 
         ret = sdw_update(slave, SDW_DP0_INTMASK, val, val);
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 682789bb8ab3..ff4badc9b3de 100644
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -9,6 +9,7 @@
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
 #include <linux/soundwire/sdw_registers.h>
@@ -236,19 +237,19 @@ cdns_fill_msg_resp(struct sdw_cdns *cdns,
         for (i = 0; i < count; i++) {
                 if (!(cdns->response_buf[i] & CDNS_MCP_RESP_ACK)) {
                         no_ack = 1;
-                        dev_dbg(cdns->dev, "Msg Ack not received\n");
+                        dev_dbg_ratelimited(cdns->dev, "Msg Ack not received\n");
                         if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) {
                                 nack = 1;
-                                dev_err(cdns->dev, "Msg NACK received\n");
+                                dev_err_ratelimited(cdns->dev, "Msg NACK received\n");
                         }
                 }
         }
 
         if (nack) {
-                dev_err(cdns->dev, "Msg NACKed for Slave %d\n", msg->dev_num);
+                dev_err_ratelimited(cdns->dev, "Msg NACKed for Slave %d\n", msg->dev_num);
                 return SDW_CMD_FAIL;
         } else if (no_ack) {
-                dev_dbg(cdns->dev, "Msg ignored for Slave %d\n", msg->dev_num);
+                dev_dbg_ratelimited(cdns->dev, "Msg ignored for Slave %d\n", msg->dev_num);
                 return SDW_CMD_IGNORED;
         }
 
@@ -356,12 +357,12 @@ cdns_program_scp_addr(struct sdw_cdns *cdns, struct sdw_msg *msg)
 
         /* For NACK, NO ack, don't return err if we are in Broadcast mode */
         if (nack) {
-                dev_err(cdns->dev,
-                        "SCP_addrpage NACKed for Slave %d\n", msg->dev_num);
+                dev_err_ratelimited(cdns->dev,
+                                    "SCP_addrpage NACKed for Slave %d\n", msg->dev_num);
                 return SDW_CMD_FAIL;
         } else if (no_ack) {
-                dev_dbg(cdns->dev,
-                        "SCP_addrpage ignored for Slave %d\n", msg->dev_num);
+                dev_dbg_ratelimited(cdns->dev,
+                                    "SCP_addrpage ignored for Slave %d\n", msg->dev_num);
                 return SDW_CMD_IGNORED;
         }
 
@@ -486,7 +487,8 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
 {
         enum sdw_slave_status status[SDW_MAX_DEVICES + 1];
         bool is_slave = false;
-        u64 slave, mask;
+        u64 slave;
+        u32 mask;
         int i, set_status;
 
         /* combine the two status */
@@ -524,9 +526,9 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
 
                 /* first check if Slave reported multiple status */
                 if (set_status > 1) {
-                        dev_warn(cdns->dev,
-                                 "Slave reported multiple Status: %d\n",
-                                 status[i]);
+                        dev_warn_ratelimited(cdns->dev,
+                                             "Slave reported multiple Status: %d\n",
+                                             mask);
                         /*
                          * TODO: we need to reread the status here by
                          * issuing a PING cmd
@@ -612,7 +614,7 @@ irqreturn_t sdw_cdns_thread(int irq, void *dev_id)
         struct sdw_cdns *cdns = dev_id;
         u32 slave0, slave1;
 
-        dev_dbg(cdns->dev, "Slave status change\n");
+        dev_dbg_ratelimited(cdns->dev, "Slave status change\n");
 
         slave0 = cdns_readl(cdns, CDNS_MCP_SLAVE_INTSTAT0);
         slave1 = cdns_readl(cdns, CDNS_MCP_SLAVE_INTSTAT1);
@@ -716,6 +718,8 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns,
         stream = &cdns->pcm;
 
         /* First two PDIs are reserved for bulk transfers */
+        if (stream->num_bd < CDNS_PCM_PDI_OFFSET)
+                return -EINVAL;
         stream->num_bd -= CDNS_PCM_PDI_OFFSET;
         offset = CDNS_PCM_PDI_OFFSET;
 
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
index 60293a00a14e..317873bc0555 100644
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@ -263,6 +263,9 @@ static void intel_pdi_init(struct sdw_intel *sdw,
         config->pcm_out = (pcm_cap & SDW_SHIM_PCMSCAP_OSS) >>
                                         SDW_REG_SHIFT(SDW_SHIM_PCMSCAP_OSS);
 
+        dev_dbg(sdw->cdns.dev, "PCM cap bd:%d in:%d out:%d\n",
+                config->pcm_bd, config->pcm_in, config->pcm_out);
+
         /* PDM Stream Capability */
         pdm_cap = intel_readw(shim, SDW_SHIM_PDMSCAP(link_id));
 
@@ -272,6 +275,9 @@ static void intel_pdi_init(struct sdw_intel *sdw,
                                         SDW_REG_SHIFT(SDW_SHIM_PDMSCAP_ISS);
         config->pdm_out = (pdm_cap & SDW_SHIM_PDMSCAP_OSS) >>
                                         SDW_REG_SHIFT(SDW_SHIM_PDMSCAP_OSS);
+
+        dev_dbg(sdw->cdns.dev, "PDM cap bd:%d in:%d out:%d\n",
+                config->pdm_bd, config->pdm_in, config->pdm_out);
 }