Skip to content

Commit eadaac4

Browse files
committed
Merge tag 'irq_urgent_for_v6.13_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Borislav Petkov: - Fix a /proc/interrupts formatting regression - Have the BCM2836 interrupt controller enter power management states properly - Other fixlets * tag 'irq_urgent_for_v6.13_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/stm32mp-exti: CONFIG_STM32MP_EXTI should not default to y when compile-testing genirq/proc: Add missing space separator back irqchip/bcm2836: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND irqchip/gic-v3: Fix irq_complete_ack() comment
2 parents c25ca0c + 9151299 commit eadaac4

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

drivers/irqchip/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ config PARTITION_PERCPU
415415
config STM32MP_EXTI
416416
tristate "STM32MP extended interrupts and event controller"
417417
depends on (ARCH_STM32 && !ARM_SINGLE_ARMV7M) || COMPILE_TEST
418-
default y
418+
default ARCH_STM32 && !ARM_SINGLE_ARMV7M
419419
select IRQ_DOMAIN_HIERARCHY
420420
select GENERIC_IRQ_CHIP
421421
help

drivers/irqchip/irq-bcm2836.c

+3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ static struct irq_chip bcm2836_arm_irqchip_timer = {
5858
.name = "bcm2836-timer",
5959
.irq_mask = bcm2836_arm_irqchip_mask_timer_irq,
6060
.irq_unmask = bcm2836_arm_irqchip_unmask_timer_irq,
61+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
6162
};
6263

6364
static void bcm2836_arm_irqchip_mask_pmu_irq(struct irq_data *d)
@@ -74,6 +75,7 @@ static struct irq_chip bcm2836_arm_irqchip_pmu = {
7475
.name = "bcm2836-pmu",
7576
.irq_mask = bcm2836_arm_irqchip_mask_pmu_irq,
7677
.irq_unmask = bcm2836_arm_irqchip_unmask_pmu_irq,
78+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
7779
};
7880

7981
static void bcm2836_arm_irqchip_mask_gpu_irq(struct irq_data *d)
@@ -88,6 +90,7 @@ static struct irq_chip bcm2836_arm_irqchip_gpu = {
8890
.name = "bcm2836-gpu",
8991
.irq_mask = bcm2836_arm_irqchip_mask_gpu_irq,
9092
.irq_unmask = bcm2836_arm_irqchip_unmask_gpu_irq,
93+
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
9194
};
9295

9396
static void bcm2836_arm_irqchip_dummy_op(struct irq_data *d)

drivers/irqchip/irq-gic-v3.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ static void gic_deactivate_unhandled(u32 irqnr)
817817
* register state is not stale, as these may have been indirectly written
818818
* *after* exception entry.
819819
*
820-
* (2) Deactivate the interrupt when EOI mode 1 is in use.
820+
* (2) Execute an interrupt priority drop when EOI mode 1 is in use.
821821
*/
822822
static inline void gic_complete_ack(u32 irqnr)
823823
{

kernel/irq/proc.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -501,17 +501,18 @@ int show_interrupts(struct seq_file *p, void *v)
501501

502502
seq_put_decimal_ull_width(p, " ", cnt, 10);
503503
}
504+
seq_putc(p, ' ');
504505

505506
raw_spin_lock_irqsave(&desc->lock, flags);
506507
if (desc->irq_data.chip) {
507508
if (desc->irq_data.chip->irq_print_chip)
508509
desc->irq_data.chip->irq_print_chip(&desc->irq_data, p);
509510
else if (desc->irq_data.chip->name)
510-
seq_printf(p, " %8s", desc->irq_data.chip->name);
511+
seq_printf(p, "%8s", desc->irq_data.chip->name);
511512
else
512-
seq_printf(p, " %8s", "-");
513+
seq_printf(p, "%8s", "-");
513514
} else {
514-
seq_printf(p, " %8s", "None");
515+
seq_printf(p, "%8s", "None");
515516
}
516517
if (desc->irq_data.domain)
517518
seq_printf(p, " %*lu", prec, desc->irq_data.hwirq);

0 commit comments

Comments
 (0)