From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
broonie@kernel.org, vkoul@kernel.org
Cc: robh@kernel.org, devicetree@vger.kernel.org,
yung-chuan.liao@linux.intel.com, sanyog.r.kale@intel.com,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org
Subject: Re: [PATCH v2 2/5] soundwire: qcom: update port map allocation bit mask
Date: Tue, 9 Mar 2021 09:55:34 -0600 [thread overview]
Message-ID: <50c83be0-8948-8450-4b91-d43cc97f8640@linux.intel.com> (raw)
In-Reply-To: <20210309141514.24744-3-srinivas.kandagatla@linaro.org>
On 3/9/21 8:15 AM, Srinivas Kandagatla wrote:
> currently the internal bitmask used for allocating ports starts with offset 0.
> This is bit confusing as data port numbers on Qualcomm controller are valid
> from 1 to 14. So adjust this bit mask accordingly, this will also help while
> adding static port map support.
>
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> drivers/soundwire/qcom.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index 6d22df01f354..f4f1c5f2af0b 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -519,7 +519,7 @@ static void qcom_swrm_stream_free_ports(struct qcom_swrm_ctrl *ctrl,
> port_mask = &ctrl->din_port_mask;
>
> list_for_each_entry(p_rt, &m_rt->port_list, port_node)
> - clear_bit(p_rt->num - 1, port_mask);
> + clear_bit(p_rt->num, port_mask);
> }
>
> mutex_unlock(&ctrl->port_lock);
> @@ -552,13 +552,13 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
> list_for_each_entry(p_rt, &s_rt->port_list, port_node) {
> /* Port numbers start from 1 - 14*/
> pn = find_first_zero_bit(port_mask, maxport);
> - if (pn > (maxport - 1)) {
> + if (pn > (maxport)) {
nit-pick: useless parentheses
> dev_err(ctrl->dev, "All ports busy\n");
> ret = -EBUSY;
> goto err;
> }
> set_bit(pn, port_mask);
> - pconfig[nports].num = pn + 1;
> + pconfig[nports].num = pn;
> pconfig[nports].ch_mask = p_rt->ch_mask;
> nports++;
> }
> @@ -580,7 +580,7 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl,
> err:
> if (ret) {
> for (i = 0; i < nports; i++)
> - clear_bit(pconfig[i].num - 1, port_mask);
> + clear_bit(pconfig[i].num, port_mask);
> }
>
> mutex_unlock(&ctrl->port_lock);
> @@ -754,6 +754,9 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
> ctrl->num_dout_ports = val;
>
> nports = ctrl->num_dout_ports + ctrl->num_din_ports;
> + /* port numbers are non zero, so mark port 0 */
mask?
> + set_bit(0, &ctrl->dout_port_mask);
> + set_bit(0, &ctrl->din_port_mask);
>
> ret = of_property_read_u8_array(np, "qcom,ports-offset1",
> off1, nports);
>
next prev parent reply other threads:[~2021-03-10 15:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-09 14:15 [PATCH v2 0/5] soundwire: add static port map support Srinivas Kandagatla
2021-03-09 14:15 ` [PATCH v2 1/5] soundwire: add static port mapping support Srinivas Kandagatla
2021-03-09 14:15 ` [PATCH v2 2/5] soundwire: qcom: update port map allocation bit mask Srinivas Kandagatla
2021-03-09 15:55 ` Pierre-Louis Bossart [this message]
2021-03-11 14:29 ` Srinivas Kandagatla
2021-03-09 14:15 ` [PATCH v2 3/5] soundwire: qcom: add static port map support Srinivas Kandagatla
2021-03-09 16:10 ` Pierre-Louis Bossart
2021-03-11 14:29 ` Srinivas Kandagatla
2021-03-09 14:15 ` [PATCH v2 4/5] ASoC: dt-bindings: wsa881x: add bindings for port mapping Srinivas Kandagatla
2021-03-09 17:19 ` Rob Herring
2021-03-09 14:15 ` [PATCH v2 5/5] ASoC: codecs: wsa881x: add static port map support Srinivas Kandagatla
2021-03-09 16:08 ` kernel test robot
2021-03-09 20:31 ` kernel test robot
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=50c83be0-8948-8450-4b91-d43cc97f8640@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=sanyog.r.kale@intel.com \
--cc=srinivas.kandagatla@linaro.org \
--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: 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