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

Commit eef93fdb authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent d48b97b4

drivers/iommu/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o 
obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o

obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o

obj-$(CONFIG_DMAR_TABLE) += dmar.o

obj-$(CONFIG_DMAR_TABLE) += dmar.o

obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o

obj-$(CONFIG_INTEL_IOMMU) += iova.o intel-iommu.o

obj-$(CONFIG_IRQ_REMAP) += intr_remapping.o

obj-$(CONFIG_IRQ_REMAP) += intel_intr_remapping.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o

obj-$(CONFIG_OMAP_IOVMM) += omap-iovmm.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

obj-$(CONFIG_OMAP_IOMMU_DEBUG) += omap-iommu-debug.o

drivers/iommu/intr_remapping.c→drivers/iommu/intel_intr_remapping.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -10,10 +10,25 @@ 
#include <asm/smp.h>

#include <asm/smp.h>

#include <asm/cpu.h>

#include <asm/cpu.h>

#include <linux/intel-iommu.h>

#include <linux/intel-iommu.h>

#include "intr_remapping.h"

#include <acpi/acpi.h>

#include <acpi/acpi.h>

#include <asm/pci-direct.h>

#include <asm/pci-direct.h>





struct ioapic_scope {

	struct intel_iommu *iommu;

	unsigned int id;

	unsigned int bus;	/* PCI bus number */

	unsigned int devfn;	/* PCI devfn number */

};



struct hpet_scope {

	struct intel_iommu *iommu;

	u8 id;

	unsigned int bus;

	unsigned int devfn;

};



#define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0)



static struct ioapic_scope ir_ioapic[MAX_IO_APICS];

static struct ioapic_scope ir_ioapic[MAX_IO_APICS];

static struct hpet_scope ir_hpet[MAX_HPET_TBS];

static struct hpet_scope ir_hpet[MAX_HPET_TBS];

static int ir_ioapic_num, ir_hpet_num;

static int ir_ioapic_num, ir_hpet_num;

drivers/iommu/intr_remapping.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
#include <linux/intel-iommu.h>



struct ioapic_scope {

	struct intel_iommu *iommu;

	unsigned int id;

	unsigned int bus;	/* PCI bus number */

	unsigned int devfn;	/* PCI devfn number */

};



struct hpet_scope {

	struct intel_iommu *iommu;

	u8 id;

	unsigned int bus;

	unsigned int devfn;

};



#define IR_X2APIC_MODE(mode) (mode ? (1 << 11) : 0)