Skip to contentSkip to conversation

irqchip/irq-mvebu-icu: Fix access to msi_data from irq_domain

PATCH Applied Stefan Eichenberger 3 participants 3 messages Jan 24, 2025 – Jan 27, 2025

Subsystems (3)
Stable branch irqchip drivers Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Stefan Eichenberger

author
#0 lore raw

PATCH v2 1/1 irqchip/irq-mvebu-icu: Fix access to msi_data from irq_domain

Previously, we incorrectly cast irq_domain->host_data directly to mvebu_icu_msi_data. However, host_data actually stores a structure of type msi_domain_info.

This incorrect assumption caused issues such as the thermal sensors of
the CP110 platform malfunctioning. Specifically, the translation of the
SEI interrupt to IRQ_TYPE_EDGE_RISING failed, preventing proper
interrupt handling. The following error was observed:
genirq: Setting trigger mode 4 for irq 85 failed (irq_chip_set_type_parent+0x0/0x34) armada_thermal f2400000.system-controller:thermal-sensor@70: Cannot request threaded IRQ 85

This commit resolves the issue by first casting host_data to msi_domain_info and then accessing the mvebu_icu_msi_data through msi_domain_info->chip_data.

Cc [email protected]
Fixes d929e4db22b6 ("irqchip/irq-mvebu-icu: Prepare for real per device MSI")
Signed-off-by Stefan Eichenberger <[email protected]>

---
Changes in v2:
* This patch is a v2 because it addresses the same issue as this patch:
https://lore.kernel.org/all/[email protected]/
* This time it addresses the underlying issue instead of adding a workaround (thanks to Thomas)

 drivers/irqchip/irq-mvebu-icu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/irqchip/irq-mvebu-icu.c +2 -1
index b337f6c05f18..4eebed39880a 100644
@@ -68,7 +68,8 @@ static int mvebu_icu_translate(struct irq_domain *d, struct irq_fwspec *fwspec,
 			       unsigned long *hwirq, unsigned int *type)
 {
 	unsigned int param_count = static_branch_unlikely(&legacy_bindings) ? 3 : 2;
-	struct mvebu_icu_msi_data *msi_data = d->host_data;
+	struct msi_domain_info *info = d->host_data;
+	struct mvebu_icu_msi_data *msi_data = info->chip_data;
 	struct mvebu_icu *icu = msi_data->icu;
 
 	/* Check the count of the parameters in dt */
Signature · 1 line
2.45.2
merge bot Applied
#1 lore raw

[tip: irq/urgent] irqchip/irq-mvebu-icu: Fix access to msi_data from irq_domain::host_data

The following commit has been merged into the irq/urgent branch of tip:

The following commit has been merged into the irq/urgent branch of tip:

Commit-ID:     987f379b54091cc1b1db986bde71cee1081350b3
Gitweb:        https://git.kernel.org/tip/987f379b54091cc1b1db986bde71cee1081350b3
Author:        Stefan Eichenberger <[email protected]>
AuthorDate:    Fri, 24 Jan 2025 09:50:39 +01:00
Committer:     Thomas Gleixner <[email protected]>
CommitterDate: Mon, 27 Jan 2025 11:07:03 +01:00

irqchip/irq-mvebu-icu: Fix access to msi_data from irq_domain::host_data

mvebu_icu_translate() incorrectly casts irq_domain::host_data directly to mvebu_icu_msi_data. However, host_data actually points to a structure of type msi_domain_info.

This incorrect cast causes issues such as the thermal sensors of the CP110 platform malfunctioning. Specifically, the translation of the SEI interrupt to IRQ_TYPE_EDGE_RISING fails, preventing proper interrupt handling. The following error was observed:

genirq: Setting trigger mode 4 for irq 85 failed (irq_chip_set_type_parent+0x0/0x34) armada_thermal f2400000.system-controller:thermal-sensor@70: Cannot request threaded IRQ 85

Resolve the issue by first casting host_data to msi_domain_info and then accessing mvebu_icu_msi_data through msi_domain_info::chip_data.

Fixes d929e4db22b6 ("irqchip/irq-mvebu-icu: Prepare for real per device MSI")
Signed-off-by Stefan Eichenberger <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Cc [email protected]
Link https://lore.kernel.org/all/[email protected] open here
---
 drivers/irqchip/irq-mvebu-icu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/irqchip/irq-mvebu-icu.c +2 -1
index b337f6c..4eebed3 100644
@@ -68,7 +68,8 @@ static int mvebu_icu_translate(struct irq_domain *d, struct irq_fwspec *fwspec,
 			       unsigned long *hwirq, unsigned int *type)
 {
 	unsigned int param_count = static_branch_unlikely(&legacy_bindings) ? 3 : 2;
-	struct mvebu_icu_msi_data *msi_data = d->host_data;
+	struct msi_domain_info *info = d->host_data;
+	struct mvebu_icu_msi_data *msi_data = info->chip_data;
 	struct mvebu_icu *icu = msi_data->icu;
 
 	/* Check the count of the parameters in dt */
#2 lore raw
In reply to Stefan Eichenberger
Quoted 1 line · Stefan Eichenberger

Previously, we incorrectly cast irq_domain->host_data directly to

Previously 'we' do nothing. The current implementation casts inconrrectly.

Quoted 11 lines

mvebu_icu_msi_data. However, host_data actually stores a structure of type msi_domain_info.

This incorrect assumption caused issues such as the thermal sensors of
the CP110 platform malfunctioning. Specifically, the translation of the
SEI interrupt to IRQ_TYPE_EDGE_RISING failed, preventing proper
interrupt handling. The following error was observed:
genirq: Setting trigger mode 4 for irq 85 failed (irq_chip_set_type_parent+0x0/0x34) armada_thermal f2400000.system-controller:thermal-sensor@70: Cannot request threaded IRQ 85

This commit resolves the issue by first casting host_data to

This commit is equally wrong as 'This patch'. See Documentation/process/

Quoted 2 lines

msi_domain_info and then accessing the mvebu_icu_msi_data through msi_domain_info->chip_data.

I fixed it up for you.

Thanks,

tglx