diff options
| author | Timur Tabi <timur@freescale.com> | 2011-06-14 13:04:33 +0000 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-06-27 08:36:19 -0500 |
| commit | 14497d31e65cca73c9814a1ff373ae294aae616b (patch) | |
| tree | 982eb296f2234f40c8ad8c027dbaf92a900af872 /arch/powerpc/platforms/85xx/p5020_ds.c | |
| parent | 2d05c392b8403d4a1becc8babd4b44465a758b64 (diff) | |
| download | linux-14497d31e65cca73c9814a1ff373ae294aae616b.tar.gz linux-14497d31e65cca73c9814a1ff373ae294aae616b.tar.bz2 linux-14497d31e65cca73c9814a1ff373ae294aae616b.zip | |
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>
Diffstat (limited to 'arch/powerpc/platforms/85xx/p5020_ds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/p5020_ds.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/85xx/p5020_ds.c b/arch/powerpc/platforms/85xx/p5020_ds.c index f7220d47ddcb..e8cba5004fd8 100644 --- 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; } |