Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b7efa89 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Don't probe reserved EntryHi bits. 



The patch that adds cpu_probe_vmbits is erroneously writing to reserved
bit 12.  Since we are really only probing high bits, don't write this bit
with a one.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Cc: Guenter Roeck <guenter.roeck@ericsson.com>
Patchwork: http://patchwork.linux-mips.org/patch/949/


Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c2d5b5e5

arch/mips/kernel/cpu-probe.c

+2 −2
Original line number Diff line number Diff line
@@ -287,9 +287,9 @@ static inline int __cpu_has_fpu(void) 
static inline void cpu_probe_vmbits(struct cpuinfo_mips *c)

{

#ifdef __NEED_VMBITS_PROBE

	write_c0_entryhi(0x3ffffffffffff000ULL);

	write_c0_entryhi(0x3fffffffffffe000ULL);

	back_to_back_c0_hazard();

	c->vmbits = fls64(read_c0_entryhi() & 0x3ffffffffffff000ULL);

	c->vmbits = fls64(read_c0_entryhi() & 0x3fffffffffffe000ULL);

#endif

}