diff options
author | Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com> | 2016-09-01 06:14:43 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-09-13 11:39:21 -0400 |
commit | 8a4036edf9463b6cf8c2537727b4511c4411d198 (patch) | |
tree | abab1f4016b1267d0a5a6088bc127609a6fe9627 | |
parent | 3cd049ab9edd48a41955b8d05f0bc57ead918456 (diff) |
PCI: xilinx: Clear correct MSI set bit
Kernel provides virtual IRQ number at teardown. Get hwirq number from
virtual IRQ and clear correct MSI set bit.
Signed-off-by: Bharat Kumar Gogada <bharatku@xilinx.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r-- | drivers/pci/host/pcie-xilinx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index de1c758d17d7..ec2844aeecce 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c | |||
@@ -221,13 +221,15 @@ static void xilinx_pcie_destroy_msi(unsigned int irq) | |||
221 | { | 221 | { |
222 | struct msi_desc *msi; | 222 | struct msi_desc *msi; |
223 | struct xilinx_pcie_port *port; | 223 | struct xilinx_pcie_port *port; |
224 | struct irq_data *d = irq_get_irq_data(irq); | ||
225 | irq_hw_number_t hwirq = irqd_to_hwirq(d); | ||
224 | 226 | ||
225 | if (!test_bit(irq, msi_irq_in_use)) { | 227 | if (!test_bit(hwirq, msi_irq_in_use)) { |
226 | msi = irq_get_msi_desc(irq); | 228 | msi = irq_get_msi_desc(irq); |
227 | port = msi_desc_to_pci_sysdata(msi); | 229 | port = msi_desc_to_pci_sysdata(msi); |
228 | dev_err(port->dev, "Trying to free unused MSI#%d\n", irq); | 230 | dev_err(port->dev, "Trying to free unused MSI#%d\n", irq); |
229 | } else { | 231 | } else { |
230 | clear_bit(irq, msi_irq_in_use); | 232 | clear_bit(hwirq, msi_irq_in_use); |
231 | } | 233 | } |
232 | } | 234 | } |
233 | 235 | ||