lkml.org 
[lkml]   [2008]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 30/34] AMD IOMMU: add amd_iommu.h to export functions to the generic x86 dma code
    Date
    This patch adds the amd_iommu.h file which will be included in the generic
    code.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/amd_iommu.c | 1 +
    arch/x86/kernel/amd_iommu_init.c | 1 +
    include/asm-x86/amd_iommu.h | 32 ++++++++++++++++++++++++++++++++
    3 files changed, 34 insertions(+), 0 deletions(-)
    create mode 100644 include/asm-x86/amd_iommu.h
    diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
    index c282bde..134dea1 100644
    --- a/arch/x86/kernel/amd_iommu.c
    +++ b/arch/x86/kernel/amd_iommu.c
    @@ -25,6 +25,7 @@
    #include <asm/proto.h>
    #include <asm/gart.h>
    #include <asm/amd_iommu_types.h>
    +#include <asm/amd_iommu.h>

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

    diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
    index ec6f13b..bae4a76 100644
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/arch/x86/kernel/amd_iommu_init.c
    @@ -23,6 +23,7 @@
    #include <linux/list.h>
    #include <asm/pci-direct.h>
    #include <asm/amd_iommu_types.h>
    +#include <asm/amd_iommu.h>
    #include <asm/gart.h>

    /*
    diff --git a/include/asm-x86/amd_iommu.h b/include/asm-x86/amd_iommu.h
    new file mode 100644
    index 0000000..30a1204
    --- /dev/null
    +++ b/include/asm-x86/amd_iommu.h
    @@ -0,0 +1,32 @@
    +/*
    + * Copyright (C) 2007-2008 Advanced Micro Devices, Inc.
    + * Author: Joerg Roedel <joerg.roedel@amd.com>
    + * Leo Duran <leo.duran@amd.com>
    + *
    + * This program is free software; you can redistribute it and/or modify it
    + * under the terms of the GNU General Public License version 2 as published
    + * by the Free Software Foundation.
    + *
    + * This program is distributed in the hope that it will be useful,
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    + * GNU General Public License for more details.
    + *
    + * You should have received a copy of the GNU General Public License
    + * along with this program; if not, write to the Free Software
    + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    + */
    +
    +#ifndef _ASM_X86_AMD_IOMMU_H
    +#define _ASM_X86_AMD_IOMMU_H
    +
    +#ifdef CONFIG_AMD_IOMMU
    +extern int amd_iommu_init(void);
    +extern int amd_iommu_init_dma_ops(void);
    +extern void amd_iommu_detect(void);
    +#else
    +static inline int amd_iommu_init(void) { return -ENODEV; }
    +static inline void amd_iommu_detect(void) { }
    +#endif
    +
    +#endif
    --
    1.5.3.7



    \
     
     \ /
      Last update: 2008-06-26 21:39    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site