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

Commit 9413c883 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt
Browse files

powerpc/cell: Move CBE_IOPTE_* to <asm/cell-regs.h> 



As <asm/iommu.h> doesn't contain any other hardware specific definitions
but only interfaces.

Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 02a606c2

arch/powerpc/include/asm/cell-regs.h

+11 −0
Original line number Diff line number Diff line
@@ -303,6 +303,17 @@ struct cbe_mic_tm_regs { 
extern struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs(struct device_node *np);

extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu);





/* Cell page table entries */

#define CBE_IOPTE_PP_W		0x8000000000000000ul /* protection: write */

#define CBE_IOPTE_PP_R		0x4000000000000000ul /* protection: read */

#define CBE_IOPTE_M		0x2000000000000000ul /* coherency required */

#define CBE_IOPTE_SO_R		0x1000000000000000ul /* ordering: writes */

#define CBE_IOPTE_SO_RW		0x1800000000000000ul /* ordering: r & w */

#define CBE_IOPTE_RPN_Mask	0x07fffffffffff000ul /* RPN */

#define CBE_IOPTE_H		0x0000000000000800ul /* cache hint */

#define CBE_IOPTE_IOID_Mask	0x00000000000007fful /* ioid */



/* some utility functions to deal with SMT */

extern u32 cbe_get_hw_thread_id(int cpu);

extern u32 cbe_cpu_to_node(int cpu);

arch/powerpc/include/asm/iommu.h

+0 −10
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
#define IOMMU_PAGE_MASK       (~((1 << IOMMU_PAGE_SHIFT) - 1))

#define IOMMU_PAGE_ALIGN(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE)



/* Cell page table entries */

#define CBE_IOPTE_PP_W		0x8000000000000000ul /* protection: write */

#define CBE_IOPTE_PP_R		0x4000000000000000ul /* protection: read */

#define CBE_IOPTE_M		0x2000000000000000ul /* coherency required */

#define CBE_IOPTE_SO_R		0x1000000000000000ul /* ordering: writes */

#define CBE_IOPTE_SO_RW		0x1800000000000000ul /* ordering: r & w */

#define CBE_IOPTE_RPN_Mask	0x07fffffffffff000ul /* RPN */

#define CBE_IOPTE_H		0x0000000000000800ul /* cache hint */

#define CBE_IOPTE_IOID_Mask	0x00000000000007fful /* ioid */



/* Boot time flags */

extern int iommu_is_off;

extern int iommu_force_on;

arch/powerpc/platforms/ps3/mm.c

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
#include <linux/memory_hotplug.h>

#include <linux/lmb.h>



#include <asm/cell-regs.h>

#include <asm/firmware.h>

#include <asm/iommu.h>

#include <asm/prom.h>

#include <asm/udbg.h>

#include <asm/lv1call.h>

arch/powerpc/platforms/ps3/system-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/udbg.h>

#include <asm/lv1call.h>

#include <asm/firmware.h>

#include <asm/iommu.h>

#include <asm/cell-regs.h>



#include "platform.h"

drivers/block/ps3vram.c

+1 −1
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include <linux/proc_fs.h>

#include <linux/seq_file.h>



#include <asm/cell-regs.h>

#include <asm/firmware.h>

#include <asm/iommu.h>

#include <asm/lv1call.h>

#include <asm/ps3.h>

#include <asm/ps3gpu.h>