All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shreyas NC <shreyas.nc@intel.com>
To: alsa-devel@alsa-project.org
Cc: patches.audio@intel.com, gregkh@linuxfoundation.org,
	pierre-louis.bossart@linux.intel.com, vkoul@kernel.org,
	Shreyas NC <shreyas.nc@intel.com>,
	sanyog.r.kale@intel.com
Subject: [PATCH v8 01/10] soundwire: Fix duplicate stream state assignment
Date: Fri, 27 Jul 2018 14:44:08 +0530	[thread overview]
Message-ID: <1532682857-604-2-git-send-email-shreyas.nc@intel.com> (raw)
In-Reply-To: <1532682857-604-1-git-send-email-shreyas.nc@intel.com>

For a SoundWire stream it is expected that a Slave is added to the
stream before Master is added.

So, move the stream state to CONFIGURED after the first Slave is
added and remove the stream state assignment for Master add.
Along with these changes, add additional comments to explain the same.

Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
---
 drivers/soundwire/stream.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index 8974a0f..e6ee4ba 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1123,8 +1123,6 @@ int sdw_stream_add_master(struct sdw_bus *bus,
 	if (ret)
 		goto stream_error;
 
-	stream->state = SDW_STREAM_CONFIGURED;
-
 stream_error:
 	sdw_release_master_stream(stream);
 error:
@@ -1141,6 +1139,10 @@ EXPORT_SYMBOL(sdw_stream_add_master);
  * @stream: SoundWire stream
  * @port_config: Port configuration for audio stream
  * @num_ports: Number of ports
+ *
+ * It is expected that Slave is added before adding Master
+ * to the Stream.
+ *
  */
 int sdw_stream_add_slave(struct sdw_slave *slave,
 		struct sdw_stream_config *stream_config,
@@ -1186,6 +1188,12 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
 	if (ret)
 		goto stream_error;
 
+	/*
+	 * Change stream state to CONFIGURED on first Slave add.
+	 * Bus is not aware of number of Slave(s) in a stream at this
+	 * point so cannot depend on all Slave(s) to be added in order to
+	 * change stream state to CONFIGURED.
+	 */
 	stream->state = SDW_STREAM_CONFIGURED;
 	goto error;
 
-- 
2.7.4

  reply	other threads:[~2018-07-27  9:14 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-27  9:14 [PATCH v8 00/10] soundwire: Add multi link support Shreyas NC
2018-07-27  9:14 ` Shreyas NC [this message]
2018-07-27  9:14 ` [PATCH v8 02/10] soundwire: Fix incorrect exit after configuring stream Shreyas NC
2018-07-27  9:14 ` [PATCH v8 03/10] soundwire: Fix acquiring bus lock twice during master release Shreyas NC
2018-07-27  9:14 ` [PATCH v8 04/10] Documentation: soundwire: Add documentation for multi link Shreyas NC
2018-07-27  9:14 ` [PATCH v8 05/10] soundwire: Initialize completion for defer messages Shreyas NC
2018-07-27  9:14 ` [PATCH v8 06/10] soundwire: Add support to lock across bus instances Shreyas NC
2018-07-27  9:14 ` [PATCH v8 07/10] soundwire: Handle multiple master instances in a stream Shreyas NC
2018-07-27  9:14 ` [PATCH v8 08/10] soundwire: keep track of Masters " Shreyas NC
2018-07-27  9:14 ` [PATCH v8 09/10] soundwire: Add support for multi link bank switch Shreyas NC
2018-07-27  9:14 ` [PATCH v8 10/10] soundwire: intel: Add pre/post bank switch ops Shreyas NC
2018-07-27 15:12 ` [PATCH v8 00/10] soundwire: Add multi link support Pierre-Louis Bossart
2018-08-07  6:51 ` Vinod

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=1532682857-604-2-git-send-email-shreyas.nc@intel.com \
    --to=shreyas.nc@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=patches.audio@intel.com \
    --cc=pierre-louis.bossart@linux.intel.com \
    --cc=sanyog.r.kale@intel.com \
    --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 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.