hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc: pci_endpoint_test: Fix BUG_ON error during pci_disable_msi() 

pci_disable_msi() throws a Kernel BUG if the driver has successfully
requested an IRQ and not released it. Fix it here by freeing IRQs before
invoking pci_disable_msi().

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Kishon Vijay Abraham I 2017-10-11 14:14:38 +05:30 committed by Bjorn Helgaas
parent 139838fffe
commit b7636e816a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/misc/pci_endpoint_test.c
View File

@ -92,6 +92,7 @@ struct pci_endpoint_test {
void __iomem *bar[6]; void __iomem *bar[6];
struct completion irq_raised; struct completion irq_raised;
int last_irq; int last_irq;
int num_irqs;
/* mutex to protect the ioctls */ /* mutex to protect the ioctls */
struct mutex mutex; struct mutex mutex;
struct miscdevice miscdev; struct miscdevice miscdev;
@ -513,6 +514,7 @@ static int pci_endpoint_test_probe(struct pci_dev *pdev,
irq = pci_alloc_irq_vectors(pdev, 1, 32, PCI_IRQ_MSI); irq = pci_alloc_irq_vectors(pdev, 1, 32, PCI_IRQ_MSI);
if (irq < 0) if (irq < 0)
dev_err(dev, "failed to get MSI interrupts\n"); dev_err(dev, "failed to get MSI interrupts\n");
test->num_irqs = irq;
} }
err = devm_request_irq(dev, pdev->irq, pci_endpoint_test_irqhandler, err = devm_request_irq(dev, pdev->irq, pci_endpoint_test_irqhandler,
@ -587,6 +589,9 @@ err_iounmap:
pci_iounmap(pdev, test->bar[bar]); pci_iounmap(pdev, test->bar[bar]);
} }
for (i = 0; i < irq; i++)
devm_free_irq(dev, pdev->irq + i, test);
err_disable_msi: err_disable_msi:
pci_disable_msi(pdev); pci_disable_msi(pdev);
pci_release_regions(pdev); pci_release_regions(pdev);
@ -600,6 +605,7 @@ err_disable_pdev:
static void pci_endpoint_test_remove(struct pci_dev *pdev) static void pci_endpoint_test_remove(struct pci_dev *pdev)
{ {
int id; int id;
int i;
enum pci_barno bar; enum pci_barno bar;
struct pci_endpoint_test *test = pci_get_drvdata(pdev); struct pci_endpoint_test *test = pci_get_drvdata(pdev);
struct miscdevice *misc_device = &test->miscdev; struct miscdevice *misc_device = &test->miscdev;
@ -616,6 +622,8 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
if (test->bar[bar]) if (test->bar[bar])
pci_iounmap(pdev, test->bar[bar]); pci_iounmap(pdev, test->bar[bar]);
} }
for (i = 0; i < test->num_irqs; i++)
devm_free_irq(&pdev->dev, pdev->irq + i, test);
pci_disable_msi(pdev); pci_disable_msi(pdev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);