Change variable disable_irq_remap to be static and simplify the code.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1420615903-28253-16-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
/* Make sure ACS will be enabled during PCI probe */
pci_request_acs();
/* Make sure ACS will be enabled during PCI probe */
pci_request_acs();
- if (!disable_irq_remap)
- amd_iommu_irq_remap = true;
-
#ifdef CONFIG_IRQ_REMAP
int __init amd_iommu_prepare(void)
{
#ifdef CONFIG_IRQ_REMAP
int __init amd_iommu_prepare(void)
{
- if (!amd_iommu_irq_remap)
- return -1;
+ amd_iommu_irq_remap = true;
return iommu_go_to_state(IOMMU_ACPI_FINISHED);
}
return iommu_go_to_state(IOMMU_ACPI_FINISHED);
}
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;
- /* First check whether IRQ remapping should be enabled */
- if (disable_irq_remap)
- return -ENODEV;
-
if (irq_remap_broken) {
printk(KERN_WARNING
"This system BIOS has enabled interrupt remapping\n"
if (irq_remap_broken) {
printk(KERN_WARNING
"This system BIOS has enabled interrupt remapping\n"
"interrupt remapping is being disabled. Please\n"
"contact your BIOS vendor for an update\n");
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
"interrupt remapping is being disabled. Please\n"
"contact your BIOS vendor for an update\n");
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
#include "irq_remapping.h"
int irq_remapping_enabled;
#include "irq_remapping.h"
int irq_remapping_enabled;
-
-int disable_irq_remap;
int irq_remap_broken;
int disable_sourceid_checking;
int no_x2apic_optout;
int irq_remap_broken;
int disable_sourceid_checking;
int no_x2apic_optout;
+static int disable_irq_remap;
static struct irq_remap_ops *remap_ops;
static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec);
static struct irq_remap_ops *remap_ops;
static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec);
struct pci_dev;
struct msi_msg;
struct pci_dev;
struct msi_msg;
-extern int disable_irq_remap;
extern int irq_remap_broken;
extern int disable_sourceid_checking;
extern int no_x2apic_optout;
extern int irq_remap_broken;
extern int disable_sourceid_checking;
extern int no_x2apic_optout;
#else /* CONFIG_IRQ_REMAP */
#define irq_remapping_enabled 0
#else /* CONFIG_IRQ_REMAP */
#define irq_remapping_enabled 0
-#define disable_irq_remap 1
#define irq_remap_broken 0
#endif /* CONFIG_IRQ_REMAP */
#define irq_remap_broken 0
#endif /* CONFIG_IRQ_REMAP */