|
@@ -14,6 +14,7 @@
|
|
#include <linux/dmar.h>
|
|
#include <linux/dmar.h>
|
|
#include <linux/hpet.h>
|
|
#include <linux/hpet.h>
|
|
#include <linux/msi.h>
|
|
#include <linux/msi.h>
|
|
|
|
+#include <linux/irqdomain.h>
|
|
#include <asm/msidef.h>
|
|
#include <asm/msidef.h>
|
|
#include <asm/hpet.h>
|
|
#include <asm/hpet.h>
|
|
#include <asm/hw_irq.h>
|
|
#include <asm/hw_irq.h>
|
|
@@ -146,23 +147,20 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
|
|
int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
|
|
int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
|
|
{
|
|
{
|
|
struct msi_desc *msidesc;
|
|
struct msi_desc *msidesc;
|
|
- unsigned int irq;
|
|
|
|
- int node, ret;
|
|
|
|
|
|
+ int irq, ret;
|
|
|
|
|
|
/* Multiple MSI vectors only supported with interrupt remapping */
|
|
/* Multiple MSI vectors only supported with interrupt remapping */
|
|
if (type == PCI_CAP_ID_MSI && nvec > 1)
|
|
if (type == PCI_CAP_ID_MSI && nvec > 1)
|
|
return 1;
|
|
return 1;
|
|
|
|
|
|
- node = dev_to_node(&dev->dev);
|
|
|
|
-
|
|
|
|
list_for_each_entry(msidesc, &dev->msi_list, list) {
|
|
list_for_each_entry(msidesc, &dev->msi_list, list) {
|
|
- irq = irq_alloc_hwirq(node);
|
|
|
|
- if (!irq)
|
|
|
|
|
|
+ irq = irq_domain_alloc_irqs(NULL, 1, NUMA_NO_NODE, NULL);
|
|
|
|
+ if (irq <= 0)
|
|
return -ENOSPC;
|
|
return -ENOSPC;
|
|
|
|
|
|
ret = setup_msi_irq(dev, msidesc, irq, 0);
|
|
ret = setup_msi_irq(dev, msidesc, irq, 0);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|
|
- irq_free_hwirq(irq);
|
|
|
|
|
|
+ irq_domain_free_irqs(irq, 1);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -172,7 +170,7 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
|
|
|
|
|
|
void native_teardown_msi_irq(unsigned int irq)
|
|
void native_teardown_msi_irq(unsigned int irq)
|
|
{
|
|
{
|
|
- irq_free_hwirq(irq);
|
|
|
|
|
|
+ irq_domain_free_irqs(irq, 1);
|
|
}
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_DMAR_TABLE
|
|
#ifdef CONFIG_DMAR_TABLE
|