summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBharat Kumar Gogada2016-09-01 12:14:43 +0200
committerBjorn Helgaas2016-09-13 17:39:21 +0200
commit8a4036edf9463b6cf8c2537727b4511c4411d198 (patch)
treeabab1f4016b1267d0a5a6088bc127609a6fe9627 /drivers/pci
parentPCI: xilinx: Clear interrupt register for invalid interrupt (diff)
downloadkernel-qcow2-linux-8a4036edf9463b6cf8c2537727b4511c4411d198.tar.gz
kernel-qcow2-linux-8a4036edf9463b6cf8c2537727b4511c4411d198.tar.xz
kernel-qcow2-linux-8a4036edf9463b6cf8c2537727b4511c4411d198.zip
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/pcie-xilinx.c6
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)
{
struct msi_desc *msi;
struct xilinx_pcie_port *port;
+ struct irq_data *d = irq_get_irq_data(irq);
+ irq_hw_number_t hwirq = irqd_to_hwirq(d);
- if (!test_bit(irq, msi_irq_in_use)) {
+ if (!test_bit(hwirq, msi_irq_in_use)) {
msi = irq_get_msi_desc(irq);
port = msi_desc_to_pci_sysdata(msi);
dev_err(port->dev, "Trying to free unused MSI#%d\n", irq);
} else {
- clear_bit(irq, msi_irq_in_use);
+ clear_bit(hwirq, msi_irq_in_use);
}
}