[PATCH for-fixes] MIPS: Loongson64: Do not override watch and ejtag feature

[PATCH for-fixes] MIPS: Loongson64: Do not override watch and ejtag feature

[Jiaxun Yang]

Do not override ejtag feature to 0 as Loongson 3A1000+ do have ejtag.
For watch, as KVM emulated CPU doesn't have watch feature, we should
not enable it unconditionally.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
---
This patch should go into mips-fixes tree as watch feature is blocking
KVM guest boot in some cases.
---
 arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 2 --
 1 file changed, 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 b6e9c99b85a5..eb181224eb4c 100644
--- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
@@ -26,7 +26,6 @@
 #define cpu_has_counter		1
 #define cpu_has_dc_aliases	(PAGE_SIZE < 0x4000)
 #define cpu_has_divec		0
-#define cpu_has_ejtag		0
 #define cpu_has_inclusive_pcaches	1
 #define cpu_has_llsc		1
 #define cpu_has_mcheck		0
@@ -42,7 +41,6 @@
 #define cpu_has_veic		0
 #define cpu_has_vint		0
 #define cpu_has_vtag_icache	0
-#define cpu_has_watch		1
 #define cpu_has_wsbh		1
 #define cpu_has_ic_fills_f_dc	1
 #define cpu_hwrena_impl_bits	0xc0000000
-- 
2.28.0.rc1

Re: [PATCH for-fixes] MIPS: Loongson64: Do not override watch and ejtag feature

[Huacai Chen]

Reviewed-by: Huacai Chen <chenhc@lemote.com>

On Sat, Aug 8, 2020 at 8:33 PM Jiaxun Yang <jiaxun.yang@flygoat.com> wrote:
>
> Do not override ejtag feature to 0 as Loongson 3A1000+ do have ejtag.
> For watch, as KVM emulated CPU doesn't have watch feature, we should
> not enable it unconditionally.
>
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> This patch should go into mips-fixes tree as watch feature is blocking
> KVM guest boot in some cases.
> ---
>  arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 2 --
>  1 file changed, 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 b6e9c99b85a5..eb181224eb4c 100644
> --- a/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
> +++ b/arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h
> @@ -26,7 +26,6 @@
>  #define cpu_has_counter                1
>  #define cpu_has_dc_aliases     (PAGE_SIZE < 0x4000)
>  #define cpu_has_divec          0
> -#define cpu_has_ejtag          0
>  #define cpu_has_inclusive_pcaches      1
>  #define cpu_has_llsc           1
>  #define cpu_has_mcheck         0
> @@ -42,7 +41,6 @@
>  #define cpu_has_veic           0
>  #define cpu_has_vint           0
>  #define cpu_has_vtag_icache    0
> -#define cpu_has_watch          1
>  #define cpu_has_wsbh           1
>  #define cpu_has_ic_fills_f_dc  1
>  #define cpu_hwrena_impl_bits   0xc0000000
> --
> 2.28.0.rc1
>

Re: [PATCH for-fixes] MIPS: Loongson64: Do not override watch and ejtag feature

[Thomas Bogendoerfer]

On Sat, Aug 08, 2020 at 08:32:27PM +0800, Jiaxun Yang wrote:
> Do not override ejtag feature to 0 as Loongson 3A1000+ do have ejtag.
> For watch, as KVM emulated CPU doesn't have watch feature, we should
> not enable it unconditionally.
> 
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
> This patch should go into mips-fixes tree as watch feature is blocking
> KVM guest boot in some cases.
> ---
>  arch/mips/include/asm/mach-loongson64/cpu-feature-overrides.h | 2 --
>  1 file changed, 2 deletions(-)

applied to mips-fixes.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]