diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-09 02:52:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 01:12:03 -0800 |
| commit | d82ace7dc4073b090a55b9740700e32b9a9ae302 (patch) | |
| tree | d5aa8e10664b05bbfe31eacf95e2066c03cab102 /arch/sparc64/kernel/setup.c | |
| parent | 1d2f1f90a1e004b0c1b8a73ed4394a93f09104b3 (diff) | |
| download | blackbird-op-linux-d82ace7dc4073b090a55b9740700e32b9a9ae302.tar.gz blackbird-op-linux-d82ace7dc4073b090a55b9740700e32b9a9ae302.zip | |
[SPARC64]: Detect sun4v early in boot process.
We look for "SUNW,sun4v" in the 'compatible' property
of the root OBP device tree node.
Protect every %ver register access, to make sure it is
not touched on sun4v, as %ver is hyperprivileged there.
Lock kernel TLB entries using hypervisor calls instead of
calls into OBP.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
| -rw-r--r-- | arch/sparc64/kernel/setup.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 2d64320d3a4d..7f02c8f71df6 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c @@ -504,9 +504,12 @@ static void __init per_cpu_patch(void) if (tlb_type == spitfire && !this_is_starfire) return; - __asm__ ("rdpr %%ver, %0" : "=r" (ver)); - is_jbus = ((ver >> 32) == __JALAPENO_ID || - (ver >> 32) == __SERRANO_ID); + is_jbus = 0; + if (tlb_type != hypervisor) { + __asm__ ("rdpr %%ver, %0" : "=r" (ver)); + is_jbus = ((ver >> 32) == __JALAPENO_ID || + (ver >> 32) == __SERRANO_ID); + } p = &__cpuid_patch; while (p < &__cpuid_patch_end) { |
