lkml.org 
[lkml]   [2009]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/34] x86/amd-iommu: Separate internal interface definitions
    Date
    This patch moves all function declarations which are only
    used inside the driver code to a seperate header file.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/include/asm/amd_iommu.h | 10 +++-----
    arch/x86/include/asm/amd_iommu_proto.h | 38 ++++++++++++++++++++++++++++++++
    arch/x86/include/asm/amd_iommu_types.h | 5 ----
    arch/x86/kernel/amd_iommu.c | 1 +
    arch/x86/kernel/amd_iommu_init.c | 1 +
    5 files changed, 44 insertions(+), 11 deletions(-)
    create mode 100644 arch/x86/include/asm/amd_iommu_proto.h

    diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h
    index b8ef2ee..0891338 100644
    --- a/arch/x86/include/asm/amd_iommu.h
    +++ b/arch/x86/include/asm/amd_iommu.h
    @@ -23,15 +23,13 @@
    #include <linux/irqreturn.h>

    #ifdef CONFIG_AMD_IOMMU
    -extern int amd_iommu_init_dma_ops(void);
    -extern int amd_iommu_init_passthrough(void);
    +
    extern void amd_iommu_detect(void);
    -extern irqreturn_t amd_iommu_int_handler(int irq, void *data);
    -extern void amd_iommu_flush_all_domains(void);
    -extern void amd_iommu_flush_all_devices(void);
    -extern void amd_iommu_apply_erratum_63(u16 devid);
    +
    #else
    +
    static inline void amd_iommu_detect(void) { }
    +
    #endif

    #endif /* _ASM_X86_AMD_IOMMU_H */
    diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/arch/x86/include/asm/amd_iommu_proto.h
    new file mode 100644
    index 0000000..84786fb
    --- /dev/null
    +++ b/arch/x86/include/asm/amd_iommu_proto.h
    @@ -0,0 +1,38 @@
    +/*
    + * Copyright (C) 2009 Advanced Micro Devices, Inc.
    + * Author: Joerg Roedel <joerg.roedel@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_PROTO_H
    +#define _ASM_X86_AMD_IOMMU_PROTO_H
    +
    +struct amd_iommu;
    +
    +extern int amd_iommu_init_dma_ops(void);
    +extern int amd_iommu_init_passthrough(void);
    +extern irqreturn_t amd_iommu_int_handler(int irq, void *data);
    +extern void amd_iommu_flush_all_domains(void);
    +extern void amd_iommu_flush_all_devices(void);
    +extern void amd_iommu_apply_erratum_63(u16 devid);
    +extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
    +
    +#ifndef CONFIG_AMD_IOMMU_STATS
    +
    +static inline void amd_iommu_stats_init(void) { }
    +
    +#endif /* !CONFIG_AMD_IOMMU_STATS */
    +
    +#endif /* _ASM_X86_AMD_IOMMU_PROTO_H */
    diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h
    index 2a2cc7a..27db7f9 100644
    --- a/arch/x86/include/asm/amd_iommu_types.h
    +++ b/arch/x86/include/asm/amd_iommu_types.h
    @@ -462,11 +462,6 @@ struct __iommu_counter {
    #define ADD_STATS_COUNTER(name, x)
    #define SUB_STATS_COUNTER(name, x)

    -static inline void amd_iommu_stats_init(void) { }
    -
    #endif /* CONFIG_AMD_IOMMU_STATS */

    -/* some function prototypes */
    -extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
    -
    #endif /* _ASM_X86_AMD_IOMMU_TYPES_H */
    diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
    index b74b212..50d2b05 100644
    --- a/arch/x86/kernel/amd_iommu.c
    +++ b/arch/x86/kernel/amd_iommu.c
    @@ -28,6 +28,7 @@
    #include <asm/proto.h>
    #include <asm/iommu.h>
    #include <asm/gart.h>
    +#include <asm/amd_iommu_proto.h>
    #include <asm/amd_iommu_types.h>
    #include <asm/amd_iommu.h>

    diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
    index 72bdbda..db30cfe 100644
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/arch/x86/kernel/amd_iommu_init.c
    @@ -25,6 +25,7 @@
    #include <linux/interrupt.h>
    #include <linux/msi.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>
    --
    1.6.5.3



    \
     
     \ /
      Last update: 2009-11-27 15:05    [W:4.037 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site