Commit 5dad2623 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Borislav Petkov:

 - Fix an unused function warning on irqchip/irq-armada-370-xp

 - Fix the IRQ sharing with pinctrl-amd and ACPI OSL

* tag 'irq_urgent_for_v6.9_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/armada-370-xp: Suppress unused-function warning
  genirq: Introduce IRQF_COND_ONESHOT and use it in pinctrl-amd
parents 448f828f 9e81e329

drivers/irqchip/irq-armada-370-xp.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int armada_370_xp_msi_init(struct device_node *node, 
	return 0;

}

#else

static void armada_370_xp_msi_reenable_percpu(void) {}

static __maybe_unused void armada_370_xp_msi_reenable_percpu(void) {}



static inline int armada_370_xp_msi_init(struct device_node *node,

					 phys_addr_t main_int_phys_base)

drivers/pinctrl/pinctrl-amd.c

+1 −1
Original line number Diff line number Diff line
@@ -1159,7 +1159,7 @@ static int amd_gpio_probe(struct platform_device *pdev) 
	}



	ret = devm_request_irq(&pdev->dev, gpio_dev->irq, amd_gpio_irq_handler,

			       IRQF_SHARED | IRQF_ONESHOT, KBUILD_MODNAME, gpio_dev);

			       IRQF_SHARED | IRQF_COND_ONESHOT, KBUILD_MODNAME, gpio_dev);

	if (ret)

		goto out2;

include/linux/interrupt.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
 *                later.

 * IRQF_NO_DEBUG - Exclude from runnaway detection for IPI and similar handlers,

 *		   depends on IRQF_PERCPU.

 * IRQF_COND_ONESHOT - Agree to do IRQF_ONESHOT if already set for a shared

 *                 interrupt.

 */

#define IRQF_SHARED		0x00000080

#define IRQF_PROBE_SHARED	0x00000100
@@ -82,6 +84,7 @@ 
#define IRQF_COND_SUSPEND	0x00040000

#define IRQF_NO_AUTOEN		0x00080000

#define IRQF_NO_DEBUG		0x00100000

#define IRQF_COND_ONESHOT	0x00200000



#define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)

kernel/irq/manage.c

+7 −2
Original line number Diff line number Diff line
@@ -1643,8 +1643,13 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		}



		if (!((old->flags & new->flags) & IRQF_SHARED) ||

		    (oldtype != (new->flags & IRQF_TRIGGER_MASK)) ||

		    ((old->flags ^ new->flags) & IRQF_ONESHOT))

		    (oldtype != (new->flags & IRQF_TRIGGER_MASK)))

			goto mismatch;



		if ((old->flags & IRQF_ONESHOT) &&

		    (new->flags & IRQF_COND_ONESHOT))

			new->flags |= IRQF_ONESHOT;

		else if ((old->flags ^ new->flags) & IRQF_ONESHOT)

			goto mismatch;



		/* All handlers must agree on per-cpuness */