Skip to content

Commit ff0c666

Browse files
committed
Merge tag 'irq-urgent-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull more irq updates from Thomas Gleixner: "A set of updates for the interrupt subsystem: - A treewide cleanup for the irq_domain code, which makes the naming consistent and gets rid of the original oddity of naming domains 'host'. This is a trivial mechanical change and is done late to ensure that all instances have been catched and new code merged post rc1 wont reintroduce new instances. - A trivial consistency fix in the migration code The recent introduction of irq_force_complete_move() in the core code, causes a problem for the nostalgia crowd who maintains ia64 out of tree. The code assumes that hierarchical interrupt domains are enabled and dereferences irq_data::parent_data unconditionally. That works in mainline because both architectures which enable that code have hierarchical domains enabled. Though it breaks the ia64 build, which enables the functionality, but does not have hierarchical domains. While it's not really a problem for mainline today, this unconditional dereference is inconsistent and trivially fixable by using the existing helper function irqd_get_parent_data(), which has the appropriate #ifdeffery in place" * tag 'irq-urgent-2025-04-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq/migration: Use irqd_get_parent_data() in irq_force_complete_move() irqdomain: Stop using 'host' for domain irqdomain: Rename irq_get_default_host() to irq_get_default_domain() irqdomain: Rename irq_set_default_host() to irq_set_default_domain()
2 parents a91c495 + 9b30567 commit ff0c666

File tree

36 files changed

+54
-54
lines changed

36 files changed

+54
-54
lines changed

arch/arc/kernel/intc-arcv2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)
178178
* Needed for primary domain lookup to succeed
179179
* This is a primary irqchip, and can never have a parent
180180
*/
181-
irq_set_default_host(root_domain);
181+
irq_set_default_domain(root_domain);
182182

183183
#ifdef CONFIG_SMP
184184
irq_create_mapping(root_domain, IPI_IRQ);

arch/arc/kernel/intc-compact.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ init_onchip_IRQ(struct device_node *intc, struct device_node *parent)
121121
* Needed for primary domain lookup to succeed
122122
* This is a primary irqchip, and can never have a parent
123123
*/
124-
irq_set_default_host(root_domain);
124+
irq_set_default_domain(root_domain);
125125

126126
return 0;
127127
}

arch/arm/mach-pxa/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ pxa_init_irq_common(struct device_node *node, int irq_nr,
152152
&pxa_irq_ops, NULL);
153153
if (!pxa_irq_domain)
154154
panic("Unable to add PXA IRQ domain\n");
155-
irq_set_default_host(pxa_irq_domain);
155+
irq_set_default_domain(pxa_irq_domain);
156156

157157
for (n = 0; n < irq_nr; n += 32) {
158158
void __iomem *base = irq_base(n >> 5);

arch/mips/cavium-octeon/octeon-irq.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,7 +1505,7 @@ static int __init octeon_irq_init_ciu(
15051505

15061506
ciu_domain = irq_domain_add_tree(
15071507
ciu_node, &octeon_irq_domain_ciu_ops, dd);
1508-
irq_set_default_host(ciu_domain);
1508+
irq_set_default_domain(ciu_domain);
15091509

15101510
/* CIU_0 */
15111511
for (i = 0; i < 16; i++) {
@@ -2076,7 +2076,7 @@ static int __init octeon_irq_init_ciu2(
20762076

20772077
ciu_domain = irq_domain_add_tree(
20782078
ciu_node, &octeon_irq_domain_ciu2_ops, NULL);
2079-
irq_set_default_host(ciu_domain);
2079+
irq_set_default_domain(ciu_domain);
20802080

20812081
/* CUI2 */
20822082
for (i = 0; i < 64; i++) {
@@ -2929,7 +2929,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,
29292929
/* Only do per CPU things if it is the CIU of the boot node. */
29302930
octeon_irq_ciu3_alloc_resources(ciu3_info);
29312931
if (node == 0)
2932-
irq_set_default_host(domain);
2932+
irq_set_default_domain(domain);
29332933

29342934
octeon_irq_use_ip4 = false;
29352935
/* Enable the CIU lines */

arch/mips/pci/pci-xtalk-bridge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)
620620
if (bridge_get_partnum(virt_to_phys((void *)bd->bridge_addr), partnum))
621621
return -EPROBE_DEFER; /* not available yet */
622622

623-
parent = irq_get_default_host();
623+
parent = irq_get_default_domain();
624624
if (!parent)
625625
return -ENODEV;
626626
fn = irq_domain_alloc_named_fwnode("BRIDGE");

arch/mips/sgi-ip27/ip27-irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ void __init arch_init_irq(void)
297297
if (WARN_ON(domain == NULL))
298298
return;
299299

300-
irq_set_default_host(domain);
300+
irq_set_default_domain(domain);
301301

302302
irq_set_percpu_devid(IP27_HUB_PEND0_IRQ);
303303
irq_set_chained_handler_and_data(IP27_HUB_PEND0_IRQ, ip27_do_irq_mask0,

arch/mips/sgi-ip30/ip30-irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ void __init arch_init_irq(void)
313313
if (!domain)
314314
return;
315315

316-
irq_set_default_host(domain);
316+
irq_set_default_domain(domain);
317317

318318
irq_set_percpu_devid(IP30_HEART_L0_IRQ);
319319
irq_set_chained_handler_and_data(IP30_HEART_L0_IRQ, ip30_normal_irq,

arch/nios2/kernel/irq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void __init init_IRQ(void)
7272
domain = irq_domain_add_linear(node, NIOS2_CPU_NR_IRQS, &irq_ops, NULL);
7373
BUG_ON(!domain);
7474

75-
irq_set_default_host(domain);
75+
irq_set_default_domain(domain);
7676
of_node_put(node);
7777
/* Load the initial ienable value */
7878
ienable = RDCTL(CTL_IENABLE);

arch/powerpc/kvm/book3s_hv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6041,7 +6041,7 @@ static int kvmppc_set_passthru_irq(struct kvm *kvm, int host_irq, int guest_gsi)
60416041
* the underlying calls, which will EOI the interrupt in real
60426042
* mode, need an HW IRQ number mapped in the XICS IRQ domain.
60436043
*/
6044-
host_data = irq_domain_get_irq_data(irq_get_default_host(), host_irq);
6044+
host_data = irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
60456045
irq_map->r_hwirq = (unsigned int)irqd_to_hwirq(host_data);
60466046

60476047
if (i == pimap->n_mapped)

arch/powerpc/kvm/book3s_xive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ int kvmppc_xive_set_mapped(struct kvm *kvm, unsigned long guest_irq,
15551555
struct kvmppc_xive_src_block *sb;
15561556
struct kvmppc_xive_irq_state *state;
15571557
struct irq_data *host_data =
1558-
irq_domain_get_irq_data(irq_get_default_host(), host_irq);
1558+
irq_domain_get_irq_data(irq_get_default_domain(), host_irq);
15591559
unsigned int hw_irq = (unsigned int)irqd_to_hwirq(host_data);
15601560
u16 idx;
15611561
u8 prio;

0 commit comments

Comments
 (0)