lkml.org 
[lkml]   [2011]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] iommu/amd: Move missing parts to drivers/iommu
    Date
    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: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/Makefile | 1 -
    drivers/iommu/Makefile | 2 +-
    drivers/iommu/amd_iommu.c | 7 ++++---
    .../x86/kernel => drivers/iommu}/amd_iommu_init.c | 8 +++++---
    .../asm => drivers/iommu}/amd_iommu_proto.h | 2 +-
    .../asm => drivers/iommu}/amd_iommu_types.h | 0
    .../asm/amd_iommu.h => include/linux/amd-iommu.h | 0
    7 files changed, 11 insertions(+), 9 deletions(-)
    rename {arch/x86/kernel => drivers/iommu}/amd_iommu_init.c (99%)
    rename {arch/x86/include/asm => drivers/iommu}/amd_iommu_proto.h (98%)
    rename {arch/x86/include/asm => drivers/iommu}/amd_iommu_types.h (100%)
    rename arch/x86/include/asm/amd_iommu.h => include/linux/amd-iommu.h (100%)

    diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
    index aef0298..11817ff 100644
    --- a/arch/x86/kernel/Makefile
    +++ b/arch/x86/kernel/Makefile
    @@ -123,7 +123,6 @@ ifeq ($(CONFIG_X86_64),y)

    obj-$(CONFIG_GART_IOMMU) += amd_gart_64.o aperture_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-y += vsmp_64.o
    diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile
    index 49e9c0f..4d4d77d 100644
    --- a/drivers/iommu/Makefile
    +++ b/drivers/iommu/Makefile
    @@ -1,5 +1,5 @@
    obj-$(CONFIG_IOMMU_API) += iommu.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_INTR_REMAP) += dmar.o intr_remapping.o
    diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
    index 7c3a95e..5aa12ea 100644
    --- a/drivers/iommu/amd_iommu.c
    +++ b/drivers/iommu/amd_iommu.c
    @@ -27,13 +27,14 @@
    #include <linux/iommu-helper.h>
    #include <linux/iommu.h>
    #include <linux/delay.h>
    +#include <linux/amd-iommu.h>
    #include <asm/proto.h>
    #include <asm/iommu.h>
    #include <asm/gart.h>
    #include <asm/dma.h>
    -#include <asm/amd_iommu_proto.h>
    -#include <asm/amd_iommu_types.h>
    -#include <asm/amd_iommu.h>
    +
    +#include "amd_iommu_proto.h"
    +#include "amd_iommu_types.h"

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

    diff --git a/arch/x86/kernel/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
    similarity index 99%
    rename from arch/x86/kernel/amd_iommu_init.c
    rename to drivers/iommu/amd_iommu_init.c
    index bfc8453..82d2410 100644
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/drivers/iommu/amd_iommu_init.c
    @@ -24,14 +24,16 @@
    #include <linux/syscore_ops.h>
    #include <linux/interrupt.h>
    #include <linux/msi.h>
    +#include <linux/amd-iommu.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/gart.h>
    #include <asm/x86_init.h>
    #include <asm/iommu_table.h>
    +
    +#include "amd_iommu_proto.h"
    +#include "amd_iommu_types.h"
    +
    /*
    * definitions for the ACPI scanning code
    */
    diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h
    similarity index 98%
    rename from arch/x86/include/asm/amd_iommu_proto.h
    rename to drivers/iommu/amd_iommu_proto.h
    index 55d95eb..7ffaa64 100644
    --- a/arch/x86/include/asm/amd_iommu_proto.h
    +++ b/drivers/iommu/amd_iommu_proto.h
    @@ -19,7 +19,7 @@
    #ifndef _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_passthrough(void);
    diff --git a/arch/x86/include/asm/amd_iommu_types.h b/drivers/iommu/amd_iommu_types.h
    similarity index 100%
    rename from arch/x86/include/asm/amd_iommu_types.h
    rename to drivers/iommu/amd_iommu_types.h
    diff --git a/arch/x86/include/asm/amd_iommu.h b/include/linux/amd-iommu.h
    similarity index 100%
    rename from arch/x86/include/asm/amd_iommu.h
    rename to include/linux/amd-iommu.h
    --
    1.7.4.1



    \
     
     \ /
      Last update: 2011-06-22 12:19    [W:0.051 / U:0.580 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site