diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-06 08:17:43 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-06 08:17:43 -0700 | 
| commit | ff0c66685d93659655886fa61750947bb7733ba9 (patch) | |
| tree | dfa19868fe86ee3c63fcda667bbff7990392fb94 /arch/mips | |
| parent | a91c49517de3445bc438d29a5bb481338817791e (diff) | |
| parent | 9b305678c55dd45044aa565fee04f8d88382bc4d (diff) | |
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()
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 6 | ||||
| -rw-r--r-- | arch/mips/pci/pci-xtalk-bridge.c | 2 | ||||
| -rw-r--r-- | arch/mips/sgi-ip27/ip27-irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/sgi-ip30/ip30-irq.c | 2 | 
4 files changed, 6 insertions, 6 deletions
| diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 8425a6b38aa2..e6b4d9c0c169 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c @@ -1505,7 +1505,7 @@ static int __init octeon_irq_init_ciu(  	ciu_domain = irq_domain_add_tree(  		ciu_node, &octeon_irq_domain_ciu_ops, dd); -	irq_set_default_host(ciu_domain); +	irq_set_default_domain(ciu_domain);  	/* CIU_0 */  	for (i = 0; i < 16; i++) { @@ -2076,7 +2076,7 @@ static int __init octeon_irq_init_ciu2(  	ciu_domain = irq_domain_add_tree(  		ciu_node, &octeon_irq_domain_ciu2_ops, NULL); -	irq_set_default_host(ciu_domain); +	irq_set_default_domain(ciu_domain);  	/* CUI2 */  	for (i = 0; i < 64; i++) { @@ -2929,7 +2929,7 @@ static int __init octeon_irq_init_ciu3(struct device_node *ciu_node,  		/* Only do per CPU things if it is the CIU of the boot node. */  		octeon_irq_ciu3_alloc_resources(ciu3_info);  		if (node == 0) -			irq_set_default_host(domain); +			irq_set_default_domain(domain);  		octeon_irq_use_ip4 = false;  		/* Enable the CIU lines */ diff --git a/arch/mips/pci/pci-xtalk-bridge.c b/arch/mips/pci/pci-xtalk-bridge.c index dae856fb3e5b..e00c38620d14 100644 --- a/arch/mips/pci/pci-xtalk-bridge.c +++ b/arch/mips/pci/pci-xtalk-bridge.c @@ -620,7 +620,7 @@ static int bridge_probe(struct platform_device *pdev)  	if (bridge_get_partnum(virt_to_phys((void *)bd->bridge_addr), partnum))  		return -EPROBE_DEFER; /* not available yet */ -	parent = irq_get_default_host(); +	parent = irq_get_default_domain();  	if (!parent)  		return -ENODEV;  	fn = irq_domain_alloc_named_fwnode("BRIDGE"); diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c index 00e63e9ef61d..288d4d17eddd 100644 --- a/arch/mips/sgi-ip27/ip27-irq.c +++ b/arch/mips/sgi-ip27/ip27-irq.c @@ -297,7 +297,7 @@ void __init arch_init_irq(void)  	if (WARN_ON(domain == NULL))  		return; -	irq_set_default_host(domain); +	irq_set_default_domain(domain);  	irq_set_percpu_devid(IP27_HUB_PEND0_IRQ);  	irq_set_chained_handler_and_data(IP27_HUB_PEND0_IRQ, ip27_do_irq_mask0, diff --git a/arch/mips/sgi-ip30/ip30-irq.c b/arch/mips/sgi-ip30/ip30-irq.c index 423c32cb66ed..9fb905e2cf14 100644 --- a/arch/mips/sgi-ip30/ip30-irq.c +++ b/arch/mips/sgi-ip30/ip30-irq.c @@ -313,7 +313,7 @@ void __init arch_init_irq(void)  	if (!domain)  		return; -	irq_set_default_host(domain); +	irq_set_default_domain(domain);  	irq_set_percpu_devid(IP30_HEART_L0_IRQ);  	irq_set_chained_handler_and_data(IP30_HEART_L0_IRQ, ip30_normal_irq, | 
