Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 02:36:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fix a /proc/interrupts formatting regression

Browse Source 
- Have the BCM2836 interrupt controller enter power management states properly
 
 - Other fixlets
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAmdVeI0ACgkQEsHwGGHe
 VUpE9A/9Gs2K9ImUlQu5giKEM2dhu0U/oEN/KNKayd6mjSR4MWEovvMeE16M2AUA
 uALQVxCviJKy6vl5J2aYw5QIhktfGwrdmr4zGK61pfhGWD8dClaCxJpbfUvtx1Bu
 1K9U8PpSh1grScbcjDFBOIIzHsmQgpHFTJxVwktLXEktJsWJyzhxqvdiduMXvDlF
 T5WOIr/A5MwGtoP0kySQA49k0ymgUkXf1UgAl7nTksLEI50SMo3Wt7vpQ+qLk6xD
 3RdywlARaVOLY5GlRsFtUTZP6o06/8aDrEmrUHnOiip9u7pKzMiJR4aKzlScCdTN
 BRKEegLxgJqA0uvQAfYP7kCP4l5fFAAVHmcenZCuXDlcexJsnLxYJChxJKUK7CAt
 wCMZifysp13aF3gyT6BfNKEPZOEqFDykxUvzT/F1d2t0Z7yq1GHIXcDHC8eG0p2H
 3f/YOSi+5KgDTi+xzT1hOPn3HcTADhF7wrj2oppOmJa/FyJVrRVeL+DP+uNPD+ux
 tMlVknBp3nlYQ4Ll773GZmvdaamkUfw9U5eZRi04CrvVOcanq/KjKIL24bq9ODS0
 i6dgPfZPwYI+nuenGv7VEpgo92/oynqGxuShESk1c1S/rCL+D2kMiNaRvR9cVsU3
 +Gvr2v9B0KqLy79gw9Fhdqzbhnzhkcpa72B4JNJwEtHdO+t4iwI=
 =Uyoi
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-12-08 11:54:04 -08:00
commit eadaac4dd2
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/irqchip/Kconfig
View File

@ -415,7 +415,7 @@ config PARTITION_PERCPU
config STM32MP_EXTI config STM32MP_EXTI
tristate "STM32MP extended interrupts and event controller" tristate "STM32MP extended interrupts and event controller"
depends on (ARCH_STM32 && !ARM_SINGLE_ARMV7M) || COMPILE_TEST depends on (ARCH_STM32 && !ARM_SINGLE_ARMV7M) || COMPILE_TEST
default y default ARCH_STM32 && !ARM_SINGLE_ARMV7M
select IRQ_DOMAIN_HIERARCHY select IRQ_DOMAIN_HIERARCHY
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
help help

3
drivers/irqchip/irq-bcm2836.c
View File

@ -58,6 +58,7 @@ static struct irq_chip bcm2836_arm_irqchip_timer = {
.name = "bcm2836-timer", .name = "bcm2836-timer",
.irq_mask = bcm2836_arm_irqchip_mask_timer_irq, .irq_mask = bcm2836_arm_irqchip_mask_timer_irq,
.irq_unmask = bcm2836_arm_irqchip_unmask_timer_irq, .irq_unmask = bcm2836_arm_irqchip_unmask_timer_irq,
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
}; };
static void bcm2836_arm_irqchip_mask_pmu_irq(struct irq_data *d) static void bcm2836_arm_irqchip_mask_pmu_irq(struct irq_data *d)
@ -74,6 +75,7 @@ static struct irq_chip bcm2836_arm_irqchip_pmu = {
.name = "bcm2836-pmu", .name = "bcm2836-pmu",
.irq_mask = bcm2836_arm_irqchip_mask_pmu_irq, .irq_mask = bcm2836_arm_irqchip_mask_pmu_irq,
.irq_unmask = bcm2836_arm_irqchip_unmask_pmu_irq, .irq_unmask = bcm2836_arm_irqchip_unmask_pmu_irq,
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
}; };
static void bcm2836_arm_irqchip_mask_gpu_irq(struct irq_data *d) static void bcm2836_arm_irqchip_mask_gpu_irq(struct irq_data *d)
@ -88,6 +90,7 @@ static struct irq_chip bcm2836_arm_irqchip_gpu = {
.name = "bcm2836-gpu", .name = "bcm2836-gpu",
.irq_mask = bcm2836_arm_irqchip_mask_gpu_irq, .irq_mask = bcm2836_arm_irqchip_mask_gpu_irq,
.irq_unmask = bcm2836_arm_irqchip_unmask_gpu_irq, .irq_unmask = bcm2836_arm_irqchip_unmask_gpu_irq,
.flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_SKIP_SET_WAKE,
}; };
static void bcm2836_arm_irqchip_dummy_op(struct irq_data *d) static void bcm2836_arm_irqchip_dummy_op(struct irq_data *d)

2
drivers/irqchip/irq-gic-v3.c
View File

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

7
kernel/irq/proc.c
View File

@ -501,17 +501,18 @@ int show_interrupts(struct seq_file *p, void *v)
seq_put_decimal_ull_width(p, " ", cnt, 10); seq_put_decimal_ull_width(p, " ", cnt, 10);
} }
seq_putc(p, ' ');
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
if (desc->irq_data.chip) { if (desc->irq_data.chip) {
if (desc->irq_data.chip->irq_print_chip) if (desc->irq_data.chip->irq_print_chip)
desc->irq_data.chip->irq_print_chip(&desc->irq_data, p); desc->irq_data.chip->irq_print_chip(&desc->irq_data, p);
else if (desc->irq_data.chip->name) else if (desc->irq_data.chip->name)
seq_printf(p, " %8s", desc->irq_data.chip->name); seq_printf(p, "%8s", desc->irq_data.chip->name);
else else
seq_printf(p, " %8s", "-"); seq_printf(p, "%8s", "-");
} else { } else {
seq_printf(p, " %8s", "None"); seq_printf(p, "%8s", "None");
} }
if (desc->irq_data.domain) if (desc->irq_data.domain)
seq_printf(p, " %*lu", prec, desc->irq_data.hwirq); seq_printf(p, " %*lu", prec, desc->irq_data.hwirq);