diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-29 21:14:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:02 -0700 |
| commit | f7ae5caa73f0f1b226da2dae7403e7d12d58db26 (patch) | |
| tree | 23364e1107f8127125de3d3f1e1e86d683fb90e2 /arch/sparc | |
| parent | 94dea7201a65816b802d8c8b8b0877590fd67d7e (diff) | |
| download | kernel_samsung_smdk4412-f7ae5caa73f0f1b226da2dae7403e7d12d58db26.zip kernel_samsung_smdk4412-f7ae5caa73f0f1b226da2dae7403e7d12d58db26.tar.gz kernel_samsung_smdk4412-f7ae5caa73f0f1b226da2dae7403e7d12d58db26.tar.bz2 | |
sparc64: Only Panther cheetah+ chips have POPC.
commit 1a8e0da5937a6c87807083baa318cf8f98dac9aa upstream.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/sparc')
| -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 3e9daea..3c5bb78 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; |