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

Commit 403f81d8 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Move missing parts to drivers/iommu 



A few parts of the driver were missing in drivers/iommu.
Move them there to have the complete driver in that
directory.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 68255b62

arch/x86/kernel/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,6 @@ ifeq ($(CONFIG_X86_64),y) 




	obj-$(CONFIG_GART_IOMMU)	+= amd_gart_64.o aperture_64.o

	obj-$(CONFIG_GART_IOMMU)	+= amd_gart_64.o aperture_64.o

	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o

	obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary_64.o tce_64.o

	obj-$(CONFIG_AMD_IOMMU)		+= amd_iommu_init.o





	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o

	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o

	obj-y				+= vsmp_64.o

	obj-y				+= vsmp_64.o

drivers/iommu/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o

obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o

obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o

obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o

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

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

obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o
 
obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o

drivers/iommu/amd_iommu.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -27,13 +27,14 @@ 
#include <linux/iommu-helper.h>

#include <linux/iommu-helper.h>

#include <linux/iommu.h>

#include <linux/iommu.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/amd-iommu.h>

#include <asm/proto.h>

#include <asm/proto.h>

#include <asm/iommu.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/gart.h>

#include <asm/dma.h>

#include <asm/dma.h>

#include <asm/amd_iommu_proto.h>



#include <asm/amd_iommu_types.h>

#include "amd_iommu_proto.h"

#include <asm/amd_iommu.h>

#include "amd_iommu_types.h"





#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))

#define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))

arch/x86/kernel/amd_iommu_init.c→drivers/iommu/amd_iommu_init.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -24,14 +24,16 @@ 
#include <linux/syscore_ops.h>

#include <linux/syscore_ops.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/msi.h>

#include <linux/msi.h>

#include <linux/amd-iommu.h>

#include <asm/pci-direct.h>

#include <asm/pci-direct.h>

#include <asm/amd_iommu_proto.h>

#include <asm/amd_iommu_types.h>

#include <asm/amd_iommu.h>

#include <asm/iommu.h>

#include <asm/iommu.h>

#include <asm/gart.h>

#include <asm/gart.h>

#include <asm/x86_init.h>

#include <asm/x86_init.h>

#include <asm/iommu_table.h>

#include <asm/iommu_table.h>



#include "amd_iommu_proto.h"

#include "amd_iommu_types.h"



/*

/*

 * definitions for the ACPI scanning code

 * definitions for the ACPI scanning code

 */

 */

arch/x86/include/asm/amd_iommu_proto.h→drivers/iommu/amd_iommu_proto.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#ifndef _ASM_X86_AMD_IOMMU_PROTO_H

#ifndef _ASM_X86_AMD_IOMMU_PROTO_H

#define _ASM_X86_AMD_IOMMU_PROTO_H

#define _ASM_X86_AMD_IOMMU_PROTO_H





#include <asm/amd_iommu_types.h>

#include "amd_iommu_types.h"





extern int amd_iommu_init_dma_ops(void);

extern int amd_iommu_init_dma_ops(void);

extern int amd_iommu_init_passthrough(void);

extern int amd_iommu_init_passthrough(void);