Skip to content

Commit b031457

Browse files
committed
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
2 parents 8ff6d47 + 9322d19 commit b031457

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2045,7 +2045,7 @@ static int its_irq_set_vcpu_affinity(struct irq_data *d, void *vcpu_info)
20452045
if (!is_v4(its_dev->its))
20462046
return -EINVAL;
20472047

2048-
guard(raw_spinlock_irq)(&its_dev->event_map.vlpi_lock);
2048+
guard(raw_spinlock)(&its_dev->event_map.vlpi_lock);
20492049

20502050
/* Unmap request? */
20512051
if (!info)

drivers/irqchip/irq-gic-v3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ static int gic_retrigger(struct irq_data *data)
15221522
static int gic_cpu_pm_notifier(struct notifier_block *self,
15231523
unsigned long cmd, void *v)
15241524
{
1525-
if (cmd == CPU_PM_EXIT) {
1525+
if (cmd == CPU_PM_EXIT || cmd == CPU_PM_ENTER_FAILED) {
15261526
if (gic_dist_security_disabled())
15271527
gic_enable_redist(true);
15281528
gic_cpu_sys_reg_enable();

drivers/irqchip/irq-sunxi-nmi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
186186
gc->chip_types[0].chip.irq_unmask = irq_gc_mask_set_bit;
187187
gc->chip_types[0].chip.irq_eoi = irq_gc_ack_set_bit;
188188
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;
190191
gc->chip_types[0].regs.ack = reg_offs->pend;
191192
gc->chip_types[0].regs.mask = reg_offs->enable;
192193
gc->chip_types[0].regs.type = reg_offs->ctrl;

drivers/irqchip/irqchip.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@ void __init irqchip_init(void)
3535
int platform_irqchip_probe(struct platform_device *pdev)
3636
{
3737
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);
3939
of_irq_init_cb_t irq_init_cb = of_device_get_match_data(&pdev->dev);
4040

4141
if (!irq_init_cb) {
42-
of_node_put(par_np);
4342
return -EINVAL;
4443
}
4544

@@ -55,7 +54,6 @@ int platform_irqchip_probe(struct platform_device *pdev)
5554
* interrupt controller can check for specific domains as necessary.
5655
*/
5756
if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) {
58-
of_node_put(par_np);
5957
return -EPROBE_DEFER;
6058
}
6159

0 commit comments

Comments
 (0)