From 5340bb266ac94eb67a97e6a0a081b34aa032c1c9 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 08:39:36 -0600 Subject: [PATCH 1/6] soundwire: cadence: fix ACK/NAK handling The existing code reports a NAK only when ACK=0 This is not aligned with the SoundWire 1.x specifications. Table 32 in the SoundWire 1.2 specification shows that a Device shall not set NAK=1 if ACK=1. But Table 33 shows the Combined Response may very well be NAK=1/ACK=1, e.g. if another Device than the one addressed reports a parity error. NAK=1 signals a 'Command_Aborted', regardless of the ACK bit value. Move the tests for NAK so that the NAK=1/ACK=1 combination is properly detected according to the specification. Fixes: 956baa1992f9a ('soundwire: cdns: Add sdw_master_ops and IO transfer support') Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/cadence_master.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 9fa55164354a22..580660599f461e 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -484,10 +484,10 @@ cdns_fill_msg_resp(struct sdw_cdns *cdns, 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"); - } + } + if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) { + nack = 1; + dev_err_ratelimited(cdns->dev, "Msg NACK received\n"); } } From cdd7c9c07a59b81862fc309ecb35bea5c0ea12cd Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 08:51:37 -0600 Subject: [PATCH 2/6] soundwire: cadence: adjust verbosity in response handling There are too many logs on startup, e.g. [ 8811.851497] cdns_fill_msg_resp: 2 callbacks suppressed [ 8811.851497] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851498] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851499] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851499] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851500] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851500] intel-sdw intel-sdw.0: Msg Ack not received [ 8811.851502] intel-sdw intel-sdw.0: Msg ignored for Slave 0 [ 8811.851503] soundwire sdw-master-0: No more devices to enumerate We can skip the 'Msg Ack not received' since it's typical of the enumeration end, and conversely add the information on which command fails. Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/cadence_master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 580660599f461e..fcf18827f2ca7a 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -483,11 +483,11 @@ 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"); + 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_ratelimited(cdns->dev, "Msg NACK received\n"); + dev_err_ratelimited(cdns->dev, "Msg NACK received, cmd %d\n", i); } } From 01878efd911e24f086dff0e448d3790f83a5a00a Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 09:56:43 -0600 Subject: [PATCH 3/6] [HACK] soundwire: intel: add traces to see when sync_go ends We want to make sure the transactions don't start immediately and that Slave events are not reported too early. Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/intel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 6a1e862b16c38c..b3a5bf557c6456 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -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; } @@ -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); @@ -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"); @@ -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"); @@ -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"); From b20932d3af511901f446e44618f416232c9bdc79 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 10:55:16 -0600 Subject: [PATCH 4/6] [HACK] soundwire: cadence: remove _ratelimited Make sure we see ALL events for debug. Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/cadence_master.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index fcf18827f2ca7a..5fbcd0b3f0dd4f 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -487,17 +487,17 @@ cdns_fill_msg_resp(struct sdw_cdns *cdns, } if (cdns->response_buf[i] & CDNS_MCP_RESP_NACK) { nack = 1; - dev_err_ratelimited(cdns->dev, "Msg NACK received, cmd %d\n", i); + 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; } @@ -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; } @@ -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); @@ -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]); @@ -855,12 +855,12 @@ 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) { @@ -868,7 +868,7 @@ irqreturn_t sdw_cdns_irq(int irq, void *dev_id) * 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 && @@ -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 */ @@ -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); From c1060ee52b00b359dedaf3167d2fe95b2a6f74f3 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 19:14:48 -0600 Subject: [PATCH 5/6] [HACK] soundwire: bus: add more traces to debug sync loss Something goes wrong when a device loses sync Signed-off-by: Pierre-Louis Bossart --- drivers/soundwire/bus.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 7d07cacef74016..e0b4c4b4b7d628 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -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); @@ -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 @@ -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) { @@ -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; @@ -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, From b66428cc56c7052f43ab30adbfd5e21d89c4334b Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Tue, 10 Nov 2020 19:18:59 -0600 Subject: [PATCH 6/6] [HACK] ASoC: max98373-sdw: add traces to debug bus clash Not sure what happens, add code to get a trace Signed-off-by: Pierre-Louis Bossart --- sound/soc/codecs/max98373-sdw.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c index ec2e79c5735772..0f8dd1b5616827 100644 --- a/sound/soc/codecs/max98373-sdw.c +++ b/sound/soc/codecs/max98373-sdw.c @@ -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);