Page MenuHomeFreeBSD
Files F153728912

D21008.id60497.diff
No OneTemporary
Actions

D21008.id60497.diff
View Options

Index: sys/compat/linuxkpi/common/include/linux/device.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/device.h
+++ sys/compat/linuxkpi/common/include/linux/device.h
@@ -110,8 +110,8 @@
void *driver_data;
unsigned int irq;
#define LINUX_IRQ_INVALID 65535
- unsigned int msix;
- unsigned int msix_max;
+ unsigned int irq_start;
+ unsigned int irq_end;
const struct attribute_group **groups;
struct fwnode_handle *fwnode;
Index: sys/compat/linuxkpi/common/include/linux/interrupt.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/interrupt.h
+++ sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -55,9 +55,11 @@
static inline int
linux_irq_rid(struct device *dev, unsigned int irq)
{
- if (irq == dev->irq)
+ /* check for MSI- or MSIX- interrupt */
+ if (irq >= dev->irq_start && irq < dev->irq_end)
+ return (irq - dev->irq_start + 1);
+ else
return (0);
- return irq - dev->msix + 1;
}
extern void linux_irq_handler(void *);
Index: sys/compat/linuxkpi/common/include/linux/pci.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/pci.h
+++ sys/compat/linuxkpi/common/include/linux/pci.h
@@ -261,7 +261,7 @@
spin_lock(&pci_lock);
list_for_each_entry(pdev, &pci_devices, links) {
if (irq == pdev->dev.irq ||
- (irq >= pdev->dev.msix && irq < pdev->dev.msix_max)) {
+ (irq >= pdev->dev.irq_start && irq < pdev->dev.irq_end)) {
found = &pdev->dev;
break;
}
@@ -443,10 +443,30 @@
* linux_pci_find_irq_dev() does no longer see them by
* resetting their references to zero:
*/
- pdev->dev.msix = 0;
- pdev->dev.msix_max = 0;
+ pdev->dev.irq_start = 0;
+ pdev->dev.irq_end = 0;
}
+#define pci_disable_msi(pdev) \
+ linux_pci_disable_msi(pdev)
+
+static inline void
+linux_pci_disable_msi(struct pci_dev *pdev)
+{
+ struct resource_list_entry *rle;
+
+ pci_release_msi(pdev->dev.bsddev);
+
+ pdev->dev.irq_start = 0;
+ pdev->dev.irq_end = 0;
+
+ rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 0);
+ if (rle != NULL)
+ pdev->dev.irq = rle->start;
+ else
+ pdev->dev.irq = LINUX_IRQ_INVALID;
+}
+
static inline bus_addr_t
pci_bus_address(struct pci_dev *pdev, int bar)
{
@@ -578,10 +598,10 @@
return avail;
}
rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1);
- pdev->dev.msix = rle->start;
- pdev->dev.msix_max = rle->start + avail;
+ pdev->dev.irq_start = rle->start;
+ pdev->dev.irq_end = rle->start + avail;
for (i = 0; i < nreq; i++)
- entries[i].vector = pdev->dev.msix + i;
+ entries[i].vector = pdev->dev.irq_start + i;
return (0);
}
@@ -611,7 +631,30 @@
return (nvec);
}
+#define pci_enable_msi(pdev) \
+ linux_pci_enable_msi(pdev)
+
static inline int
+pci_enable_msi(struct pci_dev *pdev)
+{
+ struct resource_list_entry *rle;
+ int error;
+ int avail;
+
+ avail = pci_msi_count(pdev->dev.bsddev);
+ if (avail < 1)
+ return -EINVAL;
+ if ((error = -pci_alloc_msi(pdev->dev.bsddev, &avail)) != 0)
+ return error;
+
+ rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1);
+ pdev->dev.irq_start = rle->start;
+ pdev->dev.irq_end = rle->start + avail;
+ pdev->dev.irq = rle->start;
+ return (0);
+}
+
+static inline int
pci_channel_offline(struct pci_dev *pdev)
{

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 24, 6:47 AM (18 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32064429
Default Alt Text
D21008.id60497.diff (3 KB)

Event Timeline