From: "tip-bot2 for Markus Stockhausen" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Markus Stockhausen <markus.stockhausen@gmx.de>,
Thomas Gleixner <tglx@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: irq/drivers] irqchip/irq-realtek-rtl: Split out parent setup code
Date: Mon, 29 Jun 2026 15:19:52 -0000 [thread overview]
Message-ID: <178274639290.3843924.5225402144517229325.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260605211646.2101652-3-markus.stockhausen@gmx.de>
The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: d36c1d1657113fcf442c50e074593d7b712bada1
Gitweb: https://git.kernel.org/tip/d36c1d1657113fcf442c50e074593d7b712bada1
Author: Markus Stockhausen <markus.stockhausen@gmx.de>
AuthorDate: Fri, 05 Jun 2026 23:16:41 +02:00
Committer: Thomas Gleixner <tglx@kernel.org>
CommitterDate: Mon, 29 Jun 2026 17:19:06 +02:00
irqchip/irq-realtek-rtl: Split out parent setup code
The parent interrupt setup will be extended to support multiple parents.
To prepare for that, relocate the code into a separate helper. Although it
still works only for a single interrupt prepare the coding so it can be
easily extended with a loop for multi parent support. For this reduce the
line lengths so that the upcoming indentation still leaves the width below
100 characters.
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260605211646.2101652-3-markus.stockhausen@gmx.de
---
drivers/irqchip/irq-realtek-rtl.c | 60 ++++++++++++++++--------------
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/drivers/irqchip/irq-realtek-rtl.c b/drivers/irqchip/irq-realtek-rtl.c
index 2ae3be7..3b4508e 100644
--- a/drivers/irqchip/irq-realtek-rtl.c
+++ b/drivers/irqchip/irq-realtek-rtl.c
@@ -147,48 +147,35 @@ out:
chained_irq_exit(chip, desc);
}
-static int __init realtek_rtl_of_init(struct device_node *node, struct device_node *parent)
+static int __init realtek_setup_parents(struct device_node *node)
{
+ int parent_irq, num_parents = of_irq_count(node);
struct of_phandle_args oirq;
struct irq_domain *domain;
- int cpu, parent_irq;
- for_each_present_cpu(cpu) {
- realtek_ictl_base[cpu] = of_iomap(node, cpu);
- if (!realtek_ictl_base[cpu])
- return -ENXIO;
-
- /* Disable all cascaded interrupts and clear routing */
- for (unsigned int hw_irq = 0; hw_irq < RTL_ICTL_NUM_INPUTS; hw_irq++) {
- disable_gimr(cpu, hw_irq);
- write_irr(cpu, hw_irq, 0);
- }
- }
-
- if (WARN_ON(!of_irq_count(node))) {
+ if (WARN_ON(!num_parents)) {
/*
- * If DT contains no parent interrupts, assume MIPS CPU IRQ 2
- * (HW0) is connected to the first output. This is the case for
- * all known hardware anyway. "interrupt-map" is deprecated, so
- * don't bother trying to parse that.
+ * If DT contains no parent interrupts, assume MIPS IRQ 2 (HW0) is
+ * connected to the first output. This is the case for all known hardware.
*/
- oirq.np = of_find_compatible_node(NULL, NULL, "mti,cpu-interrupt-controller");
+ oirq.np = of_find_compatible_node(NULL, NULL,
+ "mti,cpu-interrupt-controller");
+ if (!oirq.np)
+ return -EINVAL;
+
oirq.args_count = 1;
oirq.args[0] = 2;
-
parent_irq = irq_create_of_mapping(&oirq);
-
of_node_put(oirq.np);
} else {
parent_irq = of_irq_get(node, 0);
}
- if (parent_irq < 0)
- return parent_irq;
- else if (!parent_irq)
- return -ENODEV;
+ if (parent_irq <= 0)
+ return parent_irq ? parent_irq : -ENODEV;
- domain = irq_domain_create_linear(of_fwnode_handle(node), RTL_ICTL_NUM_INPUTS, &irq_domain_ops, NULL);
+ domain = irq_domain_create_linear(of_fwnode_handle(node), RTL_ICTL_NUM_INPUTS,
+ &irq_domain_ops, NULL);
if (!domain)
return -ENOMEM;
@@ -197,4 +184,23 @@ static int __init realtek_rtl_of_init(struct device_node *node, struct device_no
return 0;
}
+static int __init realtek_rtl_of_init(struct device_node *node, struct device_node *parent)
+{
+ unsigned int cpu;
+
+ for_each_present_cpu(cpu) {
+ realtek_ictl_base[cpu] = of_iomap(node, cpu);
+ if (!realtek_ictl_base[cpu])
+ return -ENXIO;
+
+ /* Disable all cascaded interrupts and clear routing */
+ for (unsigned int hw_irq = 0; hw_irq < RTL_ICTL_NUM_INPUTS; hw_irq++) {
+ disable_gimr(cpu, hw_irq);
+ write_irr(cpu, hw_irq, 0);
+ }
+ }
+
+ return realtek_setup_parents(node);
+}
+
IRQCHIP_DECLARE(realtek_rtl_intc, "realtek,rtl-intc", realtek_rtl_of_init);
next prev parent reply other threads:[~2026-06-29 15:19 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 21:16 [PATCH 0/7] irqchip/irq-realtek-rtl: Add multi parent support Markus Stockhausen
2026-06-05 21:16 ` [PATCH 1/7] dt-bindings: interrupt-controller: realtek,rtl-intc: Allow 2 interrupt cells Markus Stockhausen
2026-06-10 19:59 ` Rob Herring (Arm)
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
2026-06-05 21:16 ` [PATCH 2/7] irqchip/irq-realtek-rtl: Use helper for parent setup Markus Stockhausen
2026-06-29 15:19 ` tip-bot2 for Markus Stockhausen [this message]
2026-06-05 21:16 ` [PATCH 3/7] irqchip/irq-realtek-rtl: Add interrupt data structure Markus Stockhausen
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
2026-06-05 21:16 ` [PATCH 4/7] irqchip/irq-realtek-rtl: Add mask for interrupt handling Markus Stockhausen
2026-06-29 15:12 ` Thomas Gleixner
2026-06-29 15:43 ` AW: " Markus Stockhausen
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
2026-06-05 21:16 ` [PATCH 5/7] irqchip/irq-realtek-rtl: Add a select function Markus Stockhausen
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
2026-06-05 21:16 ` [PATCH 6/7] irqchip/irq-realtek-rtl: Allow shuffled interrupt order Markus Stockhausen
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
2026-06-05 21:16 ` [PATCH 7/7] irqchip/irq-realtek-rtl: Activate multiple parents Markus Stockhausen
2026-06-29 15:19 ` [tip: irq/drivers] " tip-bot2 for Markus Stockhausen
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=178274639290.3843924.5225402144517229325.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=markus.stockhausen@gmx.de \
--cc=tglx@kernel.org \
--cc=x86@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
all inboxes | Powered by JetHome®