diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-30 11:28:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-30 11:28:18 -0700 |
| commit | 9e79e3e9dd9672b37ac9412e9a926714306551fe (patch) | |
| tree | bf9a6f763f90b0df4f36aec65b4f1cc00d9bf33d | |
| parent | ebde8b0223020b0cdd18c284ab5c0bb67ebc787e (diff) | |
| parent | 1a8e0da5937a6c87807083baa318cf8f98dac9aa (diff) | |
| download | linux-9e79e3e9dd9672b37ac9412e9a926714306551fe.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Only Panther cheetah+ chips have POPC.
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 3e9daea1653d..3c5bb784214f 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -440,8 +440,14 @@ static void __init init_sparc64_elf_hwcap(void) cap |= AV_SPARC_VIS; if (tlb_type == cheetah || tlb_type == cheetah_plus) cap |= AV_SPARC_VIS | AV_SPARC_VIS2; - if (tlb_type == cheetah_plus) - cap |= AV_SPARC_POPC; + if (tlb_type == cheetah_plus) { + unsigned long impl, ver; + + __asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver)); + impl = ((ver >> 32) & 0xffff); + if (impl == PANTHER_IMPL) + cap |= AV_SPARC_POPC; + } if (tlb_type == hypervisor) { if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1) cap |= AV_SPARC_ASI_BLK_INIT; |