From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Shreyas NC <shreyas.nc@intel.com>, alsa-devel@alsa-project.org
Cc: patches.audio@intel.com, gregkh@linuxfoundation.org,
vkoul@kernel.org, sanyog.r.kale@intel.com
Subject: Re: [PATCH v5 1/9] soundwire: Fix duplicate stream state assignment
Date: Mon, 9 Jul 2018 18:41:40 -0500 [thread overview]
Message-ID: <31cd152c-b8f1-77eb-6a81-a6e5a1ac7101@linux.intel.com> (raw)
In-Reply-To: <1530791196-15483-2-git-send-email-shreyas.nc@intel.com>
On 07/05/2018 06:46 AM, Shreyas NC wrote:
> 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 | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
> index 8974a0f..37603c3 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,11 @@ int sdw_stream_add_slave(struct sdw_slave *slave,
> if (ret)
> goto stream_error;
>
> + /*
> + * Change stream state to CONFIGURED on first Slave add.
> + * We don't know number of Slaves in a stream currently so cant
can't or cannot.
> + * wait for all Slaves to be added
> + */
> stream->state = SDW_STREAM_CONFIGURED;
> goto error;
>
next prev parent reply other threads:[~2018-07-09 23:49 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-05 11:46 [PATCH v5 0/9] soundwire: Add multi link support Shreyas NC
2018-07-05 11:46 ` [PATCH v5 1/9] soundwire: Fix duplicate stream state assignment Shreyas NC
2018-07-09 23:41 ` Pierre-Louis Bossart [this message]
2018-07-10 17:03 ` Sanyog Kale
2018-07-05 11:46 ` [PATCH v5 2/9] soundwire: fix incorrect exit after configuring stream Shreyas NC
2018-07-05 11:46 ` [PATCH v5 3/9] Documentation: soundwire: Add documentation for multi link Shreyas NC
2018-07-05 11:46 ` [PATCH v5 4/9] soundwire: Initialize completion for defer messages Shreyas NC
2018-07-05 11:46 ` [PATCH v5 5/9] soundwire: Add support to lock across bus instances Shreyas NC
2018-07-05 11:46 ` [PATCH v5 6/9] soundwire: Handle multiple master instances in a stream Shreyas NC
2018-07-09 23:42 ` Pierre-Louis Bossart
2018-07-10 17:02 ` Sanyog Kale
2018-07-10 18:16 ` Pierre-Louis Bossart
2018-07-11 3:47 ` Sanyog Kale
2018-07-05 11:46 ` [PATCH v5 7/9] soundwire: keep track of Masters " Shreyas NC
2018-07-05 11:46 ` [PATCH v5 8/9] soundwire: Add support for multi link bank switch Shreyas NC
2018-07-09 23:22 ` Pierre-Louis Bossart
2018-07-10 16:37 ` Sanyog Kale
2018-07-05 11:46 ` [PATCH v5 9/9] soundwire: intel: Add pre/post bank switch ops Shreyas NC
2018-07-09 23:47 ` [PATCH v5 0/9] soundwire: Add multi link support Pierre-Louis Bossart
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=31cd152c-b8f1-77eb-6a81-a6e5a1ac7101@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@linuxfoundation.org \
--cc=patches.audio@intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=shreyas.nc@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 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).