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>, Rander Wang <rander.wang@intel.com>, Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>, Sanyog Kale <sanyog.r.kale@intel.com> Subject: [PATCH v2 06/17] soundwire: cadence: fix a io timeout issue in S3 test Date: Tue, 17 Mar 2020 11:33:18 -0500 [thread overview] Message-ID: <20200317163329.25501-7-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200317163329.25501-1-pierre-louis.bossart@linux.intel.com> From: Rander Wang <rander.wang@intel.com> After system resumes from S3, io timeout occurs when setting one unused master on Comet Lake platform. In this case, the master is reset to default state, and FIFOLEVEL is reset to default value, but msg_count used for tracing FIFOLEVEL is still with old value, so FIFOLEVEL will not be set if a new msg FIFO usage is equal to the old msg_count. This patch updates msg_count to default value of FIFOLEVEL when resetting master. Tested on Comet Lake platform. Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index dc29556eaf94..37e16199933c 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1068,6 +1068,9 @@ int sdw_cdns_init(struct sdw_cdns *cdns) cdns_writel(cdns, CDNS_MCP_SSP_CTRL0, CDNS_DEFAULT_SSP_INTERVAL); cdns_writel(cdns, CDNS_MCP_SSP_CTRL1, CDNS_DEFAULT_SSP_INTERVAL); + /* reset msg_count to default value of FIFOLEVEL */ + cdns->msg_count = cdns_readl(cdns, CDNS_MCP_FIFOLEVEL); + /* flush command FIFOs */ cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CMD_RST, CDNS_MCP_CONTROL_CMD_RST); -- 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>, Rander Wang <rander.wang@intel.com>, Bard liao <yung-chuan.liao@linux.intel.com>, Rander Wang <rander.wang@linux.intel.com> Subject: [PATCH v2 06/17] soundwire: cadence: fix a io timeout issue in S3 test Date: Tue, 17 Mar 2020 11:33:18 -0500 [thread overview] Message-ID: <20200317163329.25501-7-pierre-louis.bossart@linux.intel.com> (raw) In-Reply-To: <20200317163329.25501-1-pierre-louis.bossart@linux.intel.com> From: Rander Wang <rander.wang@intel.com> After system resumes from S3, io timeout occurs when setting one unused master on Comet Lake platform. In this case, the master is reset to default state, and FIFOLEVEL is reset to default value, but msg_count used for tracing FIFOLEVEL is still with old value, so FIFOLEVEL will not be set if a new msg FIFO usage is equal to the old msg_count. This patch updates msg_count to default value of FIFOLEVEL when resetting master. Tested on Comet Lake platform. Signed-off-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> --- drivers/soundwire/cadence_master.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index dc29556eaf94..37e16199933c 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1068,6 +1068,9 @@ int sdw_cdns_init(struct sdw_cdns *cdns) cdns_writel(cdns, CDNS_MCP_SSP_CTRL0, CDNS_DEFAULT_SSP_INTERVAL); cdns_writel(cdns, CDNS_MCP_SSP_CTRL1, CDNS_DEFAULT_SSP_INTERVAL); + /* reset msg_count to default value of FIFOLEVEL */ + cdns->msg_count = cdns_readl(cdns, CDNS_MCP_FIFOLEVEL); + /* flush command FIFOs */ cdns_updatel(cdns, CDNS_MCP_CONTROL, CDNS_MCP_CONTROL_CMD_RST, CDNS_MCP_CONTROL_CMD_RST); -- 2.20.1
next prev parent reply other threads:[~2020-03-17 16:35 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 ` Pierre-Louis Bossart [this message] 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 ` [PATCH v2 07/17] soundwire: cadence: mask Slave interrupt before stopping clock Pierre-Louis Bossart 2020-03-17 16:33 ` 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-7-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@intel.com \ --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.