Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions drivers/soundwire/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave,

mutex_lock(&bus->bus_lock);

dev_vdbg(bus->dev,
dev_dbg(bus->dev,
"%s: changing status slave %d status %d new status %d\n",
__func__, slave->dev_num, slave->status, status);

Expand Down Expand Up @@ -1647,6 +1647,8 @@ static int sdw_update_slave_status(struct sdw_slave *slave,
{
unsigned long time;

dev_dbg(&slave->dev, "%s: status %d\n", __func__, status);

if (!slave->probed) {
/*
* the slave status update is typically handled in an
Expand Down Expand Up @@ -1697,8 +1699,10 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
continue;

if (status[i] == SDW_SLAVE_UNATTACHED &&
slave->status != SDW_SLAVE_UNATTACHED)
slave->status != SDW_SLAVE_UNATTACHED) {
dev_err(bus->dev, "device %d became UNATTACHED\n", i);
sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED);
}
}

if (status[0] == SDW_SLAVE_ATTACHED) {
Expand Down Expand Up @@ -1730,9 +1734,12 @@ int sdw_handle_slave_status(struct sdw_bus *bus,

switch (status[i]) {
case SDW_SLAVE_UNATTACHED:
if (slave->status == SDW_SLAVE_UNATTACHED)
if (slave->status == SDW_SLAVE_UNATTACHED) {
dev_err(bus->dev, "Handling unattached device %d, step 1\n", i);
break;
}

dev_err(bus->dev, "Handling unattached device %d, step 2\n", i);
sdw_modify_slave_status(slave, SDW_SLAVE_UNATTACHED);
break;

Expand Down Expand Up @@ -1770,6 +1777,7 @@ int sdw_handle_slave_status(struct sdw_bus *bus,
break;
}

dev_dbg(bus->dev, "Updating status for device %d\n", i);
ret = sdw_update_slave_status(slave, status[i]);
if (ret)
dev_err(&slave->dev,
Expand Down
32 changes: 16 additions & 16 deletions drivers/soundwire/cadence_master.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,21 +483,21 @@ 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_ratelimited(cdns->dev, "Msg Ack not received\n");
if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) {
nack = 1;
dev_err_ratelimited(cdns->dev, "Msg NACK received\n");
}
dev_vdbg(cdns->dev, "Msg Ack not received, cmd %d\n", i);
}
if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) {
nack = 1;
dev_err(cdns->dev, "Msg NACK received, cmd %d\n", i);
}
}

if (nack) {
dev_err_ratelimited(cdns->dev, "Msg NACKed for Slave %d\n", msg->dev_num);
dev_err(cdns->dev, "Msg NACKed for Slave %d\n", msg->dev_num);
return SDW_CMD_FAIL;
}

if (no_ack) {
dev_dbg_ratelimited(cdns->dev, "Msg ignored for Slave %d\n", msg->dev_num);
dev_dbg(cdns->dev, "Msg ignored for Slave %d\n", msg->dev_num);
return SDW_CMD_IGNORED;
}

Expand Down Expand Up @@ -606,13 +606,13 @@ 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_ratelimited(cdns->dev,
dev_err(cdns->dev,
"SCP_addrpage NACKed for Slave %d\n", msg->dev_num);
return SDW_CMD_FAIL;
}

if (no_ack) {
dev_dbg_ratelimited(cdns->dev,
dev_dbg(cdns->dev,
"SCP_addrpage ignored for Slave %d\n", msg->dev_num);
return SDW_CMD_IGNORED;
}
Expand Down Expand Up @@ -779,7 +779,7 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
if (set_status > 1) {
u32 val;

dev_warn_ratelimited(cdns->dev,
dev_warn(cdns->dev,
"Slave %d reported multiple Status: %d\n",
i, mask);

Expand All @@ -803,7 +803,7 @@ static int cdns_update_slave_status(struct sdw_cdns *cdns,
break;
}

dev_warn_ratelimited(cdns->dev,
dev_warn(cdns->dev,
"Slave %d status updated to %d\n",
i, status[i]);

Expand Down Expand Up @@ -855,20 +855,20 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)

if (int_status & CDNS_MCP_INT_PARITY) {
/* Parity error detected by Master */
dev_err_ratelimited(cdns->dev, "Parity error\n");
dev_err(cdns->dev, "Parity error\n");
}

if (int_status & CDNS_MCP_INT_CTRL_CLASH) {
/* Slave is driving bit slot during control word */
dev_err_ratelimited(cdns->dev, "Bus clash for control word\n");
dev_err(cdns->dev, "Bus clash for control word\n");
}

if (int_status & CDNS_MCP_INT_DATA_CLASH) {
/*
* Multiple slaves trying to drive bit slot, or issue with
* ownership of data bits or Slave gone bonkers
*/
dev_err_ratelimited(cdns->dev, "Bus clash for data word\n");
dev_err(cdns->dev, "Bus clash for data word\n");
}

if (cdns->bus.params.m_data_mode != SDW_PORT_DATA_MODE_NORMAL &&
Expand All @@ -877,7 +877,7 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id)

/* just log which ports report an error */
port_intstat = cdns_readl(cdns, CDNS_MCP_PORT_INTSTAT);
dev_err_ratelimited(cdns->dev, "DP interrupt: PortIntStat %8x\n",
dev_err(cdns->dev, "DP interrupt: PortIntStat %8x\n",
port_intstat);

/* clear status w/ write1 */
Expand Down Expand Up @@ -919,7 +919,7 @@ static void cdns_update_slave_status_work(struct work_struct *work)
container_of(work, struct sdw_cdns, work);
u32 slave0, slave1;

dev_dbg_ratelimited(cdns->dev, "Slave status change\n");
dev_dbg(cdns->dev, "Slave status change\n");

slave0 = cdns_readl(cdns, CDNS_MCP_SLAVE_INTSTAT0);
slave1 = cdns_readl(cdns, CDNS_MCP_SLAVE_INTSTAT1);
Expand Down
6 changes: 6 additions & 0 deletions drivers/soundwire/intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,8 @@ static int intel_shim_sync_go_unlocked(struct sdw_intel *sdw)
if (ret < 0)
dev_err(sdw->cdns.dev, "SyncGO clear failed: %d\n", ret);

dev_dbg(sdw->cdns.dev, "sync go done\n");

return ret;
}

Expand Down Expand Up @@ -1456,6 +1458,7 @@ int intel_master_startup(struct platform_device *pdev)
}

if (multi_link) {
dev_dbg(dev, "startup sync go start\n");
ret = intel_shim_sync_go(sdw);
if (ret < 0) {
dev_err(dev, "sync go failed: %d\n", ret);
Expand Down Expand Up @@ -1774,6 +1777,7 @@ static int __maybe_unused intel_resume(struct device *dev)
}

if (multi_link) {
dev_dbg(dev, "system resume sync go start\n");
ret = intel_shim_sync_go(sdw);
if (ret < 0) {
dev_err(dev, "sync go failed during resume\n");
Expand Down Expand Up @@ -1858,6 +1862,7 @@ static int intel_resume_runtime(struct device *dev)
}

if (multi_link) {
dev_dbg(dev, "pm_runtime resume sync go start\n");
ret = intel_shim_sync_go(sdw);
if (ret < 0) {
dev_err(dev, "sync go failed during resume\n");
Expand Down Expand Up @@ -1930,6 +1935,7 @@ static int intel_resume_runtime(struct device *dev)
}

if (multi_link) {
dev_dbg(dev, "pm_runtime bus_reset resume sync go start\n");
ret = intel_shim_sync_go(sdw);
if (ret < 0) {
dev_err(sdw->cdns.dev, "sync go failed during resume\n");
Expand Down
8 changes: 7 additions & 1 deletion sound/soc/codecs/max98373-sdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -789,14 +789,20 @@ static int max98373_update_status(struct sdw_slave *slave,
{
struct max98373_priv *max98373 = dev_get_drvdata(&slave->dev);

dev_dbg(&slave->dev, "%s: start\n", __func__);

if (status == SDW_SLAVE_UNATTACHED)
max98373->hw_init = false;

/*
* Perform initialization only if slave status is SDW_SLAVE_ATTACHED
*/
if (max98373->hw_init || status != SDW_SLAVE_ATTACHED)
if (max98373->hw_init || status != SDW_SLAVE_ATTACHED) {
dev_dbg(&slave->dev, "%s: no io_init\n", __func__);
return 0;
}

dev_dbg(&slave->dev, "%s: calling io_init\n", __func__);

/* perform I/O transfers required for Slave initialization */
return max98373_io_init(slave);
Expand Down