forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iommu/irq_remapping: Change variable disable_irq_remap to be static

Browse source 
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>
This commit is contained in:
Jiang Liu 2015-01-07 15:31:42 +08:00 • committed by Thomas Gleixner
commit 7fa1c842ca
4 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/iommu/amd_iommu_init.c
View file

@ -2014,9 +2014,6 @@ static bool detect_ivrs(void)
/* Make sure ACS will be enabled during PCI probe */ /* Make sure ACS will be enabled during PCI probe */
pci_request_acs(); pci_request_acs();
if (!disable_irq_remap)
amd_iommu_irq_remap = true;
return true; return true;
} }
@ -2123,8 +2120,7 @@ static int __init iommu_go_to_state(enum iommu_init_state state)
#ifdef CONFIG_IRQ_REMAP #ifdef CONFIG_IRQ_REMAP
int __init amd_iommu_prepare(void) int __init amd_iommu_prepare(void)
{ {
if (!amd_iommu_irq_remap) amd_iommu_irq_remap = true;
return -1;
return iommu_go_to_state(IOMMU_ACPI_FINISHED); return iommu_go_to_state(IOMMU_ACPI_FINISHED);
} }

5
drivers/iommu/intel_irq_remapping.c
View file

@ -588,10 +588,6 @@ static int __init intel_prepare_irq_remapping(void)
struct dmar_drhd_unit *drhd; struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu; struct intel_iommu *iommu;
/* First check whether IRQ remapping should be enabled */
if (disable_irq_remap)
return -ENODEV;
if (irq_remap_broken) { if (irq_remap_broken) {
printk(KERN_WARNING printk(KERN_WARNING
"This system BIOS has enabled interrupt remapping\n" "This system BIOS has enabled interrupt remapping\n"
@ -600,7 +596,6 @@ static int __init intel_prepare_irq_remapping(void)
"interrupt remapping is being disabled. Please\n" "interrupt remapping is being disabled. Please\n"
"contact your BIOS vendor for an update\n"); "contact your BIOS vendor for an update\n");
add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK); add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
disable_irq_remap = 1;
return -ENODEV; return -ENODEV;
} }

3
drivers/iommu/irq_remapping.c
View file

@ -17,12 +17,11 @@
#include "irq_remapping.h" #include "irq_remapping.h"
int irq_remapping_enabled; int irq_remapping_enabled;
int disable_irq_remap;
int irq_remap_broken; int irq_remap_broken;
int disable_sourceid_checking; int disable_sourceid_checking;
int no_x2apic_optout; int no_x2apic_optout;
static int disable_irq_remap;
static struct irq_remap_ops *remap_ops; static struct irq_remap_ops *remap_ops;
static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec); static int msi_alloc_remapped_irq(struct pci_dev *pdev, int irq, int nvec);

2
drivers/iommu/irq_remapping.h
View file

@ -31,7 +31,6 @@ struct cpumask;
struct pci_dev; struct pci_dev;
struct msi_msg; struct msi_msg;
extern int disable_irq_remap;
extern int irq_remap_broken; extern int irq_remap_broken;
extern int disable_sourceid_checking; extern int disable_sourceid_checking;
extern int no_x2apic_optout; extern int no_x2apic_optout;
@ -86,7 +85,6 @@ extern struct irq_remap_ops amd_iommu_irq_ops;
#else /* CONFIG_IRQ_REMAP */ #else /* CONFIG_IRQ_REMAP */
#define irq_remapping_enabled 0 #define irq_remapping_enabled 0
#define disable_irq_remap 1
#define irq_remap_broken 0 #define irq_remap_broken 0
#endif /* CONFIG_IRQ_REMAP */ #endif /* CONFIG_IRQ_REMAP */