Commit 0c7cae12 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 34833819 f35508b9

drivers/irqchip/irq-bcm2712-mip.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static const struct irq_domain_ops mip_middle_domain_ops = { 
static const struct msi_parent_ops mip_msi_parent_ops = {

	.supported_flags	= MIP_MSI_FLAGS_SUPPORTED,

	.required_flags		= MIP_MSI_FLAGS_REQUIRED,

	.chip_flags		= MSI_CHIP_FLAG_SET_EOI | MSI_CHIP_FLAG_SET_ACK,

	.bus_select_token       = DOMAIN_BUS_GENERIC_MSI,

	.bus_select_mask	= MATCH_PCI_MSI,

	.prefix			= "MIP-MSI-",

drivers/irqchip/irq-sg2042-msi.c

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static const struct irq_domain_ops sg2042_msi_middle_domain_ops = { 
static const struct msi_parent_ops sg2042_msi_parent_ops = {

	.required_flags		= SG2042_MSI_FLAGS_REQUIRED,

	.supported_flags	= SG2042_MSI_FLAGS_SUPPORTED,

	.chip_flags		= MSI_CHIP_FLAG_SET_ACK,

	.bus_select_mask	= MATCH_PCI_MSI,

	.bus_select_token	= DOMAIN_BUS_NEXUS,

	.prefix			= "SG2042-",

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

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copyright (C) 2019 Texas Instruments

 */



#ifndef _LINUX_IRQ_DAVINCI_AINTC_

#define _LINUX_IRQ_DAVINCI_AINTC_



#include <linux/ioport.h>



/**

 * struct davinci_aintc_config - configuration data for davinci-aintc driver.

 *

 * @reg: register range to map

 * @num_irqs: number of HW interrupts supported by the controller

 * @prios: an array of size num_irqs containing priority settings for

 *         each interrupt

 */

struct davinci_aintc_config {

	struct resource reg;

	unsigned int num_irqs;

	u8 *prios;

};



void davinci_aintc_init(const struct davinci_aintc_config *config);



#endif /* _LINUX_IRQ_DAVINCI_AINTC_ */