[PATCH 14/19] riscv: hwprobe: Disambiguate vector and xtheadvector in hwprobe

[Charlie Jenkins]

Ensure that hwprobe does not flag "v" when xtheadvector is present.

Signed-off-by: Charlie Jenkins <char...@rivosinc.com>
---
 arch/riscv/kernel/sys_hwprobe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/kernel/sys_hwprobe.c b/arch/riscv/kernel/sys_hwprobe.c
index 8cae41a502dd..e0a42c851511 100644
--- a/arch/riscv/kernel/sys_hwprobe.c
+++ b/arch/riscv/kernel/sys_hwprobe.c
@@ -69,7 +69,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
        if (riscv_isa_extension_available(NULL, c))
                pair->value |= RISCV_HWPROBE_IMA_C;
 
-       if (has_vector())
+       if (has_vector() && 
!riscv_has_vendor_extension_unlikely(RISCV_ISA_VENDOR_EXT_XTHEADVECTOR))
                pair->value |= RISCV_HWPROBE_IMA_V;
 
        /*
@@ -112,7 +112,7 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair,
                EXT_KEY(ZACAS);
                EXT_KEY(ZICOND);
 
-               if (has_vector()) {
+               if (has_vector() && 
!riscv_has_vendor_extension_unlikely(RISCV_ISA_VENDOR_EXT_XTHEADVECTOR)) {
                        EXT_KEY(ZVBB);
                        EXT_KEY(ZVBC);
                        EXT_KEY(ZVKB);

-- 
2.44.0