From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
To: Sergey Shtylyov <s.shtylyov@omp.ru>,
Rich Felker <dalias@libc.org>,
linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Subject: Re: [PATCH] sh: avoid using IRQ0 on SH3/4
Date: Wed, 2 Mar 2022 11:10:23 +0100 [thread overview]
Message-ID: <36f05f50-ff5e-71fb-3afb-475c3ac5a376@physik.fu-berlin.de> (raw)
In-Reply-To: <2f419ed2-66b8-4098-7cd3-0fe698d341c9@omp.ru>
Hello!
On 2/11/22 21:15, Sergey Shtylyov wrote:
> Using IRQ0 by the platform devices is going to be disallowed soon (see [1])
> and the code supporting SH3/4 SoCs maps the IRQ #s starting at 0 -- modify
> that code to start the IRQ #s from 16 instead.
>
> [1] https://lore.kernel.org/all/5e001ec1-d3f1-bcb8-7f30-a6301fd9930c@omp.ru/
>
> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>
> ---
> The patch is against Linus Torvalds' 'linux.git' repo.
>
> arch/sh/kernel/cpu/sh3/entry.S | 4 ++--
> include/linux/sh_intc.h | 6 +++---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> Index: linux/arch/sh/kernel/cpu/sh3/entry.S
> ===================================================================
> --- linux.orig/arch/sh/kernel/cpu/sh3/entry.S
> +++ linux/arch/sh/kernel/cpu/sh3/entry.S
> @@ -470,9 +470,9 @@ ENTRY(handle_interrupt)
> mov r4, r0 ! save vector->jmp table offset for later
>
> shlr2 r4 ! vector to IRQ# conversion
> - add #-0x10, r4
>
> - cmp/pz r4 ! is it a valid IRQ?
> + mov #0x10, r5
> + cmp/ge r5, r4 ! is it a valid IRQ?
> bt 10f
>
> /*
> Index: linux/include/linux/sh_intc.h
> ===================================================================
> --- linux.orig/include/linux/sh_intc.h
> +++ linux/include/linux/sh_intc.h
> @@ -13,9 +13,9 @@
> /*
> * Convert back and forth between INTEVT and IRQ values.
> */
> -#ifdef CONFIG_CPU_HAS_INTEVT
> -#define evt2irq(evt) (((evt) >> 5) - 16)
> -#define irq2evt(irq) (((irq) + 16) << 5)
> +#ifdef CONFIG_CPU_HAS_INTEVT /* Avoid IRQ0 (invalid for platform devices) */
> +#define evt2irq(evt) ((evt) >> 5)
> +#define irq2evt(irq) ((irq) << 5)
> #else
> #define evt2irq(evt) (evt)
> #define irq2evt(irq) (irq)
Successfully boot-tested without any issues on my SH-7785LCR on top of fb184c4af9b9.
Tested-By: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Thanks,
Adrian
--
.''`. John Paul Adrian Glaubitz
: :' : Debian Developer - glaubitz@debian.org
`. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
`- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
prev parent reply other threads:[~2022-03-02 10:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 20:15 [PATCH] sh: avoid using IRQ0 on SH3/4 Sergey Shtylyov
2022-02-11 20:28 ` Sergey Shtylyov
2022-02-11 20:30 ` John Paul Adrian Glaubitz
2022-02-11 20:46 ` Sergey Shtylyov
2022-02-11 21:14 ` John Paul Adrian Glaubitz
2022-02-25 19:28 ` Sergey Shtylyov
2022-02-26 8:07 ` John Paul Adrian Glaubitz
2022-03-02 9:31 ` Sergey Shtylyov
2022-03-02 9:43 ` John Paul Adrian Glaubitz
2022-03-02 10:10 ` John Paul Adrian Glaubitz [this message]
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=36f05f50-ff5e-71fb-3afb-475c3ac5a376@physik.fu-berlin.de \
--to=glaubitz@physik.fu-berlin.de \
--cc=dalias@libc.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=s.shtylyov@omp.ru \
--cc=ysato@users.sourceforge.jp \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.