From: Anup Patel <anup@brainfault.org>
To: Yu Chien Peter Lin <peterlin@andestech.com>
Cc: mark.rutland@arm.com, irogers@google.com, heiko@sntech.de,
geert+renesas@glider.be, alexander.shishkin@linux.intel.com,
paul.walmsley@sifive.com, linux-kernel@vger.kernel.org,
conor.dooley@microchip.com, guoren@kernel.org,
krzysztof.kozlowski+dt@linaro.org,
linux-riscv@lists.infradead.org, will@kernel.org,
linux-renesas-soc@vger.kernel.org, tim609@andestech.com,
samuel@sholland.org, dminus@andestech.com, magnus.damm@gmail.com,
jernej.skrabec@gmail.com, Randolph <randolph@andestech.com>,
peterz@infradead.org, wens@csie.org, mingo@redhat.com,
jszhang@kernel.org, inochiama@outlook.com,
linux-sunxi@lists.linux.dev, ajones@ventanamicro.com,
devicetree@vger.kernel.org, conor+dt@kernel.org,
aou@eecs.berkeley.edu, andre.przywara@arm.com,
locus84@andestech.com, acme@kernel.org,
prabhakar.mahadev-lad.rj@bp.renesas.com, robh+dt@kernel.org,
atishp@atishpatra.org, namhyung@kernel.org, tglx@linutronix.de,
linux-arm-kernel@lists.infradead.org, ycliang@andestech.com,
n.shubin@yadro.com, rdunlap@infradead.org, chao.wei@sophgo.com,
adrian.hunter@intel.com, conor@kernel.org,
linux-perf-users@vger.kernel.org, evan@rivosinc.com,
palmer@dabbelt.com, jolsa@kernel.org, unicorn_wang@outlook.com,
wefu@redhat.com
Subject: Re: [PATCH v7 02/16] irqchip/riscv-intc: Allow large non-standard interrupt number
Date: Wed, 10 Jan 2024 20:41:16 +0530 [thread overview]
Message-ID: <CAAhSdy1KLSFBA_vD+NX15wuiOsz5QadQWj4ZWOK11qfL1LuHqA@mail.gmail.com> (raw)
In-Reply-To: <20240110073917.2398826-3-peterlin@andestech.com>
On Wed, Jan 10, 2024 at 1:10 PM Yu Chien Peter Lin
<peterlin@andestech.com> wrote:
>
> Currently, the implementation of the RISC-V INTC driver uses the
> interrupt cause as the hardware interrupt number, with a maximum of
> 64 interrupts. However, the platform can expand the interrupt number
> further for custom local interrupts.
>
> To fully utilize the available local interrupt sources, switch
> to using irq_domain_create_tree() that creates the radix tree
> map, add global variables (riscv_intc_nr_irqs, riscv_intc_custom_base
> and riscv_intc_custom_nr_irqs) to determine the valid range of local
> interrupt number (hwirq).
>
> Signed-off-by: Yu Chien Peter Lin <peterlin@andestech.com>
> Reviewed-by: Randolph <randolph@andestech.com>
Looks good to me.
Reviewed-by: Anup Patel <anup@brainfault.org>
Regards,
Anup
> ---
> Changes v1 -> v2:
> - Fixed irq mapping failure checking (suggested by Clément and Anup)
> Changes v2 -> v3:
> - No change
> Changes v3 -> v4: (Suggested by Thomas [1])
> - Use pr_warn_ratelimited instead
> - Fix coding style and commit message
> Changes v4 -> v5: (Suggested by Thomas)
> - Fix commit message
> Changes v5 -> v6: (Suggested by Anup [2])
> - Add riscv_intc_* global variables for checking range in riscv_intc_domain_alloc()
> - Advertise the number of interrupts allowed
> Changes v6 -> v7:
> - No functional change
>
> [1] https://patchwork.kernel.org/project/linux-riscv/patch/20231023004100.2663486-3-peterlin@andestech.com/#25573085
> [2] https://patchwork.kernel.org/project/linux-riscv/patch/20231213070301.1684751-3-peterlin@andestech.com/#25636589
> ---
> drivers/irqchip/irq-riscv-intc.c | 30 +++++++++++++++++++++++-------
> 1 file changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/irqchip/irq-riscv-intc.c b/drivers/irqchip/irq-riscv-intc.c
> index e8d01b14ccdd..b13a16b164c9 100644
> --- a/drivers/irqchip/irq-riscv-intc.c
> +++ b/drivers/irqchip/irq-riscv-intc.c
> @@ -19,15 +19,17 @@
> #include <linux/smp.h>
>
> static struct irq_domain *intc_domain;
> +static unsigned int riscv_intc_nr_irqs __ro_after_init;
> +static unsigned int riscv_intc_custom_base __ro_after_init;
> +static unsigned int riscv_intc_custom_nr_irqs __ro_after_init;
>
> static asmlinkage void riscv_intc_irq(struct pt_regs *regs)
> {
> unsigned long cause = regs->cause & ~CAUSE_IRQ_FLAG;
>
> - if (unlikely(cause >= BITS_PER_LONG))
> - panic("unexpected interrupt cause");
> -
> - generic_handle_domain_irq(intc_domain, cause);
> + if (generic_handle_domain_irq(intc_domain, cause))
> + pr_warn_ratelimited("Failed to handle interrupt (cause: %ld)\n",
> + cause);
> }
>
> /*
> @@ -93,6 +95,14 @@ static int riscv_intc_domain_alloc(struct irq_domain *domain,
> if (ret)
> return ret;
>
> + /*
> + * Only allow hwirq for which we have corresponding standard or
> + * custom interrupt enable register.
> + */
> + if ((riscv_intc_nr_irqs <= hwirq && hwirq < riscv_intc_custom_base) ||
> + (riscv_intc_custom_base + riscv_intc_custom_nr_irqs) <= hwirq)
> + return -EINVAL;
> +
> for (i = 0; i < nr_irqs; i++) {
> ret = riscv_intc_domain_map(domain, virq + i, hwirq + i);
> if (ret)
> @@ -117,8 +127,7 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn)
> {
> int rc;
>
> - intc_domain = irq_domain_create_linear(fn, BITS_PER_LONG,
> - &riscv_intc_domain_ops, NULL);
> + intc_domain = irq_domain_create_tree(fn, &riscv_intc_domain_ops, NULL);
> if (!intc_domain) {
> pr_err("unable to add IRQ domain\n");
> return -ENXIO;
> @@ -132,7 +141,10 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn)
>
> riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
>
> - pr_info("%d local interrupts mapped\n", BITS_PER_LONG);
> + pr_info("%d local interrupts mapped\n", riscv_intc_nr_irqs);
> + if (riscv_intc_custom_nr_irqs)
> + pr_info("%d custom local interrupts mapped\n",
> + riscv_intc_custom_nr_irqs);
>
> return 0;
> }
> @@ -166,6 +178,10 @@ static int __init riscv_intc_init(struct device_node *node,
> return 0;
> }
>
> + riscv_intc_nr_irqs = BITS_PER_LONG;
> + riscv_intc_custom_base = riscv_intc_nr_irqs;
> + riscv_intc_custom_nr_irqs = 0;
> +
> return riscv_intc_init_common(of_node_to_fwnode(node));
> }
>
> --
> 2.34.1
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2024-01-10 15:11 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 7:39 [PATCH v7 00/16] Support Andes PMU extension Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 01/16] riscv: errata: Rename defines for Andes Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 02/16] irqchip/riscv-intc: Allow large non-standard interrupt number Yu Chien Peter Lin
2024-01-10 15:11 ` Anup Patel [this message]
2024-01-12 23:44 ` Atish Patra
2024-01-10 7:39 ` [PATCH v7 03/16] irqchip/riscv-intc: Introduce Andes hart-level interrupt controller Yu Chien Peter Lin
2024-01-10 15:12 ` Anup Patel
2024-01-12 23:43 ` Atish Patra
2024-01-10 7:39 ` [PATCH v7 04/16] dt-bindings: riscv: Add Andes interrupt controller compatible string Yu Chien Peter Lin
2024-01-12 23:50 ` Atish Patra
2024-01-13 0:19 ` Conor Dooley
2024-01-13 0:31 ` Atish Patra
2024-01-10 7:39 ` [PATCH v7 05/16] riscv: dts: renesas: r9a07g043f: Update compatible string to use Andes INTC Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 06/16] perf: RISC-V: Eliminate redundant interrupt enable/disable operations Yu Chien Peter Lin
2024-01-12 20:17 ` Atish Patra
2024-01-10 7:39 ` [PATCH v7 07/16] RISC-V: Move T-Head PMU to CPU feature alternative framework Yu Chien Peter Lin
2024-01-16 20:55 ` Atish Patra
2024-01-17 0:16 ` Conor Dooley
2024-01-17 8:58 ` Atish Patra
2024-01-17 9:17 ` Conor Dooley
2024-01-17 22:32 ` Atish Patra
2024-01-17 23:02 ` Conor Dooley
2024-01-17 23:10 ` Palmer Dabbelt
2024-01-22 8:48 ` Yu-Chien Peter Lin
2024-01-17 3:35 ` Anup Patel
2024-01-17 9:01 ` Atish Patra
2024-01-10 7:39 ` [PATCH v7 08/16] perf: RISC-V: Introduce Andes PMU for perf event sampling Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 09/16] dt-bindings: riscv: Add T-Head PMU extension description Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 10/16] dt-bindings: riscv: Add Andes " Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 11/16] riscv: dts: allwinner: Add T-Head PMU extension for sun20i-d1s Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 12/16] riscv: dts: sophgo: Add T-Head PMU extension for cv1800b Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 13/16] riscv: dts: sophgo: Add T-Head PMU extension for sg2042 Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 14/16] riscv: dts: thead: Add T-Head PMU extension for th1520 Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 15/16] riscv: dts: renesas: Add Andes PMU extension for r9a07g043f Yu Chien Peter Lin
2024-01-10 7:39 ` [PATCH v7 16/16] riscv: andes: Support specifying symbolic firmware and hardware raw events Yu Chien Peter Lin
2024-01-13 0:04 ` Atish Patra
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=CAAhSdy1KLSFBA_vD+NX15wuiOsz5QadQWj4ZWOK11qfL1LuHqA@mail.gmail.com \
--to=anup@brainfault.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ajones@ventanamicro.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=andre.przywara@arm.com \
--cc=aou@eecs.berkeley.edu \
--cc=atishp@atishpatra.org \
--cc=chao.wei@sophgo.com \
--cc=conor+dt@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=conor@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dminus@andestech.com \
--cc=evan@rivosinc.com \
--cc=geert+renesas@glider.be \
--cc=guoren@kernel.org \
--cc=heiko@sntech.de \
--cc=inochiama@outlook.com \
--cc=irogers@google.com \
--cc=jernej.skrabec@gmail.com \
--cc=jolsa@kernel.org \
--cc=jszhang@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=locus84@andestech.com \
--cc=magnus.damm@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=n.shubin@yadro.com \
--cc=namhyung@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterlin@andestech.com \
--cc=peterz@infradead.org \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=randolph@andestech.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=samuel@sholland.org \
--cc=tglx@linutronix.de \
--cc=tim609@andestech.com \
--cc=unicorn_wang@outlook.com \
--cc=wefu@redhat.com \
--cc=wens@csie.org \
--cc=will@kernel.org \
--cc=ycliang@andestech.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;
as well as URLs for NNTP newsgroup(s).