aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorIshizaki Kou <kou.ishizaki@toshiba.co.jp>2007-02-02 02:47:17 -0500
committerPaul Mackerras <paulus@samba.org>2007-02-06 22:03:21 -0500
commitc347b7989e4d9e1c23cb5cfba78c63c031b7dcee (patch)
treeb2a8d8fe0717a64e40b42093dadc5017947f9ea2 /include/asm-powerpc
parente107931956f8327637508b91a9ddd4ba35be289d (diff)
[POWERPC] Celleb: basic support
This patch adds base support for Celleb platform. Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r--include/asm-powerpc/firmware.h9
-rw-r--r--include/asm-powerpc/smp.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index 98f7b62422c9..abba808cc53c 100644
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -43,6 +43,7 @@
43#define FW_FEATURE_ISERIES ASM_CONST(0x0000000000200000) 43#define FW_FEATURE_ISERIES ASM_CONST(0x0000000000200000)
44#define FW_FEATURE_LPAR ASM_CONST(0x0000000000400000) 44#define FW_FEATURE_LPAR ASM_CONST(0x0000000000400000)
45#define FW_FEATURE_PS3_LV1 ASM_CONST(0x0000000000800000) 45#define FW_FEATURE_PS3_LV1 ASM_CONST(0x0000000000800000)
46#define FW_FEATURE_BEAT ASM_CONST(0x0000000001000000)
46 47
47#ifndef __ASSEMBLY__ 48#ifndef __ASSEMBLY__
48 49
@@ -61,6 +62,8 @@ enum {
61 FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR, 62 FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
62 FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 63 FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
63 FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1, 64 FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
65 FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
66 FW_FEATURE_CELLEB_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
64 FW_FEATURE_NATIVE_POSSIBLE = 0, 67 FW_FEATURE_NATIVE_POSSIBLE = 0,
65 FW_FEATURE_NATIVE_ALWAYS = 0, 68 FW_FEATURE_NATIVE_ALWAYS = 0,
66 FW_FEATURE_POSSIBLE = 69 FW_FEATURE_POSSIBLE =
@@ -73,6 +76,9 @@ enum {
73#ifdef CONFIG_PPC_PS3 76#ifdef CONFIG_PPC_PS3
74 FW_FEATURE_PS3_POSSIBLE | 77 FW_FEATURE_PS3_POSSIBLE |
75#endif 78#endif
79#ifdef CONFIG_PPC_CELLEB
80 FW_FEATURE_CELLEB_POSSIBLE |
81#endif
76#ifdef CONFIG_PPC_NATIVE 82#ifdef CONFIG_PPC_NATIVE
77 FW_FEATURE_NATIVE_ALWAYS | 83 FW_FEATURE_NATIVE_ALWAYS |
78#endif 84#endif
@@ -87,6 +93,9 @@ enum {
87#ifdef CONFIG_PPC_PS3 93#ifdef CONFIG_PPC_PS3
88 FW_FEATURE_PS3_ALWAYS & 94 FW_FEATURE_PS3_ALWAYS &
89#endif 95#endif
96#ifdef CONFIG_PPC_CELLEB
97 FW_FEATURE_CELLEB_ALWAYS &
98#endif
90#ifdef CONFIG_PPC_NATIVE 99#ifdef CONFIG_PPC_NATIVE
91 FW_FEATURE_NATIVE_ALWAYS & 100 FW_FEATURE_NATIVE_ALWAYS &
92#endif 101#endif
diff --git a/include/asm-powerpc/smp.h b/include/asm-powerpc/smp.h
index 20ea7c70bc38..01717f266dc9 100644
--- a/include/asm-powerpc/smp.h
+++ b/include/asm-powerpc/smp.h
@@ -75,6 +75,7 @@ extern cpumask_t cpu_sibling_map[NR_CPUS];
75void smp_init_iSeries(void); 75void smp_init_iSeries(void);
76void smp_init_pSeries(void); 76void smp_init_pSeries(void);
77void smp_init_cell(void); 77void smp_init_cell(void);
78void smp_init_celleb(void);
78void smp_setup_cpu_maps(void); 79void smp_setup_cpu_maps(void);
79 80
80extern int __cpu_disable(void); 81extern int __cpu_disable(void);