Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fa1c842 authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

iommu/irq_remapping: Change variable disable_irq_remap to be static 



Change variable disable_irq_remap to be static and simplify the code.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Tested-by: default avatarJoerg 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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 30969e34

drivers/iommu/amd_iommu_init.c

+1 −5
Original line number Diff line number Diff line
@@ -2014,9 +2014,6 @@ static bool detect_ivrs(void) 
	/* Make sure ACS will be enabled during PCI probe */

	pci_request_acs();



	if (!disable_irq_remap)

		amd_iommu_irq_remap = true;



	return true;

}
@@ -2123,8 +2120,7 @@ static int __init iommu_go_to_state(enum iommu_init_state state) 
#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);

}

drivers/iommu/intel_irq_remapping.c

+0 −5
Original line number Diff line number Diff line
@@ -588,10 +588,6 @@ static int __init intel_prepare_irq_remapping(void) 
	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"
@@ -600,7 +596,6 @@ static int __init intel_prepare_irq_remapping(void) 
			"interrupt remapping is being disabled.  Please\n"

			"contact your BIOS vendor for an update\n");

		add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);

		disable_irq_remap = 1;

		return -ENODEV;

	}

drivers/iommu/irq_remapping.c

+1 −2
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
#include "irq_remapping.h"



int irq_remapping_enabled;



int disable_irq_remap;

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);

drivers/iommu/irq_remapping.h

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct cpumask; 
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;
@@ -86,7 +85,6 @@ extern struct irq_remap_ops amd_iommu_irq_ops; 
#else  /* CONFIG_IRQ_REMAP */



#define irq_remapping_enabled 0

#define disable_irq_remap     1

#define irq_remap_broken      0



#endif /* CONFIG_IRQ_REMAP */