Re: [PATCH v3 06/10] powerpc/fsl_booke/32: implement KASLR infrastructure

[Jason Yan]

Hi Diana,

On 2019/8/2 16:41, Diana Madalina Craciun wrote:
> > diff --git a/arch/powerpc/kernel/fsl_booke_entry_mapping.S b/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > index de0980945510..6d2967673ac7 100644
> > --- a/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > +++ b/arch/powerpc/kernel/fsl_booke_entry_mapping.S
> > @@ -161,17 +161,16 @@ skpinv:	addi	r6,r6,1				/* Increment */
> >   	lis	r6,(MAS1_VALID|MAS1_IPROT)@h
> >   	ori	r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_64M))@l
> >   	mtspr	SPRN_MAS1,r6
> > -	lis	r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_NEEDED)@h
> > -	ori	r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_NEEDED)@l
> > -	mtspr	SPRN_MAS2,r6
> > +	lis     r6,MAS2_EPN_MASK(BOOK3E_PAGESZ_64M)@h
> > +	ori     r6,r6,MAS2_EPN_MASK(BOOK3E_PAGESZ_64M)@l
> > +	and     r6,r6,r20
> > +	ori	r6,r6,M_IF_NEEDED@l
> > +	mtspr   SPRN_MAS2,r6
> >   	mtspr	SPRN_MAS3,r8
> >   	tlbwe
> >   
> >   /* 7. Jump to KERNELBASE mapping */
> The code has changed, but the comment reflects the old code (it no
> longer jumps to KERNELBASE, but to kimage_vaddr). This is true for step
> 6 as well.

Good catch, I will update the comment.

Thanks,
Jason