powerpc: pci-ioda: Fix the stale irq chip reference
PATCH 1/1 powerpc: pci-ioda: Fix the stale irq chip reference
The commit f0ac60e6e311 ("powerpc/powernv/pci: Switch to use msi_create_parent_irq_domain()") removed the legacy MSI irq chip pnv_pci_msi_irq_chip but left behind the static definition of it and its reference in is_pnv_opal_msi().
The KVM IRQ bypass for vfio devices is broken because the comparision in is_pnv_opal_msi() fails on the comparision with stale unused variable showing the below errors in dmesg.
kvmppc_set_passthru_irq_hv: Could not assign IRQ map for (X,Y) kvmppc_set_passthru_irq (irq X, gsi Y) fails: -2
vfio-pci A:B:C.D irq bypass producer (eventfd Z) registration fails: -2
The patch removes the stale variable definition and fixes the is_pnv_opal_msi() by comparing against the chip name prefix.
--- arch/powerpc/platforms/powernv/pci-ioda.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +2 -4
@@ -1623,15 +1623,13 @@ int64_t pnv_opal_pci_msi_eoi(struct irq_data *d)return opal_pci_msi_eoi (phb->opal_id, d->parent_data->hwirq); } -static struct irq_chip pnv_pci_msi_irq_chip; -/* * Returns true iff chip is something that we could call * pnv_opal_pci_msi_eoi for. */ bool is_pnv_opal_msi (struct irq_chip *chip) { -return chip == &pnv_pci_msi_irq_chip; +return chip && chip->name &&str_has_prefix (chip->name,"PNV-" ); }EXPORT_SYMBOL_GPL (is_pnv_opal_msi);
@@ -1728,7 +1726,7 @@ static const struct msi_parent_ops pnv_msi_parent_ops = { .chip_flags = MSI_CHIP_FLAG_SET_EOI, .bus_select_token = DOMAIN_BUS_NEXUS, .bus_select_mask = MATCH_PCI_MSI, - .prefix = "PNV-", + .prefix = "PNV-", /* Note: is_pnv_opal_msi() uses this */ .init_dev_msi_info = pnv_init_dev_msi_info, };
Quoted 45 lines · Shivaprasad G Bhat
The commit
f0ac60e6e311("powerpc/powernv/pci: Switch to usemsi_create_parent_irq_domain()") removed the legacy MSI irq chippnv_pci_msi_irq_chipbut left behind the static definition of it and its reference inis_pnv_opal_msi().The KVM IRQ bypass for vfio devices is broken because the comparision in
is_pnv_opal_msi()fails on the comparision with stale unused variable showing the below errors in dmesg.
kvmppc_set_passthru_irq_hv: Could not assign IRQ map for (X,Y)kvmppc_set_passthru_irq(irq X, gsi Y) fails: -2
vfio-pci A:B:C.D irq bypass producer (eventfd Z) registration fails: -2The patch removes the stale variable definition and fixes the
is_pnv_opal_msi()by comparing against the chip name prefix.Fixes f0ac60e6e311 ("powerpc/powernv/pci: Switch to use msi_create_parent_irq_domain()")Signed-off-by Shivaprasad G Bhat <[email protected]>--- arch/powerpc/platforms/powernv/pci-ioda.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)arch/powerpc/platforms/powernv/pci-ioda.c +1
-3@@ -1623,15 +1623,13 @@ int64_t pnv_opal_pci_msi_eoi(struct irq_data *d)return opal_pci_msi_eoi (phb->opal_id, d->parent_data->hwirq); } -static struct irq_chip pnv_pci_msi_irq_chip; -/* * Returns true iff chip is something that we could call * pnv_opal_pci_msi_eoi for. */ bool is_pnv_opal_msi (struct irq_chip *chip) { -return chip == &pnv_pci_msi_irq_chip; +return chip && chip->name &&str_has_prefix (chip->name,"PNV-" ); }EXPORT_SYMBOL_GPL (is_pnv_opal_msi);
arch/powerpc/platforms/powernv/pci-ioda.c static const struct msi_parent_ops pnv_msi_parent_ops = { · line 1732
Quoted 8 lines
arch/powerpc/platforms/powernv/pci-ioda.c +1
-1@@ -1728,7 +1726,7 @@ static const struct msi_parent_ops pnv_msi_parent_ops = { .chip_flags = MSI_CHIP_FLAG_SET_EOI, .bus_select_token = DOMAIN_BUS_NEXUS, .bus_select_mask = MATCH_PCI_MSI, - .prefix = "PNV-", + .prefix = "PNV-", /* Note: is_pnv_opal_msi() uses this */ .init_dev_msi_info = pnv_init_dev_msi_info, };
I boot tested this patch on KVM on PowerNV (P9) and KVM on LPAR (P10), with the USB controller passed through to the guest.
The warnings are not observed.
Quoted 10 lines · Shivaprasad G Bhat
The commit
f0ac60e6e311("powerpc/powernv/pci: Switch to usemsi_create_parent_irq_domain()") removed the legacy MSI irq chippnv_pci_msi_irq_chipbut left behind the static definition of it and its reference inis_pnv_opal_msi().The KVM IRQ bypass for vfio devices is broken because the comparision in
is_pnv_opal_msi()fails on the comparision with stale unused variable showing the below errors in dmesg.[...]
Applied to powerpc/fixes.
[1/1] powerpc: pci-ioda: Fix the stale irq chip reference
https://git.kernel.org/powerpc/c/d96171d911e3b89ca2957c04264019cf2f96287b
cheers