irqchip/irq-realtek-rtl: Add interrupt data structure

To prepare for multiple parent interrupt domains add an intermediate
data structure. For now this will only host the link to the domain.
Additionally adapt a deviating variable name to driver standard "hw_irq".

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260605211646.2101652-4-markus.stockhausen@gmx.de
This commit is contained in:
Markus Stockhausen 2026-06-05 23:16:42 +02:00 committed by Thomas Gleixner
parent d36c1d1657
commit 2568f6926c

View File

@ -25,6 +25,10 @@
#define REG(cpu, x) (realtek_ictl_base[cpu] + x)
struct realtek_ictl_output {
struct irq_domain *domain;
};
static DEFINE_RAW_SPINLOCK(irq_lock);
static void __iomem *realtek_ictl_base[NR_CPUS];
@ -125,11 +129,11 @@ static const struct irq_domain_ops irq_domain_ops = {
static void realtek_irq_dispatch(struct irq_desc *desc)
{
struct realtek_ictl_output *output = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc);
unsigned int cpu = smp_processor_id();
struct irq_domain *domain;
unsigned long pending;
unsigned int soc_int;
unsigned int hw_irq;
chained_irq_enter(chip, desc);
pending = readl(REG(cpu, RTL_ICTL_GIMR)) & readl(REG(cpu, RTL_ICTL_GISR));
@ -139,9 +143,8 @@ static void realtek_irq_dispatch(struct irq_desc *desc)
goto out;
}
domain = irq_desc_get_handler_data(desc);
for_each_set_bit(soc_int, &pending, RTL_ICTL_NUM_INPUTS)
generic_handle_domain_irq(domain, soc_int);
for_each_set_bit(hw_irq, &pending, RTL_ICTL_NUM_INPUTS)
generic_handle_domain_irq(output->domain, hw_irq);
out:
chained_irq_exit(chip, desc);
@ -149,10 +152,15 @@ static void realtek_irq_dispatch(struct irq_desc *desc)
static int __init realtek_setup_parents(struct device_node *node)
{
int parent_irq, num_parents = of_irq_count(node);
int err, parent_irq, num_parents = of_irq_count(node);
struct realtek_ictl_output *output;
struct of_phandle_args oirq;
struct irq_domain *domain;
output = kcalloc(1, sizeof(*output), GFP_KERNEL);
if (!output)
return -ENOMEM;
if (WARN_ON(!num_parents)) {
/*
* If DT contains no parent interrupts, assume MIPS IRQ 2 (HW0) is
@ -160,8 +168,10 @@ static int __init realtek_setup_parents(struct device_node *node)
*/
oirq.np = of_find_compatible_node(NULL, NULL,
"mti,cpu-interrupt-controller");
if (!oirq.np)
return -EINVAL;
if (!oirq.np) {
err = -EINVAL;
goto err_out;
}
oirq.args_count = 1;
oirq.args[0] = 2;
@ -171,17 +181,27 @@ static int __init realtek_setup_parents(struct device_node *node)
parent_irq = of_irq_get(node, 0);
}
if (parent_irq <= 0)
return parent_irq ? parent_irq : -ENODEV;
if (parent_irq <= 0) {
err = parent_irq ? parent_irq : -ENODEV;
goto err_out;
}
domain = irq_domain_create_linear(of_fwnode_handle(node), RTL_ICTL_NUM_INPUTS,
&irq_domain_ops, NULL);
if (!domain)
return -ENOMEM;
&irq_domain_ops, output);
if (!domain) {
err = -ENOMEM;
goto err_out;
}
irq_set_chained_handler_and_data(parent_irq, realtek_irq_dispatch, domain);
output->domain = domain;
irq_set_chained_handler_and_data(parent_irq, realtek_irq_dispatch, output);
return 0;
err_out:
kfree(output);
return err;
}
static int __init realtek_rtl_of_init(struct device_node *node, struct device_node *parent)