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

Commit e7eb22d2 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

[PATCH] ppc64 iSeries: iommu.h cleanups 



The iommu_table_cb structure is iSeries specific, so move it to the header
file that declares the function we pass it to.  vio_tce_table and
iommu_setup_iSeries no longer exist, so remove their declarations.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ea7190d0

include/asm-ppc64/iSeries/HvCallXm.h

+17 −0
Original line number Diff line number Diff line
@@ -16,6 +16,23 @@ 
#define HvCallXmSetTce			HvCallXm + 11

#define HvCallXmSetTces			HvCallXm + 13



/*

 * Structure passed to HvCallXm_getTceTableParms

 */

struct iommu_table_cb {

	unsigned long	itc_busno;	/* Bus number for this tce table */

	unsigned long	itc_start;	/* Will be NULL for secondary */

	unsigned long	itc_totalsize;	/* Size (in pages) of whole table */

	unsigned long	itc_offset;	/* Index into real tce table of the

					   start of our section */

	unsigned long	itc_size;	/* Size (in pages) of our section */

	unsigned long	itc_index;	/* Index of this tce table */

	unsigned short	itc_maxtables;	/* Max num of tables for partition */

	unsigned char	itc_virtbus;	/* Flag to indicate virtual bus */

	unsigned char	itc_slotno;	/* IOA Tce Slot Index */

	unsigned char	itc_rsvd[4];

};



static inline void HvCallXm_getTceTableParms(u64 cb)

{

	HvCall1(HvCallXmGetTceTableParms, cb);

include/asm-ppc64/iommu.h

+0 −21
Original line number Diff line number Diff line
@@ -82,24 +82,6 @@ struct iommu_table { 
	unsigned long *it_map;       /* A simple allocation bitmap for now */

};



#ifdef CONFIG_PPC_ISERIES

struct iommu_table_cb {

	unsigned long	itc_busno;	/* Bus number for this tce table */

	unsigned long	itc_start;	/* Will be NULL for secondary */

	unsigned long	itc_totalsize;	/* Size (in pages) of whole table */

	unsigned long	itc_offset;	/* Index into real tce table of the

					   start of our section */

	unsigned long	itc_size;	/* Size (in pages) of our section */

	unsigned long	itc_index;	/* Index of this tce table */

	unsigned short	itc_maxtables;	/* Max num of tables for partition */

	unsigned char	itc_virtbus;	/* Flag to indicate virtual bus */

 	unsigned char	itc_slotno;	/* IOA Tce Slot Index */

 	unsigned char	itc_rsvd[4];

};



extern struct iommu_table vio_tce_table;      /* Tce table for virtual bus */

#endif /* CONFIG_PPC_ISERIES */



struct scatterlist;



#ifdef CONFIG_PPC_MULTIPLATFORM
@@ -122,9 +104,6 @@ extern void iommu_devnode_init_pSeries(struct device_node *dn); 


#ifdef CONFIG_PPC_ISERIES



/* Walks all buses and creates iommu tables */

extern void iommu_setup_iSeries(void);



/* Initializes tables for bio buses */

extern void __init iommu_vio_init(void);