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

Commit 6a9401a7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86/amd-iommu: Separate internal interface definitions 



This patch moves all function declarations which are only
used inside the driver code to a seperate header file.

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

arch/x86/include/asm/amd_iommu.h

+4 −6
Original line number Diff line number Diff line
@@ -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 */

arch/x86/include/asm/amd_iommu_proto.h

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/*

 * 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  */

arch/x86/include/asm/amd_iommu_types.h

+0 −5
Original line number Diff line number Diff line
@@ -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 */

arch/x86/kernel/amd_iommu.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

arch/x86/kernel/amd_iommu_init.c

+1 −0
Original line number Diff line number Diff line
@@ -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>