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

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

powerpc/mm: Use 32bit array for slb cache 



With larger vsid we need to track more bits of ESID in slb cache
for slb invalidate.

Reviewed-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>
parent ac8dc282

arch/powerpc/include/asm/paca.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ struct paca_struct { 
	/* SLB related definitions */

	u16 vmalloc_sllp;

	u16 slb_cache_ptr;

	u16 slb_cache[SLB_CACHE_ENTRIES];

	u32 slb_cache[SLB_CACHE_ENTRIES];

#endif /* CONFIG_PPC_STD_MMU_64 */



#ifdef CONFIG_PPC_BOOK3E

arch/powerpc/mm/slb_low.S

+4 −4
Original line number Diff line number Diff line
@@ -270,10 +270,10 @@ _GLOBAL(slb_compare_rr_to_size) 
	bge	1f



	/* still room in the slb cache */

	sldi	r11,r3,1		/* r11 = offset * sizeof(u16) */

	rldicl	r10,r10,36,28		/* get low 16 bits of the ESID */

	add	r11,r11,r13		/* r11 = (u16 *)paca + offset */

	sth	r10,PACASLBCACHE(r11)	/* paca->slb_cache[offset] = esid */

	sldi	r11,r3,2		/* r11 = offset * sizeof(u32) */

	srdi    r10,r10,28		/* get the 36 bits of the ESID */

	add	r11,r11,r13		/* r11 = (u32 *)paca + offset */

	stw	r10,PACASLBCACHE(r11)	/* paca->slb_cache[offset] = esid */

	addi	r3,r3,1			/* offset++ */

	b	2f

1:					/* offset >= SLB_CACHE_ENTRIES */