Commit b031457a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull irq fixes from Borislav Petkov:

 - Fix an OF node leak in irqchip init's error handling path

 - Fix sunxi systems to wake up from suspend with an NMI by
   pressing the power button

 - Do not spuriously enable interrupts in gic-v3 in a nested
   interrupts-off section

 - Make sure gic-v3 handles properly a failure to enter a
   low power state

* tag 'irq_urgent_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip: Plug a OF node reference leak in platform_irqchip_probe()
  irqchip/sunxi-nmi: Add missing SKIP_WAKE flag
  irqchip/gic-v3-its: Don't enable interrupts in its_irq_set_vcpu_affinity()
  irqchip/gic-v3: Handle CPU_PM_ENTER_FAILED correctly
parents 8ff6d472 9322d191

drivers/irqchip/irq-gic-v3-its.c

+1 −1
Original line number Diff line number Diff line
@@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info) 
	if (!is_v4(its_dev->its))

		return -EINVAL;



	guard(raw_spinlock_irq)(&its_dev->event_map.vlpi_lock);

	guard(raw_spinlock)(&its_dev->event_map.vlpi_lock);



	/* Unmap request? */

	if (!info)

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -1522,7 +1522,7 @@ static int gic_retrigger(struct irq_data *data) 
static int gic_cpu_pm_notifier(struct notifier_block *self,

			       unsigned long cmd, void *v)

{

	if (cmd == CPU_PM_EXIT) {

	if (cmd == CPU_PM_EXIT || cmd == CPU_PM_ENTER_FAILED) {

		if (gic_dist_security_disabled())

			gic_enable_redist(true);

		gic_cpu_sys_reg_enable();

drivers/irqchip/irq-sunxi-nmi.c

+2 −1
Original line number Diff line number Diff line
@@ -186,7 +186,8 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, 
	gc->chip_types[0].chip.irq_unmask	= irq_gc_mask_set_bit;

	gc->chip_types[0].chip.irq_eoi		= irq_gc_ack_set_bit;

	gc->chip_types[0].chip.irq_set_type	= sunxi_sc_nmi_set_type;

	gc->chip_types[0].chip.flags		= IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED;

	gc->chip_types[0].chip.flags		= IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED |

						  IRQCHIP_SKIP_SET_WAKE;

	gc->chip_types[0].regs.ack		= reg_offs->pend;

	gc->chip_types[0].regs.mask		= reg_offs->enable;

	gc->chip_types[0].regs.type		= reg_offs->ctrl;

drivers/irqchip/irqchip.c

+1 −3
Original line number Diff line number Diff line
@@ -35,11 +35,10 @@ void __init irqchip_init(void) 
int platform_irqchip_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct device_node *par_np = of_irq_find_parent(np);

	struct device_node *par_np __free(device_node) = of_irq_find_parent(np);

	of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);



	if (!irq_init_cb) {

		of_node_put(par_np);

		return -EINVAL;

	}
@@ -55,7 +54,6 @@ int platform_irqchip_probe(struct platform_device *pdev) 
	 * interrupt controller can check for specific domains as necessary.

	 */

	if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {

		of_node_put(par_np);

		return -EPROBE_DEFER;

	}