Re: [PATCH 2/4] powerpc/mm/radix: Use different RTS encoding for different POWER9 revs

[Michael Neuling]

On Wed, 2016-08-24 at 15:03 +0530, Aneesh Kumar K.V wrote:
> POWER9 DD1 uses RTS - 28 for the RTS value but other revisions use
> RTS - 31.  This makes this distinction for the different revisions
> 
> Signed-off-by: Aneesh Kumar K.V 

Acked-by: Michael Neuling 

> ---
>  arch/powerpc/include/asm/book3s/64/radix.h | 13 +
>  1 file changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/include/asm/book3s/64/radix.h 
> b/arch/powerpc/include/asm/book3s/64/radix.h
> index df294224e280..a2fe8fbfbd3d 100644
> --- a/arch/powerpc/include/asm/book3s/64/radix.h
> +++ b/arch/powerpc/include/asm/book3s/64/radix.h
> @@ -233,14 +233,19 @@ static inline unsigned long radix__get_tree_size(void)
>  {
>   unsigned long rts_field;
>   /*
> -  * we support 52 bits, hence 52-31 = 21, 0b10101
> +  * We support 52 bits, hence:
> +  *  DD152-28 = 24, 0b11000
> +  *  Others 52-31 = 21, 0b10101
>    * RTS encoding details
>    * bits 0 - 3 of rts -> bits 6 - 8 unsigned long
>    * bits 4 - 5 of rts -> bits 62 - 63 of unsigned long
>    */
> - rts_field = (0x5UL << 5); /* 6 - 8 bits */
> - rts_field |= (0x2UL << 61);
> -
> + if (cpu_has_feature(CPU_FTR_POWER9_DD1))
> + rts_field = (0x3UL << 61);
> + else {
> + rts_field = (0x5UL << 5); /* 6 - 8 bits */
> + rts_field |= (0x2UL << 61);
> + }
>   return rts_field;
>  }
>  #endif /* __ASSEMBLY__ */

[PATCH 2/4] powerpc/mm/radix: Use different RTS encoding for different POWER9 revs

[Aneesh Kumar K.V]

POWER9 DD1 uses RTS - 28 for the RTS value but other revisions use
RTS - 31.  This makes this distinction for the different revisions

Signed-off-by: Aneesh Kumar K.V 
---
 arch/powerpc/include/asm/book3s/64/radix.h | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/include/asm/book3s/64/radix.h 
b/arch/powerpc/include/asm/book3s/64/radix.h
index df294224e280..a2fe8fbfbd3d 100644
--- a/arch/powerpc/include/asm/book3s/64/radix.h
+++ b/arch/powerpc/include/asm/book3s/64/radix.h
@@ -233,14 +233,19 @@ static inline unsigned long radix__get_tree_size(void)
 {
unsigned long rts_field;
/*
-* we support 52 bits, hence 52-31 = 21, 0b10101
+* We support 52 bits, hence:
+*  DD152-28 = 24, 0b11000
+*  Others 52-31 = 21, 0b10101
 * RTS encoding details
 * bits 0 - 3 of rts -> bits 6 - 8 unsigned long
 * bits 4 - 5 of rts -> bits 62 - 63 of unsigned long
 */
-   rts_field = (0x5UL << 5); /* 6 - 8 bits */
-   rts_field |= (0x2UL << 61);
-
+   if (cpu_has_feature(CPU_FTR_POWER9_DD1))
+   rts_field = (0x3UL << 61);
+   else {
+   rts_field = (0x5UL << 5); /* 6 - 8 bits */
+   rts_field |= (0x2UL << 61);
+   }
return rts_field;
 }
 #endif /* __ASSEMBLY__ */
-- 
2.7.4