Use the irq_domain_create_hierarchy() helper to create the hierarchical
domain, which both serves as documentation and avoids poking at
irqdomain internals.
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Tested-by: Hsin-Yi Wang <[email protected]>
Tested-by: Mark-PK Tsai <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
---
arch/x86/kernel/apic/io_apic.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index a868b76cd3d4..9cc4c8e0c3c4 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2364,9 +2364,9 @@ static int mp_irqdomain_create(int ioapic)
return -ENODEV;
}
- ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops,
- (void *)(long)ioapic);
-
+ ip->irqdomain = irq_domain_create_hierarchy(parent, 0, hwirqs, fn,
+ cfg->ops,
+ (void *)(long)ioapic);
if (!ip->irqdomain) {
/* Release fw handle if it was allocated above */
if (!cfg->dev)
@@ -2374,8 +2374,6 @@ static int mp_irqdomain_create(int ioapic)
return -ENOMEM;
}
- ip->irqdomain->parent = parent;
-
if (cfg->type == IOAPIC_DOMAIN_LEGACY ||
cfg->type == IOAPIC_DOMAIN_STRICT)
ioapic_dynirq_base = max(ioapic_dynirq_base,
--
2.38.2
On Mon, Jan 16 2023 at 14:50, Johan Hovold wrote:
>
> - ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops,
> - (void *)(long)ioapic);
> -
> + ip->irqdomain = irq_domain_create_hierarchy(parent, 0, hwirqs, fn,
> + cfg->ops,
> + (void *)(long)ioapic);
The 80 character limit has been lifted quite some time ago. Please use
the 100 which are now the norm.
Thanks,
tglx
On Tue, Jan 17, 2023 at 10:41:36PM +0100, Thomas Gleixner wrote:
> On Mon, Jan 16 2023 at 14:50, Johan Hovold wrote:
> >
> > - ip->irqdomain = irq_domain_create_linear(fn, hwirqs, cfg->ops,
> > - (void *)(long)ioapic);
> > -
> > + ip->irqdomain = irq_domain_create_hierarchy(parent, 0, hwirqs, fn,
> > + cfg->ops,
> > + (void *)(long)ioapic);
>
> The 80 character limit has been lifted quite some time ago. Please use
> the 100 which are now the norm.
Not everyone agrees, including coding-style.rst:
The preferred limit on the length of a single line is 80 columns.
Statements longer than 80 columns should be broken into sensible
chunks, unless exceeding 80 columns significantly increases
readability and does not hide information.
I go above 80 chars when it improves readability, but it's still a soft
limit for many of us.
I'll change the above, but not sure trying too hard to fit everything in
one line really improves things in cases like:
- uv_domain = irq_domain_create_hierarchy(x86_vector_domain, 0, 0, fn,
- &uv_domain_ops, NULL);
+ uv_domain = irq_domain_create_hierarchy(x86_vector_domain, 0, 0, fn, &uv_domain_ops, NULL);
Johan