alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Bard Liao <yung-chuan.liao@linux.intel.com>
To: alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: pierre-louis.bossart@linux.intel.com, vinod.koul@linaro.org,
	tiwai@suse.de, gregkh@linuxfoundation.org,
	linux-kernel@vger.kernel.org, ranjani.sridharan@linux.intel.com,
	hui.wang@canonical.com, broonie@kernel.org,
	srinivas.kandagatla@linaro.org, jank@cadence.com,
	mengdong.lin@intel.com, sanyog.r.kale@intel.com,
	rander.wang@linux.intel.com, bard.liao@intel.com
Subject: [PATCH 08/11] soundwire: stream: enable hw_sync as needed by hardware
Date: Tue, 18 Aug 2020 10:41:17 +0800	[thread overview]
Message-ID: <20200818024120.20721-9-yung-chuan.liao@linux.intel.com> (raw)
In-Reply-To: <20200818024120.20721-1-yung-chuan.liao@linux.intel.com>

From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Use platform-specific information to decide when to use hw_sync, not
only a number of links > 1.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
---
 drivers/soundwire/stream.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 37290a799023..e4cf484f5905 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -689,9 +689,9 @@ static int sdw_bank_switch(struct sdw_bus *bus, int m_rt_count)
 
 	/*
 	 * Set the multi_link flag only when both the hardware supports
-	 * and there is a stream handled by multiple masters
+	 * and hardware-based sync is required
 	 */
-	multi_link = bus->multi_link && (m_rt_count > 1);
+	multi_link = bus->multi_link && (m_rt_count >= bus->hw_sync_min_links);
 
 	if (multi_link)
 		ret = sdw_transfer_defer(bus, wr_msg, &bus->defer_msg);
@@ -760,13 +760,16 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
 	const struct sdw_master_ops *ops;
 	struct sdw_bus *bus;
 	bool multi_link = false;
+	int m_rt_count;
 	int ret = 0;
 
+	m_rt_count = stream->m_rt_count;
+
 	list_for_each_entry(m_rt, &stream->master_list, stream_node) {
 		bus = m_rt->bus;
 		ops = bus->ops;
 
-		if (bus->multi_link) {
+		if (bus->multi_link && m_rt_count >= bus->hw_sync_min_links) {
 			multi_link = true;
 			mutex_lock(&bus->msg_lock);
 		}
@@ -787,7 +790,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
 		 * synchronized across all Masters and happens later as a
 		 * part of post_bank_switch ops.
 		 */
-		ret = sdw_bank_switch(bus, stream->m_rt_count);
+		ret = sdw_bank_switch(bus, m_rt_count);
 		if (ret < 0) {
 			dev_err(bus->dev, "Bank switch failed: %d\n", ret);
 			goto error;
@@ -813,7 +816,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
 					ret);
 				goto error;
 			}
-		} else if (bus->multi_link && stream->m_rt_count > 1) {
+		} else if (multi_link) {
 			dev_err(bus->dev,
 				"Post bank switch ops not implemented\n");
 			goto error;
@@ -831,7 +834,7 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
 			goto error;
 		}
 
-		if (bus->multi_link)
+		if (multi_link)
 			mutex_unlock(&bus->msg_lock);
 	}
 
-- 
2.17.1


  parent reply	other threads:[~2020-08-18 14:41 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-18  2:41 [PATCH 00/11] soundwire: intel: add multi-link support Bard Liao
2020-08-18  2:41 ` [PATCH 01/11] soundwire: intel: disable shim wake on suspend Bard Liao
2020-08-18  2:41 ` [PATCH 02/11] soundwire: intel: ignore software command retries Bard Liao
2020-08-18  2:41 ` [PATCH 03/11] soundwire: intel: add multi-link support Bard Liao
2020-08-18  2:41 ` [PATCH 04/11] soundwire: intel: add missing support for all clock stop modes Bard Liao
2020-08-18  2:41 ` [PATCH 05/11] soundwire: bus: update multi-link definition with hw sync details Bard Liao
2020-08-26  9:44   ` Vinod Koul
2020-08-26 14:09     ` Pierre-Louis Bossart
2020-08-28  7:27       ` Vinod Koul
2020-08-18  2:41 ` [PATCH 06/11] soundwire: intel: add multi-link hw_synchronization information Bard Liao
2020-08-18  2:41 ` [PATCH 07/11] soundwire: intel: Only call sdw stream APIs for the first cpu_dai Bard Liao
2020-08-26  9:46   ` Vinod Koul
2020-08-26 14:35     ` Pierre-Louis Bossart
2020-08-28  7:49       ` Vinod Koul
2020-08-28  1:47     ` Liao, Bard
2020-08-28  7:45       ` Vinod Koul
2020-08-28 15:07         ` Pierre-Louis Bossart
2020-08-18  2:41 ` Bard Liao [this message]
2020-08-18  2:41 ` [PATCH 09/11] soundwire: intel: add dynamic debug trace for clock-stop invalid configs Bard Liao
2020-08-26  9:48   ` Vinod Koul
2020-08-26 14:38     ` Pierre-Louis Bossart
2020-08-28  7:49       ` Vinod Koul
2020-08-28 14:54         ` Pierre-Louis Bossart
2020-08-29 11:00   ` Vinod Koul
2020-08-31 15:15     ` Pierre-Louis Bossart
2020-09-01 11:07       ` Vinod Koul
2020-09-01 13:31         ` Pierre-Louis Bossart
2020-08-18  2:41 ` [PATCH 10/11] soundwire: intel: pass link_mask information to each master Bard Liao
2020-08-18  2:41 ` [PATCH 11/11] soundwire: intel: don't manage link power individually Bard Liao

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=20200818024120.20721-9-yung-chuan.liao@linux.intel.com \
    --to=yung-chuan.liao@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=bard.liao@intel.com \
    --cc=broonie@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=hui.wang@canonical.com \
    --cc=jank@cadence.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mengdong.lin@intel.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=rander.wang@linux.intel.com \
    --cc=ranjani.sridharan@linux.intel.com \
    --cc=sanyog.r.kale@intel.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=tiwai@suse.de \
    --cc=vinod.koul@linaro.org \
    --cc=vkoul@kernel.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).