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

Commit e39d1a47 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Benjamin Herrenschmidt
Browse files

powerpc: Make VSID_BITS* dependency explicit 



VSID_BITS and VSID_BITS_1T depends on the context bits  and user esid
bits. Make the dependency explicit

Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org> [v3.8]
parent d812c0e1

arch/powerpc/include/asm/mmu-hash64.h

+6 −5
Original line number Diff line number Diff line
@@ -381,21 +381,22 @@ extern void slb_set_size(u16 size); 
 * hash collisions.

 */



#define CONTEXT_BITS		19

#define USER_ESID_BITS		18

#define USER_ESID_BITS_1T	6



/*

 * This should be computed such that protovosid * vsid_mulitplier

 * doesn't overflow 64 bits. It should also be co-prime to vsid_modulus

 */

#define VSID_MULTIPLIER_256M	ASM_CONST(12538073)	/* 24-bit prime */

#define VSID_BITS_256M		38

#define VSID_BITS_256M		(CONTEXT_BITS + USER_ESID_BITS + 1)

#define VSID_MODULUS_256M	((1UL<<VSID_BITS_256M)-1)



#define VSID_MULTIPLIER_1T	ASM_CONST(12538073)	/* 24-bit prime */

#define VSID_BITS_1T		26

#define VSID_BITS_1T		(CONTEXT_BITS + USER_ESID_BITS_1T + 1)

#define VSID_MODULUS_1T		((1UL<<VSID_BITS_1T)-1)



#define CONTEXT_BITS		19

#define USER_ESID_BITS		18

#define USER_ESID_BITS_1T	6



#define USER_VSID_RANGE	(1UL << (USER_ESID_BITS + SID_SHIFT))