From: Neil Armstrong <neil.armstrong@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Linus Walleij <linus.walleij@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>
Cc: linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 4/4] fixup! pinctrl: qcom: handle intr_target_reg wakeup_present/enable bits
Date: Mon, 30 Oct 2023 10:54:05 +0100 [thread overview]
Message-ID: <96a09732-8923-4af6-b063-0944100c24c7@linaro.org> (raw)
In-Reply-To: <20231030-topic-sm8650-upstream-tlmm-v2-4-9d4d4386452d@linaro.org>
Hi,
On 30/10/2023 10:50, Neil Armstrong wrote:
> ---
> drivers/pinctrl/qcom/pinctrl-msm.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
Please ignore this patch, I forgot to sqash it....
Neil
>
> diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
> index 2489a9ac8455..207b41018580 100644
> --- a/drivers/pinctrl/qcom/pinctrl-msm.c
> +++ b/drivers/pinctrl/qcom/pinctrl-msm.c
> @@ -1197,6 +1197,7 @@ static int msm_gpio_irq_reqres(struct irq_data *d)
> struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
> struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
> const struct msm_pingroup *g = &pctrl->soc->groups[d->hwirq];
> + unsigned long flags;
> int ret;
>
> if (!try_module_get(gc->owner))
> @@ -1233,11 +1234,15 @@ static int msm_gpio_irq_reqres(struct irq_data *d)
> if (test_bit(d->hwirq, pctrl->skip_wake_irqs) && g->intr_wakeup_present_bit) {
> u32 intr_cfg;
>
> + raw_spin_lock_irqsave(&pctrl->lock, flags);
> +
> intr_cfg = msm_readl_intr_cfg(pctrl, g);
> if (intr_cfg & BIT(g->intr_wakeup_present_bit)) {
> intr_cfg |= BIT(g->intr_wakeup_enable_bit);
> msm_writel_intr_cfg(intr_cfg, pctrl, g);
> }
> +
> + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
> }
>
> return 0;
> @@ -1251,16 +1256,21 @@ static void msm_gpio_irq_relres(struct irq_data *d)
> struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
> struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
> const struct msm_pingroup *g = &pctrl->soc->groups[d->hwirq];
> + unsigned long flags;
>
> /* Disable the wakeup_enable bit if it has been set in msm_gpio_irq_reqres() */
> if (test_bit(d->hwirq, pctrl->skip_wake_irqs) && g->intr_wakeup_present_bit) {
> u32 intr_cfg;
>
> + raw_spin_lock_irqsave(&pctrl->lock, flags);
> +
> intr_cfg = msm_readl_intr_cfg(pctrl, g);
> if (intr_cfg & BIT(g->intr_wakeup_present_bit)) {
> intr_cfg &= ~BIT(g->intr_wakeup_enable_bit);
> msm_writel_intr_cfg(intr_cfg, pctrl, g);
> }
> +
> + raw_spin_unlock_irqrestore(&pctrl->lock, flags);
> }
>
> gpiochip_unlock_as_irq(gc, d->hwirq);
>
next prev parent reply other threads:[~2023-10-30 9:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 9:50 [PATCH v2 0/4] pinctrl: qcom: Introduce Pinctrl/GPIO for SM8650 Neil Armstrong
2023-10-30 9:50 ` [PATCH v2 1/4] dt-bindings: pinctrl: document the SM8650 Top Level Mode Multiplexer Neil Armstrong
2023-10-30 14:47 ` Krzysztof Kozlowski
2023-10-30 9:50 ` [PATCH v2 2/4] pinctrl: qcom: handle intr_target_reg wakeup_present/enable bits Neil Armstrong
2023-10-30 9:50 ` [PATCH v2 3/4] pinctrl: qcom: Introduce the SM8650 Top Level Mode Multiplexer driver Neil Armstrong
2023-10-30 9:50 ` [PATCH v2 4/4] fixup! pinctrl: qcom: handle intr_target_reg wakeup_present/enable bits Neil Armstrong
2023-10-30 9:54 ` Neil Armstrong [this message]
2023-10-30 9:54 ` [PATCH v2 0/4] pinctrl: qcom: Introduce Pinctrl/GPIO for SM8650 Neil Armstrong
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=96a09732-8923-4af6-b063-0944100c24c7@linaro.org \
--to=neil.armstrong@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@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).