From: Stephen Boyd <swboyd@chromium.org>
To: Akash Asthana <akashast@codeaurora.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Douglas Anderson <dianders@chromium.org>,
Wolfram Sang <wsa@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Andy Gross <agross@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 3/3] soc: qcom: geni: Optimize select fifo/dma mode
Date: Fri, 09 Oct 2020 17:32:04 -0700 [thread overview]
Message-ID: <160228992470.310579.7455188858203154687@swboyd.mtv.corp.google.com> (raw)
In-Reply-To: <20201008155154.3.I646736d3969dc47de8daceb379c6ba85993de9f4@changeid>
Quoting Douglas Anderson (2020-10-08 15:52:35)
> diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
> index 751a49f6534f..746854745b15 100644
> --- a/drivers/soc/qcom/qcom-geni-se.c
> +++ b/drivers/soc/qcom/qcom-geni-se.c
> @@ -266,49 +266,53 @@ EXPORT_SYMBOL(geni_se_init);
> static void geni_se_select_fifo_mode(struct geni_se *se)
> {
> u32 proto = geni_se_read_proto(se);
> - u32 val;
> + u32 val, val_old;
>
> geni_se_irq_clear(se);
>
> - val = readl_relaxed(se->base + SE_GENI_M_IRQ_EN);
> if (proto != GENI_SE_UART) {
> + val_old = val = readl_relaxed(se->base + SE_GENI_M_IRQ_EN);
> val |= M_CMD_DONE_EN | M_TX_FIFO_WATERMARK_EN;
> val |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;
> - }
> - writel_relaxed(val, se->base + SE_GENI_M_IRQ_EN);
> + if (val != val_old)
> + writel_relaxed(val, se->base + SE_GENI_M_IRQ_EN);
>
> - val = readl_relaxed(se->base + SE_GENI_S_IRQ_EN);
> - if (proto != GENI_SE_UART)
> - val |= S_CMD_DONE_EN;
> - writel_relaxed(val, se->base + SE_GENI_S_IRQ_EN);
> + val = readl_relaxed(se->base + SE_GENI_S_IRQ_EN);
Can we use the val_old trick here too?
> + if (!(val & S_CMD_DONE_EN))
> + writel_relaxed(val | S_CMD_DONE_EN,
Because this val | S_CMD_DONE_EN thing is just hard to read :/
> + se->base + SE_GENI_S_IRQ_EN);
> + }
>
> val = readl_relaxed(se->base + SE_GENI_DMA_MODE_EN);
> - val &= ~GENI_DMA_MODE_EN;
> - writel_relaxed(val, se->base + SE_GENI_DMA_MODE_EN);
> + if (val & GENI_DMA_MODE_EN)
> + writel_relaxed(val & ~GENI_DMA_MODE_EN,
> + se->base + SE_GENI_DMA_MODE_EN);
> }
>
next prev parent reply other threads:[~2020-10-10 0:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 22:52 [PATCH 0/3] i2c: i2c-qcom-geni: More properly fix the DMA race Douglas Anderson
2020-10-08 22:52 ` [PATCH 1/3] soc: qcom: geni: More properly switch to DMA mode Douglas Anderson
2020-10-10 0:39 ` Stephen Boyd
2020-10-12 9:05 ` Akash Asthana
2020-10-13 21:35 ` Doug Anderson
2020-10-12 8:09 ` Akash Asthana
2020-10-08 22:52 ` [PATCH 2/3] Revert "i2c: i2c-qcom-geni: Fix DMA transfer race" Douglas Anderson
2020-10-10 0:39 ` Stephen Boyd
2020-10-12 8:12 ` Akash Asthana
2020-10-08 22:52 ` [PATCH 3/3] soc: qcom: geni: Optimize select fifo/dma mode Douglas Anderson
2020-10-10 0:32 ` Stephen Boyd [this message]
2020-10-13 21:38 ` Doug Anderson
2020-10-10 0:26 ` [PATCH 0/3] i2c: i2c-qcom-geni: More properly fix the DMA race Stephen Boyd
2020-10-10 13:16 ` Dmitry Baryshkov
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=160228992470.310579.7455188858203154687@swboyd.mtv.corp.google.com \
--to=swboyd@chromium.org \
--cc=agross@kernel.org \
--cc=akashast@codeaurora.org \
--cc=bjorn.andersson@linaro.org \
--cc=dianders@chromium.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@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).