[POWERPC] ps3: multiplatform build fixes

A few code paths need to check whether or not they are running
on the PS3's LV1 hypervisor before making hcalls. This introduces
a new firmware feature bit for this, FW_FEATURE_PS3_LV1.

Now when both PS3 and IBM_CELL_BLADE are enabled, but not PSERIES,
FW_FEATURE_PS3_LV1 and FW_FEATURE_LPAR get enabled at compile time,
which is a bug. The same problem can also happen for (PPC_ISERIES &&
!PPC_PSERIES && PPC_SOMETHING_ELSE). In order to solve this, I
introduce a new CONFIG_PPC_NATIVE option that is set when at least
one platform is selected that can run without a hypervisor and then
turns the firmware feature check into a run-time option.

The new cell oprofile support that was recently merged does not
work on hypervisor based platforms like the PS3, therefore make
it depend on PPC_CELL_NATIVE instead of PPC_CELL. This may change
if we get oprofile support for PS3.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
index 84d43d6e13ec..98f7b62422c9 100644
--- a/include/asm-powerpc/firmware.h
+++ b/include/asm-powerpc/firmware.h
@@ -42,6 +42,7 @@
 #define FW_FEATURE_SPLPAR       ASM_CONST(0x0000000000100000)
 #define FW_FEATURE_ISERIES      ASM_CONST(0x0000000000200000)
 #define FW_FEATURE_LPAR         ASM_CONST(0x0000000000400000)
+#define FW_FEATURE_PS3_LV1      ASM_CONST(0x0000000000800000)
 
 #ifndef __ASSEMBLY__
 
@@ -58,8 +59,10 @@ enum {
         FW_FEATURE_PSERIES_ALWAYS = 0,
         FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
         FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
-        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR,
-        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR,
+        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
+        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
+        FW_FEATURE_NATIVE_POSSIBLE = 0,
+        FW_FEATURE_NATIVE_ALWAYS = 0,
         FW_FEATURE_POSSIBLE =
 #ifdef CONFIG_PPC_PSERIES
                 FW_FEATURE_PSERIES_POSSIBLE |
@@ -70,6 +73,9 @@ enum {
 #ifdef CONFIG_PPC_PS3
                 FW_FEATURE_PS3_POSSIBLE |
 #endif
+#ifdef CONFIG_PPC_NATIVE
+                FW_FEATURE_NATIVE_ALWAYS |
+#endif
                 0,
         FW_FEATURE_ALWAYS =
 #ifdef CONFIG_PPC_PSERIES
@@ -81,6 +87,9 @@ enum {
 #ifdef CONFIG_PPC_PS3
                 FW_FEATURE_PS3_ALWAYS &
 #endif
+#ifdef CONFIG_PPC_NATIVE
+                FW_FEATURE_NATIVE_ALWAYS &
+#endif
                 FW_FEATURE_POSSIBLE,
 
 #else /* CONFIG_PPC64 */