github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Miscellaneous irqchip fixes:

Browse Source 
- 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
 
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCgAvFiEEBpT5eoXrXCwVQwEKEnMQ0APhK1gFAmf4OisRHG1pbmdvQGtl
 cm5lbC5vcmcACgkQEnMQ0APhK1ge9w//etBwzt31ZoVcVQvIG3B0k0hn/wE8m2bE
 N3sTWvI5q/BzF35uir0r0icwQLjmbHBjGOyoxtwDLDgU2Kp4MAQlXPZ1Txybu3RU
 nWxHSYCyYzIKexA9kp4uhY0EU0r2fJFaDZGEfNr5kSGe5QGorhw1DaKHCcWOB2sb
 Ni6E2amJDwoP8J4q2onyP7/Vq7wqYFSHMSF1V3qSj0qiTbjNUB0YlrgNHxVxMa9E
 +sP9xi2IzvqrUqp+WmRd9CIXYR/NHB1jcCcwszyRiKR1XUp5C+sU0U/sRj1f/a2d
 fPWQbhCbpHnwm6rUNCm61cpsQAit3dBrEnH7SpuirSbWZp22s/L2h2caCImDihRK
 p8z4gv/gam7t89PihQnORlLq/ViGboP8TXpNOG94ZhQ4zGcDvlKfyXxmyK66oDIn
 G1MN0aDDIqDdfxi3Fo67WkjI4jkbRt0ju+o2tiOfwCE0gJb8wSZPmN4ECBn8mBE0
 Xw5dVw4rDrjHf4nbduTMof5YG9rfqKHzfyZzmVrs6uELi96QNEheTGst+9G1qOCo
 PZZ24KZMjlogsN5CsIK7BMWogBe8VJtAXEGqZEBMfkn4mhvnHaN1QYY4fAyFvTSx
 qR796zM6fhkfvaDkHbT9gJA8SHsExK/CwM20ImGUXtMBdyHKgCvPO5DfUc6dzZfQ
 PRf3vJmYIgc=
 =MrnK
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-04-10 15:47:46 -07:00
commit 0c7cae12f6
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/irqchip/irq-bcm2712-mip.c
View File

@ -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-",

1
drivers/irqchip/irq-sg2042-msi.c
View File

@ -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-",

27
include/linux/irqchip/irq-davinci-aintc.h
View File

@ -1,27 +0,0 @@
/* 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_ */