diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2012-03-30 14:46:59 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2012-05-07 08:34:58 -0400 |
commit | eef93fdb7cd41ae36794db0e765059dc1039e940 (patch) | |
tree | a08874c2006967d0da45b8abc5cacfcaed6dff58 /drivers/iommu | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) |
iommu: Rename intr_remapping files to intel_intr_remapping
The files contain code mostly relevant for the Intel
implementation of interrupt remapping. Make that visible in
the file names. Also inline intr_remapping.h into
intr_remapping.c because it is only included there and the
content is very small. So there is no reason for a seperate
header file.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/Makefile | 2 | ||||
-rw-r--r-- | drivers/iommu/intel_intr_remapping.c (renamed from drivers/iommu/intr_remapping.c) | 17 | ||||
-rw-r--r-- | drivers/iommu/intr_remapping.h | 17 |
3 files changed, 17 insertions, 19 deletions
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 7ad7a3bc1242..1533ebf1d68e 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile | |||
@@ -4,7 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o | |||
4 | obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o | 4 | obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o |
5 | obj-$(CONFIG_DMAR_TABLE) += dmar.o | 5 | obj-$(CONFIG_DMAR_TABLE) += dmar.o |
6 | obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o | 6 | obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o |
7 | obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o | 7 | obj-$(CONFIG_IRQ_REMAP) += intel_intr_remapping.o |
8 | obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o | 8 | obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o |
9 | obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o | 9 | obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o |
10 | obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o | 10 | obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o |
diff --git a/drivers/iommu/intr_remapping.c b/drivers/iommu/intel_intr_remapping.c index 6777ca049471..212fff0c24b5 100644 --- a/drivers/iommu/intr_remapping.c +++ b/drivers/iommu/intel_intr_remapping.c | |||
@@ -10,10 +10,25 @@ | |||
10 | #include <asm/smp.h> | 10 | #include <asm/smp.h> |
11 | #include <asm/cpu.h> | 11 | #include <asm/cpu.h> |
12 | #include <linux/intel-iommu.h> | 12 | #include <linux/intel-iommu.h> |
13 | #include "intr_remapping.h" | ||
14 | #include <acpi/acpi.h> | 13 | #include <acpi/acpi.h> |
15 | #include <asm/pci-direct.h> | 14 | #include <asm/pci-direct.h> |
16 | 15 | ||
16 | struct ioapic_scope { | ||
17 | struct intel_iommu *iommu; | ||
18 | unsigned int id; | ||
19 | unsigned int bus; /* PCI bus number */ | ||
20 | unsigned int devfn; /* PCI devfn number */ | ||
21 | }; | ||
22 | |||
23 | struct hpet_scope { | ||
24 | struct intel_iommu *iommu; | ||
25 | u8 id; | ||
26 | unsigned int bus; | ||
27 | unsigned int devfn; | ||
28 | }; | ||
29 | |||
30 | #define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) | ||
31 | |||
17 | static struct ioapic_scope ir_ioapic[MAX_IO_APICS]; | 32 | static struct ioapic_scope ir_ioapic[MAX_IO_APICS]; |
18 | static struct hpet_scope ir_hpet[MAX_HPET_TBS]; | 33 | static struct hpet_scope ir_hpet[MAX_HPET_TBS]; |
19 | static int ir_ioapic_num, ir_hpet_num; | 34 | static int ir_ioapic_num, ir_hpet_num; |
diff --git a/drivers/iommu/intr_remapping.h b/drivers/iommu/intr_remapping.h deleted file mode 100644 index 5662fecfee60..000000000000 --- a/drivers/iommu/intr_remapping.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #include <linux/intel-iommu.h> | ||
2 | |||
3 | struct ioapic_scope { | ||
4 | struct intel_iommu *iommu; | ||
5 | unsigned int id; | ||
6 | unsigned int bus; /* PCI bus number */ | ||
7 | unsigned int devfn; /* PCI devfn number */ | ||
8 | }; | ||
9 | |||
10 | struct hpet_scope { | ||
11 | struct intel_iommu *iommu; | ||
12 | u8 id; | ||
13 | unsigned int bus; | ||
14 | unsigned int devfn; | ||
15 | }; | ||
16 | |||
17 | #define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0) | ||