From: Jackie Liu <liu.yun@linux.dev>
To: krzysztof.kozlowski@canonical.com
Cc: linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, liuyun01@kylinos.cn
Subject: Re: [PATCH v2] ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc()
Date: Mon, 6 Sep 2021 18:23:04 +0800 [thread overview]
Message-ID: <a67a8252-a153-8f06-1e0e-fc1a9019869e@linux.dev> (raw)
In-Reply-To: <20210901123557.1043953-1-liu.yun@linux.dev>
Hi, krzysztof. Any suggestion?
--
BR, Jackie Liu
在 2021/9/1 下午8:35, Jackie Liu 写道:
> From: Jackie Liu <liuyun01@kylinos.cn>
>
> The s3c24xx_init_intc() returns an error pointer upon failure, not NULL.
> let's add an error pointer check in s3c24xx_handle_irq.
>
> s3c_intc[0] is not NULL or ERR, we can simplify the code.
>
> Fixes: 1f629b7a3ced ("ARM: S3C24XX: transform irq handling into a declarative form")
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
> ---
> arch/arm/mach-s3c/irq-s3c24xx.c | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-s3c/irq-s3c24xx.c b/arch/arm/mach-s3c/irq-s3c24xx.c
> index 0c631c14a817..df471d322493 100644
> --- a/arch/arm/mach-s3c/irq-s3c24xx.c
> +++ b/arch/arm/mach-s3c/irq-s3c24xx.c
> @@ -362,11 +362,24 @@ static inline int s3c24xx_handle_intc(struct s3c_irq_intc *intc,
> static asmlinkage void __exception_irq_entry s3c24xx_handle_irq(struct pt_regs *regs)
> {
> do {
> - if (likely(s3c_intc[0]))
> - if (s3c24xx_handle_intc(s3c_intc[0], regs, 0))
> - continue;
> + /* For platform based machines, neither ERR nor NULL can happen here.
> + * The s3c24xx_handle_irq() will be set as IRQ handler iff this succeeds:
> + *
> + * s3c_intc[0] = s3c24xx_init_intc()
> + *
> + * If this fails, the next calls to s3c24xx_init_intc() won't be executed.
> + *
> + * For DT machine, s3c_init_intc_of() could set the IRQ handler without
> + * setting s3c_intc[0] only if it was called with num_ctrl=0. There is no
> + * such code path, so again the s3c_intc[0] will have a valid pointer if
> + * set_handle_irq() is called.
> + *
> + * Therefore in s3c24xx_handle_irq(), the s3c_intc[0] is always something.
> + */
> + if (s3c24xx_handle_intc(s3c_intc[0], regs, 0))
> + continue;
>
> - if (s3c_intc[2])
> + if (!IS_ERR_OR_NULL(s3c_intc[2]))
> if (s3c24xx_handle_intc(s3c_intc[2], regs, 64))
> continue;
>
>
next prev parent reply other threads:[~2021-09-06 10:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-01 12:35 [PATCH v2] ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc() Jackie Liu
2021-09-06 10:23 ` Jackie Liu [this message]
2021-09-06 10:52 ` Krzysztof Kozlowski
2021-09-15 7:50 ` Krzysztof Kozlowski
2021-10-26 15:10 ` Arnd Bergmann
2021-10-26 15:22 ` Krzysztof Kozlowski
2021-10-26 15:28 ` Arnd Bergmann
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=a67a8252-a153-8f06-1e0e-fc1a9019869e@linux.dev \
--to=liu.yun@linux.dev \
--cc=krzysztof.kozlowski@canonical.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=liuyun01@kylinos.cn \
/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).