tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b031457a 8ff6d472

+5 -6
+1 -1
drivers/irqchip/irq-gic-v3-its.c
··· 2045 2045 if (!is_v4(its_dev->its)) 2046 2046 return -EINVAL; 2047 2047 2048 - guard(raw_spinlock_irq)(&its_dev->event_map.vlpi_lock); 2048 + guard(raw_spinlock)(&its_dev->event_map.vlpi_lock); 2049 2049 2050 2050 /* Unmap request? */ 2051 2051 if (!info)
+1 -1
drivers/irqchip/irq-gic-v3.c
··· 1522 1522 static int gic_cpu_pm_notifier(struct notifier_block *self, 1523 1523 unsigned long cmd, void *v) 1524 1524 { 1525 - if (cmd == CPU_PM_EXIT) { 1525 + if (cmd == CPU_PM_EXIT || cmd == CPU_PM_ENTER_FAILED) { 1526 1526 if (gic_dist_security_disabled()) 1527 1527 gic_enable_redist(true); 1528 1528 gic_cpu_sys_reg_enable();
+2 -1
drivers/irqchip/irq-sunxi-nmi.c
··· 186 186 gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit; 187 187 gc->chip_types[0].chip.irq_eoi = irq_gc_ack_set_bit; 188 188 gc->chip_types[0].chip.irq_set_type = sunxi_sc_nmi_set_type; 189 - gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED; 189 + gc->chip_types[0].chip.flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED | 190 + IRQCHIP_SKIP_SET_WAKE; 190 191 gc->chip_types[0].regs.ack = reg_offs->pend; 191 192 gc->chip_types[0].regs.mask = reg_offs->enable; 192 193 gc->chip_types[0].regs.type = reg_offs->ctrl;
+1 -3
drivers/irqchip/irqchip.c
··· 35 35 int platform_irqchip_probe(struct platform_device *pdev) 36 36 { 37 37 struct device_node *np = pdev->dev.of_node; 38 - struct device_node *par_np = of_irq_find_parent(np); 38 + struct device_node *par_np __free(device_node) = of_irq_find_parent(np); 39 39 of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev); 40 40 41 41 if (!irq_init_cb) { 42 - of_node_put(par_np); 43 42 return -EINVAL; 44 43 } 45 44 ··· 54 55 * interrupt controller can check for specific domains as necessary. 55 56 */ 56 57 if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) { 57 - of_node_put(par_np); 58 58 return -EPROBE_DEFER; 59 59 } 60 60