powerpc/85xx: disable timebase synchronization under the hypervisor

The Freescale hypervisor does not allow guests to write to the timebase
registers (virtualizing the timebase register was deemed too complicated),
so don't try to synchronize the timebase registers when we're running
under the hypervisor.

This typically happens when kexec support is enabled.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/platforms/85xx/p3041_ds.c b/arch/powerpc/platforms/85xx/p3041_ds.c
index 1fcd233a91677c0caca21ec4176dc1da5393bb8a..96d99a374dcf30e9e897c88f23e79242a73fd67c 100644 (file)
--- a/arch/powerpc/platforms/85xx/p3041_ds.c
+++ b/arch/powerpc/platforms/85xx/p3041_ds.c
@@ -40,6 +40,9 @@
 static int __init p3041_ds_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+       extern struct smp_ops_t smp_85xx_ops;
+#endif
 
        if (of_flat_dt_is_compatible(root, "fsl,P3041DS"))
                return 1;
@@ -51,6 +54,14 @@ static int __init p3041_ds_probe(void)
                ppc_md.restart = fsl_hv_restart;
                ppc_md.power_off = fsl_hv_halt;
                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+               /*
+                * Disable the timebase sync operations because we can't write
+                * to the timebase registers under the hypervisor.
+                 */
+               smp_85xx_ops.give_timebase = NULL;
+               smp_85xx_ops.take_timebase = NULL;
+#endif
                return 1;
        }
 

diff --git a/arch/powerpc/platforms/85xx/p4080_ds.c b/arch/powerpc/platforms/85xx/p4080_ds.c
index 430c8f969177efac8ea097974fd9245a0d486543..d1b21d7663e3ae6a9e8eafeb46ca2e4d2ec5d15f 100644 (file)
--- a/arch/powerpc/platforms/85xx/p4080_ds.c
+++ b/arch/powerpc/platforms/85xx/p4080_ds.c
@@ -39,6 +39,9 @@
 static int __init p4080_ds_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+       extern struct smp_ops_t smp_85xx_ops;
+#endif
 
        if (of_flat_dt_is_compatible(root, "fsl,P4080DS"))
                return 1;
@@ -50,6 +53,14 @@ static int __init p4080_ds_probe(void)
                ppc_md.restart = fsl_hv_restart;
                ppc_md.power_off = fsl_hv_halt;
                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+               /*
+                * Disable the timebase sync operations because we can't write
+                * to the timebase registers under the hypervisor.
+                 */
+               smp_85xx_ops.give_timebase = NULL;
+               smp_85xx_ops.take_timebase = NULL;
+#endif
                return 1;
        }
 

diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c
index f7220d47ddcb4817cdc1f5389a79d63f3e3c00bb..e8cba5004fd822063c97e8a5ec1d4bbf9a1cb4d5 100644 (file)
--- a/arch/powerpc/platforms/85xx/p5020_ds.c
+++ b/arch/powerpc/platforms/85xx/p5020_ds.c
@@ -40,6 +40,9 @@
 static int __init p5020_ds_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
+#ifdef CONFIG_SMP
+       extern struct smp_ops_t smp_85xx_ops;
+#endif
 
        if (of_flat_dt_is_compatible(root, "fsl,P5020DS"))
                return 1;
@@ -51,6 +54,14 @@ static int __init p5020_ds_probe(void)
                ppc_md.restart = fsl_hv_restart;
                ppc_md.power_off = fsl_hv_halt;
                ppc_md.halt = fsl_hv_halt;
+#ifdef CONFIG_SMP
+               /*
+                * Disable the timebase sync operations because we can't write
+                * to the timebase registers under the hypervisor.
+                 */
+               smp_85xx_ops.give_timebase = NULL;
+               smp_85xx_ops.take_timebase = NULL;
+#endif
                return 1;
        }