adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Geert Uytterhoeven 2009-07-29 02:06:42 +00:00 committed by Benjamin Herrenschmidt
parent 02a606c2c4
commit 9413c8836a
6 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/powerpc/include/asm/cell-regs.h
View file

@ -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_mic_tm_regs(struct device_node *np);
extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu); 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 */ /* some utility functions to deal with SMT */
extern u32 cbe_get_hw_thread_id(int cpu); extern u32 cbe_get_hw_thread_id(int cpu);
extern u32 cbe_cpu_to_node(int cpu); extern u32 cbe_cpu_to_node(int cpu);

10
arch/powerpc/include/asm/iommu.h
View file

@ -35,16 +35,6 @@
#define IOMMU_PAGE_MASK (~((1 << IOMMU_PAGE_SHIFT) - 1)) #define IOMMU_PAGE_MASK (~((1 << IOMMU_PAGE_SHIFT) - 1))
#define IOMMU_PAGE_ALIGN(addr) _ALIGN_UP(addr, IOMMU_PAGE_SIZE) #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 */ /* Boot time flags */
extern int iommu_is_off; extern int iommu_is_off;
extern int iommu_force_on; extern int iommu_force_on;

2
arch/powerpc/platforms/ps3/mm.c
View file

@ -23,8 +23,8 @@
#include <linux/memory_hotplug.h> #include <linux/memory_hotplug.h>
#include <linux/lmb.h> #include <linux/lmb.h>
#include <asm/cell-regs.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/iommu.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/udbg.h> #include <asm/udbg.h>
#include <asm/lv1call.h> #include <asm/lv1call.h>

2
arch/powerpc/platforms/ps3/system-bus.c
View file

@ -27,7 +27,7 @@
#include <asm/udbg.h> #include <asm/udbg.h>
#include <asm/lv1call.h> #include <asm/lv1call.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/iommu.h> #include <asm/cell-regs.h>
#include "platform.h" #include "platform.h"

2
drivers/block/ps3vram.c
View file

@ -13,8 +13,8 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <asm/cell-regs.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <asm/iommu.h>
#include <asm/lv1call.h> #include <asm/lv1call.h>
#include <asm/ps3.h> #include <asm/ps3.h>
#include <asm/ps3gpu.h> #include <asm/ps3gpu.h>

2
drivers/video/ps3fb.c
View file

@ -32,7 +32,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
#include <asm/iommu.h> #include <asm/cell-regs.h>
#include <asm/lv1call.h> #include <asm/lv1call.h>
#include <asm/ps3av.h> #include <asm/ps3av.h>
#include <asm/ps3fb.h> #include <asm/ps3fb.h>