From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org, vkoul@kernel.org, gregkh@linuxfoundation.org, jank@cadence.com, srinivas.kandagatla@linaro.org, slawomir.blauciak@intel.com, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com>, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Hui Wang <hui.wang@canonical.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Sanyog Kale <sanyog.r.kale@intel.com> Subject: [PATCH v2 07/17] soundwire: cadence: mask Slave interrupt before stopping clock Date: Tue, 17 Mar 2020 11:33:19 -0500 [thread overview] Message-ID: <20200317163329.25501-8-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200317163329.25501-1-pierre-louis.bossart@linux.intel.com> Intel QA reported a very rare case, possibly hardware-dependent, where a Slave can become UNATTACHED during a clock stop sequence, which leads to timeouts and failed suspend sequences. This patch suppresses the handling of all Slave events while this transition happens. The two cases that matter are: a) alerts: if the Slave wants to signal an alert condition, it can do so using the in-band wake, so there's almost no impact with this patch. b) sync loss or imp-def reset: in those cases, bringing back the Slave to functional state requires a complete re-enumeration. It's better to just ignore this case and restart cleanly, rather than attempt a 'clean' suspend. Validation results show the timeouts no longer visible with this patch. GitHub issue: https://github.com/thesofproject/linux/issues/1678 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 37e16199933c..613c63359413 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -865,6 +865,24 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns) } EXPORT_SYMBOL(sdw_cdns_exit_reset); +/** + * sdw_cdns_enable_slave_interrupt() - Enable SDW slave interrupts + * @cdns: Cadence instance + * @state: boolean for true/false + */ +static void cdns_enable_slave_interrupts(struct sdw_cdns *cdns, bool state) +{ + u32 mask; + + mask = cdns_readl(cdns, CDNS_MCP_INTMASK); + if (state) + mask |= CDNS_MCP_INT_SLAVE_MASK; + else + mask &= ~CDNS_MCP_INT_SLAVE_MASK; + + cdns_writel(cdns, CDNS_MCP_INTMASK, mask); +} + /** * sdw_cdns_enable_interrupt() - Enable SDW interrupts * @cdns: Cadence instance @@ -1262,6 +1280,13 @@ int sdw_cdns_clock_stop(struct sdw_cdns *cdns, bool block_wake) return 0; } + /* + * Before entering clock stop we mask the Slave + * interrupts. This helps avoid having to deal with e.g. a + * Slave becoming UNATTACHED while the clock is being stopped + */ + cdns_enable_slave_interrupts(cdns, false); + /* * For specific platforms, it is required to be able to put * master into a state in which it ignores wake-up trials @@ -1339,6 +1364,9 @@ int sdw_cdns_clock_restart(struct sdw_cdns *cdns, bool bus_reset) { int ret; + /* unmask Slave interrupts that were masked when stopping the clock */ + cdns_enable_slave_interrupts(cdns, true); + ret = cdns_clear_bit(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CLK_STOP_CLR); if (ret < 0) { -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> To: alsa-devel@alsa-project.org Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, tiwai@suse.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Ranjani Sridharan <ranjani.sridharan@linux.intel.com>, Hui Wang <hui.wang@canonical.com>, vkoul@kernel.org, broonie@kernel.org, srinivas.kandagatla@linaro.org, jank@cadence.com, slawomir.blauciak@intel.com, Sanyog Kale <sanyog.r.kale@intel.com>, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com> Subject: [PATCH v2 07/17] soundwire: cadence: mask Slave interrupt before stopping clock Date: Tue, 17 Mar 2020 11:33:19 -0500 [thread overview] Message-ID: <20200317163329.25501-8-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200317163329.25501-1-pierre-louis.bossart@linux.intel.com> Intel QA reported a very rare case, possibly hardware-dependent, where a Slave can become UNATTACHED during a clock stop sequence, which leads to timeouts and failed suspend sequences. This patch suppresses the handling of all Slave events while this transition happens. The two cases that matter are: a) alerts: if the Slave wants to signal an alert condition, it can do so using the in-band wake, so there's almost no impact with this patch. b) sync loss or imp-def reset: in those cases, bringing back the Slave to functional state requires a complete re-enumeration. It's better to just ignore this case and restart cleanly, rather than attempt a 'clean' suspend. Validation results show the timeouts no longer visible with this patch. GitHub issue: https://github.com/thesofproject/linux/issues/1678 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 37e16199933c..613c63359413 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -865,6 +865,24 @@ int sdw_cdns_exit_reset(struct sdw_cdns *cdns) } EXPORT_SYMBOL(sdw_cdns_exit_reset); +/** + * sdw_cdns_enable_slave_interrupt() - Enable SDW slave interrupts + * @cdns: Cadence instance + * @state: boolean for true/false + */ +static void cdns_enable_slave_interrupts(struct sdw_cdns *cdns, bool state) +{ + u32 mask; + + mask = cdns_readl(cdns, CDNS_MCP_INTMASK); + if (state) + mask |= CDNS_MCP_INT_SLAVE_MASK; + else + mask &= ~CDNS_MCP_INT_SLAVE_MASK; + + cdns_writel(cdns, CDNS_MCP_INTMASK, mask); +} + /** * sdw_cdns_enable_interrupt() - Enable SDW interrupts * @cdns: Cadence instance @@ -1262,6 +1280,13 @@ int sdw_cdns_clock_stop(struct sdw_cdns *cdns, bool block_wake) return 0; } + /* + * Before entering clock stop we mask the Slave + * interrupts. This helps avoid having to deal with e.g. a + * Slave becoming UNATTACHED while the clock is being stopped + */ + cdns_enable_slave_interrupts(cdns, false); + /* * For specific platforms, it is required to be able to put * master into a state in which it ignores wake-up trials @@ -1339,6 +1364,9 @@ int sdw_cdns_clock_restart(struct sdw_cdns *cdns, bool bus_reset) { int ret; + /* unmask Slave interrupts that were masked when stopping the clock */ + cdns_enable_slave_interrupts(cdns, true); + ret = cdns_clear_bit(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CLK_STOP_CLR); if (ret < 0) { -- 2.20.1
next prev parent reply other threads:[~2020-03-17 16:34 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-17 16:33 [PATCH v2 00/17] SoundWire: cadence: add clock stop and fix programming sequences Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 01/17] soundwire: cadence: s/update_config/config_update Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 02/17] soundwire: cadence: simplifiy cdns_init() Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 03/17] soundwire: cadence: add interface to check clock status Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 04/17] soundwire: cadence: handle error cases with CONFIG_UPDATE Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 05/17] soundwire: cadence: add clock_stop/restart routines Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 06/17] soundwire: cadence: fix a io timeout issue in S3 test Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart [this message] 2020-03-17 16:33 ` [PATCH v2 07/17] soundwire: cadence: mask Slave interrupt before stopping clock Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 08/17] soundwire: cadence: merge routines to clear/set bits Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 09/17] soundwire: cadence: move clock/SSP related inits to dedicated function Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 10/17] soundwire: cadence: make SSP interval programmable Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 11/17] soundwire: cadence: reorder MCP_CONFIG settings Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 12/17] soundwire: cadence: enable NORMAL operation in cdns_init() Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 13/17] soundwire: cadence: remove PREQ_DELAY assignment Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 14/17] soundwire: cadence: remove automatic command retries Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 15/17] soundwire: cadence: commit changes in the exit_reset() sequence Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 16/17] soundwire: cadence: multi-link support Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-17 16:33 ` [PATCH v2 17/17] soundwire: cadence: clear FIFO to avoid pop noise issue on playback start Pierre-Louis Bossart 2020-03-17 16:33 ` Pierre-Louis Bossart 2020-03-19 7:13 ` [PATCH v2 00/17] SoundWire: cadence: add clock stop and fix programming sequences Vinod Koul 2020-03-19 7:13 ` Vinod Koul
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200317163329.25501-8-pierre-louis.bossart@linux.intel.com \ --to=pierre-louis.bossart@linux.intel.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=hui.wang@canonical.com \ --cc=jank@cadence.com \ --cc=linux-kernel@vger.kernel.org \ --cc=rander.wang@linux.intel.com \ --cc=ranjani.sridharan@linux.intel.com \ --cc=sanyog.r.kale@intel.com \ --cc=slawomir.blauciak@intel.com \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.de \ --cc=vkoul@kernel.org \ --cc=yung-chuan.liao@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.