On Thu, Aug 10, 2017 at 10:00:26AM +0800, Huacai Chen wrote:
> New Loongson-3 (Loongson-3A R2, Loongson-3A R3, and newer) has SFB
> (Store Fill Buffer) which can improve the performance of memory access.
> Now, SFB enablement is controlled by CONFIG_LOONGSON3_ENHANCEMENT, and
> the generic kernel has no benefit from SFB (even it is running on a new
> Loongson-3 machine). With this patch, we can enable SFB at runtime by
> detecting the CPU type (the expense is war_io_reorder_wmb() will always
> be a 'sync', which will hurt the performance of old Loongson-3).
>
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
> ---
> arch/mips/include/asm/io.h | 2 +-
> .../asm/mach-loongson64/kernel-entry-init.h | 38 +++++++++++++---------
> arch/mips/include/asm/mipsregs.h | 2 ++
> 3 files changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
> index ecabc00..d3e38af 100644
> --- a/arch/mips/include/asm/io.h
> +++ b/arch/mips/include/asm/io.h
> @@ -304,7 +304,7 @@ static inline void iounmap(const volatile void __iomem *addr)
> #undef __IS_KSEG1
> }
>
> -#if defined(CONFIG_CPU_CAVIUM_OCTEON) || defined(CONFIG_LOONGSON3_ENHANCEMENT)
> +#if defined(CONFIG_CPU_CAVIUM_OCTEON) || defined(CONFIG_CPU_LOONGSON3)
> #define war_io_reorder_wmb() wmb()
> #else
> #define war_io_reorder_wmb() do { } while (0)
> diff --git a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
> index 8393bc54..4b7f58a 100644
> --- a/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
> +++ b/arch/mips/include/asm/mach-loongson64/kernel-entry-init.h
> @@ -19,19 +19,22 @@
> .set push
> .set mips64
> /* Set LPA on LOONGSON3 config3 */
> - mfc0 t0, $16, 3
> + mfc0 t0, CP0_CONFIG3
> or t0, (0x1 << 7)
> - mtc0 t0, $16, 3
> + mtc0 t0, CP0_CONFIG3
> /* Set ELPA on LOONGSON3 pagegrain */
> - mfc0 t0, $5, 1
> + mfc0 t0, CP0_PAGEGRAIN
Please don't mix cleanups with functional changes.
Separately, both the cleanup and the main change look good to me.
Cheers
James
> or t0, (0x1 << 29)
> - mtc0 t0, $5, 1
> -#ifdef CONFIG_LOONGSON3_ENHANCEMENT
> + mtc0 t0, CP0_PAGEGRAIN
> /* Enable STFill Buffer */
> - mfc0 t0, $16, 6
> + mfc0 t0, CP0_PRID
> + andi t0, 0xffff
> + slti t0, 0x6308
> + bnez t0, 1f
> + mfc0 t0, CP0_CONFIG6
> or t0, 0x100
> - mtc0 t0, $16, 6
> -#endif
> + mtc0 t0, CP0_CONFIG6
> +1:
> _ehb
> .set pop
> #endif
> @@ -45,19 +48,22 @@
> .set push
> .set mips64
> /* Set LPA on LOONGSON3 config3 */
> - mfc0 t0, $16, 3
> + mfc0 t0, CP0_CONFIG3
> or t0, (0x1 << 7)
> - mtc0 t0, $16, 3
> + mtc0 t0, CP0_CONFIG3
> /* Set ELPA on LOONGSON3 pagegrain */
> - mfc0 t0, $5, 1
> + mfc0 t0, CP0_PAGEGRAIN
> or t0, (0x1 << 29)
> - mtc0 t0, $5, 1
> -#ifdef CONFIG_LOONGSON3_ENHANCEMENT
> + mtc0 t0, CP0_PAGEGRAIN
> /* Enable STFill Buffer */
> - mfc0 t0, $16, 6
> + mfc0 t0, CP0_PRID
> + andi t0, 0xffff
> + slti t0, 0x6308
> + bnez t0, 1f
> + mfc0 t0, CP0_CONFIG6
> or t0, 0x100
> - mtc0 t0, $16, 6
> -#endif
> + mtc0 t0, CP0_CONFIG6
> +1:
> _ehb
> .set pop
> #endif
> diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
> index dbb0ece..cb1ebc6 100644
> --- a/arch/mips/include/asm/mipsregs.h
> +++ b/arch/mips/include/asm/mipsregs.h
> @@ -50,6 +50,7 @@
> #define CP0_CONF $3
> #define CP0_CONTEXT $4
> #define CP0_PAGEMASK $5
> +#define CP0_PAGEGRAIN $5, 1
> #define CP0_SEGCTL0 $5, 2
> #define CP0_SEGCTL1 $5, 3
> #define CP0_SEGCTL2 $5, 4
> @@ -76,6 +77,7 @@
> #define CP0_CONFIG $16
> #define CP0_CONFIG3 $16, 3
> #define CP0_CONFIG5 $16, 5
> +#define CP0_CONFIG6 $16, 6
> #define CP0_LLADDR $17
> #define CP0_WATCHLO $18
> #define CP0_WATCHHI $19
> --
> 2.7.0
>
>
>
>
Attachment:
signature.asc
Description: Digital signature
