Skip to content

Commit 0c7cae1

Browse files
committed
Merge tag 'irq-urgent-2025-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull misc irqchip fixes from Ingo Molnar: - Fix NULL pointer dereference crashes due to missing .chip_flags setup in the sg2042-msi and irq-bcm2712-mip irqchip drivers - Remove the davinci aintc irqchip driver's leftover header too * tag 'irq-urgent-2025-04-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip/irq-bcm2712-mip: Set EOI/ACK flags in msi_parent_ops irqchip/sg2042-msi: Add missing chip flags irqchip/davinci: Remove leftover header
2 parents 3483381 + f35508b commit 0c7cae1

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

drivers/irqchip/irq-bcm2712-mip.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ static const struct irq_domain_ops mip_middle_domain_ops = {
163163
static const struct msi_parent_ops mip_msi_parent_ops = {
164164
.supported_flags = MIP_MSI_FLAGS_SUPPORTED,
165165
.required_flags = MIP_MSI_FLAGS_REQUIRED,
166+
.chip_flags = MSI_CHIP_FLAG_SET_EOI | MSI_CHIP_FLAG_SET_ACK,
166167
.bus_select_token = DOMAIN_BUS_GENERIC_MSI,
167168
.bus_select_mask = MATCH_PCI_MSI,
168169
.prefix = "MIP-MSI-",

drivers/irqchip/irq-sg2042-msi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ static const struct irq_domain_ops sg2042_msi_middle_domain_ops = {
151151
static const struct msi_parent_ops sg2042_msi_parent_ops = {
152152
.required_flags = SG2042_MSI_FLAGS_REQUIRED,
153153
.supported_flags = SG2042_MSI_FLAGS_SUPPORTED,
154+
.chip_flags = MSI_CHIP_FLAG_SET_ACK,
154155
.bus_select_mask = MATCH_PCI_MSI,
155156
.bus_select_token = DOMAIN_BUS_NEXUS,
156157
.prefix = "SG2042-",

include/linux/irqchip/irq-davinci-aintc.h

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)