7 files changed, 22 insertions, 13 deletions

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 7b4eccffd002..89b35c181314 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -422,7 +422,7 @@ void __init htab_initialize(void)
 
         htab_hash_mask = pteg_count - 1;
 
-        if (platform_is_lpar()) {
+        if (firmware_has_feature(FW_FEATURE_LPAR)) {
                 /* Using a hypervisor which owns the htab */
                 htab_address = NULL;
                 _SDR1 = 0; 
@@ -517,7 +517,7 @@ void __init htab_initialize(void)
 
 void htab_initialize_secondary(void)
 {
-        if (!platform_is_lpar())
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
                 mtspr(SPRN_SDR1, _SDR1);
 }
 
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 659a021da0c7..4b06e53eb9b4 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -10,6 +10,7 @@
 #include <linux/oprofile.h>
 #include <linux/init.h>
 #include <linux/smp.h>
+#include <asm/firmware.h>
 #include <asm/ptrace.h>
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -232,7 +233,7 @@ static unsigned long get_pc(struct pt_regs *regs)
         mmcra = mfspr(SPRN_MMCRA);
 
         /* Were we in the hypervisor? */
-        if (platform_is_lpar() && (mmcra & MMCRA_SIHV))
+        if (firmware_has_feature(FW_FEATURE_LPAR) && (mmcra & MMCRA_SIHV))
                 /* function descriptor madness */
                 return *((unsigned long *)hypervisor_bucket);
 
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 3ecc4a652d82..b08c3686f903 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -303,8 +303,6 @@ static void __init iSeries_init_early(void)
 {
         DBG(" -> iSeries_init_early()\n");
 
-        ppc64_firmware_features = FW_FEATURE_ISERIES;
-
         ppc64_interrupt_controller = IC_ISERIES;
 
 #if defined(CONFIG_BLK_DEV_INITRD)
@@ -711,7 +709,13 @@ void __init iSeries_init_IRQ(void) { }
 
 static int __init iseries_probe(int platform)
 {
-        return PLATFORM_ISERIES_LPAR == platform;
+        if (PLATFORM_ISERIES_LPAR != platform)
+                return 0;
+
+        ppc64_firmware_features |= FW_FEATURE_ISERIES;
+        ppc64_firmware_features |= FW_FEATURE_LPAR;
+
+        return 1;
 }
 
 struct machdep_calls __initdata iseries_md = {
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 57930e23cc74..2643078433f0 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -580,7 +580,7 @@ void iommu_init_early_pSeries(void)
                 return;
         }
 
-        if (platform_is_lpar()) {
+        if (firmware_has_feature(FW_FEATURE_LPAR)) {
                 if (firmware_has_feature(FW_FEATURE_MULTITCE)) {
                         ppc_md.tce_build = tce_buildmulti_pSeriesLP;
                         ppc_md.tce_free  = tce_freemulti_pSeriesLP;
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 149751a3742a..44d5c7fdcd97 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -246,7 +246,7 @@ static void __init pSeries_setup_arch(void)
                 ppc_md.idle_loop = default_idle;
         }
 
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
         else
                 ppc_md.enable_pmcs = power4_enable_pmcs;
@@ -324,12 +324,12 @@ static void __init pSeries_init_early(void)
 
         fw_feature_init();
         
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 hpte_init_lpar();
         else
                 hpte_init_native();
 
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 find_udbg_vterm();
 
         if (firmware_has_feature(FW_FEATURE_DABR))
@@ -385,6 +385,9 @@ static int __init pSeries_probe(int platform)
          * it here ...
          */
 
+        if (platform == PLATFORM_PSERIES_LPAR)
+                ppc64_firmware_features |= FW_FEATURE_LPAR;
+
         return 1;
 }
 
@@ -524,7 +527,7 @@ static void pseries_shared_idle(void)
 
 static int pSeries_pci_probe_mode(struct pci_bus *bus)
 {
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 return PCI_PROBE_DEVTREE;
         return PCI_PROBE_NORMAL;
 }
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 8d710af50756..3cf78a6cd27c 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -443,7 +443,7 @@ void __init smp_init_pSeries(void)
         smp_ops->cpu_die = pSeries_cpu_die;
 
         /* Processors can be added/removed only on LPAR */
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 pSeries_reconfig_notifier_register(&pSeries_smp_nb);
 #endif
 
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index fd823c7c9ac8..eb86cdb9b802 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -20,6 +20,7 @@
 #include <linux/gfp.h>
 #include <linux/radix-tree.h>
 #include <linux/cpu.h>
+#include <asm/firmware.h>
 #include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
@@ -536,7 +537,7 @@ nextnode:
                 of_node_put(np);
         }
 
-        if (platform_is_lpar())
+        if (firmware_has_feature(FW_FEATURE_LPAR))
                 ops = &pSeriesLP_ops;
         else {
 #ifdef CONFIG_SMP