On Wed, Apr 20, 2016 at 02:14:42PM +0800, Huacai Chen wrote:
> Some Loongson-3 features (i.e., cpu_has_wsbh, cpu_has_ic_fills_f_dc and
> cpu_hwrena_impl_bits) are different from Loongson-2, so we define them
> in a single group. This also fixes 04a35922c1dac ("MIPS: Loongson: Add
> Loongson-3A R2 basic support") which breaks Loongson-2E/2F's booting.
>
> Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
Tested-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
> index c3406db..89328a3d 100644
> --- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
> +++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
> @@ -27,7 +27,6 @@
> #define cpu_has_dc_aliases (PAGE_SIZE < 0x4000)
> #define cpu_has_divec 0
> #define cpu_has_ejtag 0
> -#define cpu_has_ic_fills_f_dc 0
> #define cpu_has_inclusive_pcaches 1
> #define cpu_has_llsc 1
> #define cpu_has_mcheck 0
> @@ -45,7 +44,10 @@
> #define cpu_has_watch 1
> #define cpu_has_local_ebase 0
>
> -#define cpu_has_wsbh IS_ENABLED(CONFIG_CPU_LOONGSON3)
> +#ifdef CONFIG_CPU_LOONGSON3
> +#define cpu_has_wsbh 1
> +#define cpu_has_ic_fills_f_dc 1
> #define cpu_hwrena_impl_bits 0xc0000000
> +#endif
>
> #endif /* __ASM_MACH_LOONGSON64_CPU_FEATURE_OVERRIDES_H */
