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

Commit 099c5c03 authored Apr 14, 2015 by Jiang Liu Committed by Thomas Gleixner Apr 24, 2015

irq_remapping/vt-d: Move struct irq_2_iommu into intel_irq_remapping.c

Now only intel_irq_remapping.c access irq_2_iommu, so move it from
hw_irq.h into intel_irq_remapping.c.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Joerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: iommu@lists.linux-foundation.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Joerg Roedel <joro@8bytes.org>
Link: http://lkml.kernel.org/r/1428978610-28986-15-git-send-email-jiang.liu@linux.intel.com

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent bac4f907

arch/x86/include/asm/hw_irq.h

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -95,14 +95,6 @@ extern void trace_call_function_single_interrupt(void);
	#endif /* CONFIG_TRACING */		#endif /* CONFIG_TRACING */

	#ifdef CONFIG_IRQ_REMAP		#ifdef CONFIG_IRQ_REMAP
	/* Intel specific interrupt remapping information */
	struct irq_2_iommu {
	struct intel_iommu *iommu;
	u16 irte_index;
	u16 sub_handle;
	u8 irte_mask;
	};

	/* AMD specific interrupt remapping information */		/* AMD specific interrupt remapping information */
	struct irq_2_irte {		struct irq_2_irte {
	u16 devid; /* Device ID for IRTE table */		u16 devid; /* Device ID for IRTE table */
	@@ -194,7 +186,6 @@ struct irq_cfg {
	u8 move_in_progress : 1;		u8 move_in_progress : 1;
	#ifdef CONFIG_IRQ_REMAP		#ifdef CONFIG_IRQ_REMAP
	union {		union {
	struct irq_2_iommu irq_2_iommu;
	struct irq_2_irte irq_2_irte;		struct irq_2_irte irq_2_irte;
	};		};
	#endif		#endif

drivers/iommu/intel_irq_remapping.c

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,13 @@ struct hpet_scope {
	unsigned int devfn;		unsigned int devfn;
	};		};

			struct irq_2_iommu {
			struct intel_iommu *iommu;
			u16 irte_index;
			u16 sub_handle;
			u8 irte_mask;
			};

	struct intel_ir_data {		struct intel_ir_data {
	struct irq_2_iommu irq_2_iommu;		struct irq_2_iommu irq_2_iommu;
	struct irte irte_entry;		struct irte irte_entry;