PCI: dwc: Fix inner MSI IRQ domain registration
PATCH 1/1 PCI: dwc: Fix inner MSI IRQ domain registration
On a system that uses the internal DWC MSI widget, I get this warning from debugfs when CONFIG_GENERIC_IRQ_DEBUGFS is selected:
debugfs: File ':soc:pcie@fc000000' in directory 'domains' already present!
This is due to the fact that the DWC MSI code tries to register two IRQ domains for the same firmware node, without telling the low level code how to distinguish them (by setting a bus token). This further confuses debugfs which tries to create corresponding files for each domain.
Fix it by tagging the inner domain as DOMAIN_BUS_NEXUS, which is the closest thing we have as to "generic MSI".
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/controller/dwc/pcie-designware-host.c +2 -0
@@ -264,6 +264,8 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)return -ENOMEM ; } +irq_domain_update_bus_token (pp->irq_domain,DOMAIN_BUS_NEXUS ); + pp->msi_domain =pci_msi_create_irq_domain (fwnode, &dw_pcie_msi_domain_info, pp->irq_domain);
Signature · 1 line
2.26.2
Quoted 11 lines · Marc Zyngier
On a system that uses the internal DWC MSI widget, I get this warning from debugfs when
CONFIG_GENERIC_IRQ_DEBUGFSis selected:debugfs: File ':soc:pcie@fc000000' in directory 'domains' already present!
This is due to the fact that the DWC MSI code tries to register two IRQ domains for the same firmware node, without telling the low level code how to distinguish them (by setting a bus token). This further confuses debugfs which tries to create corresponding files for each domain.
Quoted 4 lines
Fix it by tagging the inner domain as
DOMAIN_BUS_NEXUS, which is the closest thing we have as to "generic MSI".Signed-off-by Marc Zyngier <[email protected]>
Quoted 19 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 ++ 1 file changed, 2 insertions(+)drivers/pci/controller/dwc/pcie-designware-host.c +2
-0@@ -264,6 +264,8 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)return -ENOMEM ; } +irq_domain_update_bus_token (pp->irq_domain,DOMAIN_BUS_NEXUS ); + pp->msi_domain =pci_msi_create_irq_domain (fwnode, &dw_pcie_msi_domain_info, pp->irq_domain);Signature · 1 line
2.26.2
Lorenzo Pieralisi
AppliedQuoted 11 lines · Marc Zyngier
On a system that uses the internal DWC MSI widget, I get this warning from debugfs when
CONFIG_GENERIC_IRQ_DEBUGFSis selected:debugfs: File ':soc:pcie@fc000000' in directory 'domains' already present!
This is due to the fact that the DWC MSI code tries to register two IRQ domains for the same firmware node, without telling the low level code how to distinguish them (by setting a bus token). This further confuses debugfs which tries to create corresponding files for each domain.
Quoted 7 lines
Fix it by tagging the inner domain as
DOMAIN_BUS_NEXUS, which is the closest thing we have as to "generic MSI".Signed-off-by Marc Zyngier <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 2 ++ 1 file changed, 2 insertions(+)
Applied to pci/dwc, thanks !
Lorenzo
Quoted 16 lines
drivers/pci/controller/dwc/pcie-designware-host.c +2
-0@@ -264,6 +264,8 @@ int dw_pcie_allocate_domains(struct pcie_port *pp)return -ENOMEM ; } +irq_domain_update_bus_token (pp->irq_domain,DOMAIN_BUS_NEXUS ); + pp->msi_domain =pci_msi_create_irq_domain (fwnode, &dw_pcie_msi_domain_info, pp->irq_domain);Signature · 1 line
2.26.2