[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, 21 insertions, 5 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c0146a40c6f3..c04b7138e1a6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -390,6 +390,7 @@ config PPC_PSERIES
         select PPC_RTAS
         select RTAS_ERROR_LOGGING
         select PPC_UDBG_16550
+        select PPC_NATIVE
         default y
 
 config PPC_ISERIES
@@ -406,6 +407,7 @@ config PPC_CHRP
         select PPC_RTAS
         select PPC_MPC106
         select PPC_UDBG_16550
+        select PPC_NATIVE
         default y
 
 config PPC_EFIKA
@@ -414,6 +416,7 @@ config PPC_EFIKA
         select PPC_RTAS
         select RTAS_PROC
         select PPC_MPC52xx
+        select PPC_NATIVE
         default y
 
 config PPC_PMAC
@@ -422,6 +425,7 @@ config PPC_PMAC
         select MPIC
         select PPC_INDIRECT_PCI if PPC32
         select PPC_MPC106 if PPC32
+        select PPC_NATIVE
         default y
 
 config PPC_PMAC64
@@ -441,6 +445,7 @@ config PPC_PREP
         select PPC_I8259
         select PPC_INDIRECT_PCI
         select PPC_UDBG_16550
+        select PPC_NATIVE
         default y
 
 config PPC_MAPLE
@@ -452,6 +457,7 @@ config PPC_MAPLE
         select GENERIC_TBSYNC
         select PPC_UDBG_16550
         select PPC_970_NAP
+        select PPC_NATIVE
         default n
         help
           This option enables support for the Maple 970FX Evaluation Board.
@@ -464,6 +470,7 @@ config PPC_PASEMI
         select MPIC
         select PPC_UDBG_16550
         select GENERIC_TBSYNC
+        select PPC_NATIVE
         help
           This option enables support for PA Semi's PWRficient line
           of SoC processors, including PA6T-1682M
@@ -478,6 +485,7 @@ config PPC_CELL_NATIVE
         select PPC_DCR_MMIO
         select PPC_OF_PLATFORM_PCI
         select PPC_INDIRECT_IO
+        select PPC_NATIVE
         select MPIC
         default n
 
@@ -490,11 +498,6 @@ config PPC_IBM_CELL_BLADE
         select PPC_UDBG_16550
         select UDBG_RTAS_CONSOLE
 
-config UDBG_RTAS_CONSOLE
-        bool "RTAS based debug console"
-        depends on PPC_RTAS
-        default n
-
 config PPC_PS3
         bool "Sony PS3"
         depends on PPC_MULTIPLATFORM && PPC64
@@ -503,6 +506,19 @@ config PPC_PS3
           This option enables support for the Sony PS3 game console
           and other platforms using the PS3 hypervisor.
 
+config PPC_NATIVE
+        bool
+        depends on PPC_MULTIPLATFORM
+        help
+          Support for running natively on the hardware, i.e. without
+          a hypervisor. This option is not user-selectable but should
+          be selected by all platforms that need it.
+
+config UDBG_RTAS_CONSOLE
+        bool "RTAS based debug console"
+        depends on PPC_RTAS
+        default n
+
 config XICS
         depends on PPC_PSERIES
         bool