frodovdr
/
dddvb
mirror of https://github.com/DigitalDevices/dddvb.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix MSI handling for older kernels

This commit is contained in:
Ralph Metzler 2018-01-16 23:54:51 +01:00
parent caa1dbecce
commit e19f29dbfa
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ddbridge/ddbridge-main.c
View File

@ -32,6 +32,8 @@ MODULE_PARM_DESC(msi,
#endif #endif
#if (KERNEL_VERSION(4, 8, 0) > LINUX_VERSION_CODE) #if (KERNEL_VERSION(4, 8, 0) > LINUX_VERSION_CODE)
#include <linux/msi.h>
int pci_irq_vector(struct pci_dev *dev, unsigned int nr) int pci_irq_vector(struct pci_dev *dev, unsigned int nr)
{ {
if (dev->msix_enabled) { if (dev->msix_enabled) {
@ -80,18 +82,25 @@ static void __devexit ddb_irq_disable(struct ddb *dev)
} }
} }
static void __devexit ddb_msi_exit(struct ddb *dev)
{
#ifdef CONFIG_PCI_MSI
if (dev->msi) {
#if (KERNEL_VERSION(4, 8, 0) <= LINUX_VERSION_CODE)
pci_free_irq_vectors(dev->pdev);
#else
pci_disable_msi(dev->pdev);
#endif
}
#endif
}
static void __devexit ddb_irq_exit(struct ddb *dev) static void __devexit ddb_irq_exit(struct ddb *dev)
{ {
ddb_irq_disable(dev); ddb_irq_disable(dev);
if (dev->msi == 2) if (dev->msi == 2)
free_irq(pci_irq_vector(dev->pdev, 1), dev); free_irq(pci_irq_vector(dev->pdev, 1), dev);
free_irq(pci_irq_vector(dev->pdev, 0), dev); free_irq(pci_irq_vector(dev->pdev, 0), dev);
#ifdef CONFIG_PCI_MSI
if (dev->msi) {
pci_free_irq_vectors(dev->pdev);
pci_disable_msi(dev->pdev);
}
#endif
} }
static void __devexit ddb_remove(struct pci_dev *pdev) static void __devexit ddb_remove(struct pci_dev *pdev)
@ -106,6 +115,7 @@ static void __devexit ddb_remove(struct pci_dev *pdev)
if (dev->link[0].info->ns_num) if (dev->link[0].info->ns_num)
ddbwritel(dev, 0, ETHER_CONTROL); ddbwritel(dev, 0, ETHER_CONTROL);
ddb_irq_exit(dev); ddb_irq_exit(dev);
ddb_msi_exit(dev);
ddb_ports_release(dev); ddb_ports_release(dev);
ddb_buffers_free(dev); ddb_buffers_free(dev);
@ -351,8 +361,7 @@ static int __devinit ddb_probe(struct pci_dev *pdev,
ddb_irq_exit(dev); ddb_irq_exit(dev);
fail0: fail0:
dev_err(dev->dev, "fail0\n"); dev_err(dev->dev, "fail0\n");
if (dev->msi) ddb_msi_exit(dev);
pci_disable_msi(dev->pdev);
fail: fail:
dev_err(dev->dev, "fail\n"); dev_err(dev->dev, "fail\n");