From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58D42C74A5B for ; Fri, 17 Mar 2023 11:37:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229488AbjCQLh2 (ORCPT ); Fri, 17 Mar 2023 07:37:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230198AbjCQLhM (ORCPT ); Fri, 17 Mar 2023 07:37:12 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F133A54F5 for ; Fri, 17 Mar 2023 04:36:41 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id y2so4778157pjg.3 for ; Fri, 17 Mar 2023 04:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1679053000; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=CteMDAzkrOKUdcbIvPON419eHbnDZdFOKMS6mt0sWZE=; b=VZ6G3n18NY2ywh8ZJIP5a1q5vyUd1RSPTc04ndLwDgvZ7RaZVbAPNNVJeyXbP5PVHh SWXIxZb8pc879LhwRi6ia8U5cokPvvwQSbZaoap2VXP9FL1zSIyd0DOApw8FzA+WBRed HdQiBCilPYUrsXRKDPKGlOgw68NXZ8tzRqsh7HAmgCYo5uPiUSn69TjRDE9qgbDyGYUG D0gpqk1Hgh8UZCBsCc4MdXNYTeOgzwyndmX9Mj1DCOn/q7YQiNmG1brgM3poGw3kbWPU YuBLjVDDnVu3JLFxMQH5/o3aSzPrtZzB2b8zb8XS+xdL6PnlEmrbXuvdo6mP91cg7E/8 JUhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679053000; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CteMDAzkrOKUdcbIvPON419eHbnDZdFOKMS6mt0sWZE=; b=lp/Bm4+nhEPXRI1rcdWepoXyBvHw//sANfo//GKcmLARA3anCV58KSoLHHASXzn7+C BCdbJtTjkXGrjJnhkiGDLd9/8XC6MSERzcJwzNPRWc0iUVH3vADpPWOH4JG6zZT37gVP tgptyLchUNW1waVObPHKncc9HD3f1/ZCl3ZwVSOL0szhO6bbxBEgusQgBFiyqwTi7ZIZ z/zqMcsmlAyZygb6ZgEQ0tb5tcj+hg/U+vKp+77WycV3RlqEDbTPWuRMaTT0Rr79w5gm 5bAMO/QWw4X3Axs2BR/cRz5HVGS78L5Oln37nbl6MSfKv975LoX/vds33iWS3wKP/UGe 7CIg== X-Gm-Message-State: AO0yUKXQnriIwIoseeQI3A6KBeWC9UPI0Umkn7LMhAL8K6h7E7fPMpfL HGvV1rr1XQ2zPB5CxLApdllKgA== X-Google-Smtp-Source: AK7set8m1tJUb4yda0a0o5QrielGjo7ODOpMyvDqYBbbLmnWTKoi8a6Zp8otZtbVMpgo6xxjNbOVFA== X-Received: by 2002:a17:90b:3a90:b0:234:a9df:db96 with SMTP id om16-20020a17090b3a9000b00234a9dfdb96mr7576262pjb.33.1679052999854; Fri, 17 Mar 2023 04:36:39 -0700 (PDT) Received: from hsinchu25.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id n63-20020a17090a2cc500b0023d3845b02bsm1188740pjd.45.2023.03.17.04.36.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Mar 2023 04:36:39 -0700 (PDT) From: Andy Chiu To: linux-riscv@lists.infradead.org, palmer@dabbelt.com, anup@brainfault.org, atishp@atishpatra.org, kvm-riscv@lists.infradead.org, kvm@vger.kernel.org Cc: vineetg@rivosinc.com, greentime.hu@sifive.com, guoren@linux.alibaba.com, Andy Chiu , Paul Walmsley , Albert Ou , Vincent Chen , Conor Dooley , Alexandre Ghiti , Guo Ren , Masahiro Yamada Subject: [PATCH -next v15 04/19] riscv: Clear vector regfile on bootup Date: Fri, 17 Mar 2023 11:35:23 +0000 Message-Id: <20230317113538.10878-5-andy.chiu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230317113538.10878-1-andy.chiu@sifive.com> References: <20230317113538.10878-1-andy.chiu@sifive.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Greentime Hu clear vector registers on boot if kernel supports V. Signed-off-by: Greentime Hu Signed-off-by: Vineet Gupta Signed-off-by: Andy Chiu Acked-by: Conor Dooley --- arch/riscv/kernel/head.S | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/head.S b/arch/riscv/kernel/head.S index 4bf6c449d78b..3fd6a4bd9c3e 100644 --- a/arch/riscv/kernel/head.S +++ b/arch/riscv/kernel/head.S @@ -392,7 +392,7 @@ ENTRY(reset_regs) #ifdef CONFIG_FPU csrr t0, CSR_MISA andi t0, t0, (COMPAT_HWCAP_ISA_F | COMPAT_HWCAP_ISA_D) - beqz t0, .Lreset_regs_done + beqz t0, .Lreset_regs_done_fpu li t1, SR_FS csrs CSR_STATUS, t1 @@ -430,8 +430,31 @@ ENTRY(reset_regs) fmv.s.x f31, zero csrw fcsr, 0 /* note that the caller must clear SR_FS */ +.Lreset_regs_done_fpu: #endif /* CONFIG_FPU */ -.Lreset_regs_done: + +#ifdef CONFIG_RISCV_ISA_V + csrr t0, CSR_MISA + li t1, COMPAT_HWCAP_ISA_V + and t0, t0, t1 + beqz t0, .Lreset_regs_done_vector + + /* + * Clear vector registers and reset vcsr + * VLMAX has a defined value, VLEN is a constant, + * and this form of vsetvli is defined to set vl to VLMAX. + */ + li t1, SR_VS + csrs CSR_STATUS, t1 + csrs CSR_VCSR, x0 + vsetvli t1, x0, e8, m8, ta, ma + vmv.v.i v0, 0 + vmv.v.i v8, 0 + vmv.v.i v16, 0 + vmv.v.i v24, 0 + /* note that the caller must clear SR_VS */ +.Lreset_regs_done_vector: +#endif /* CONFIG_RISCV_ISA_V */ ret END(reset_regs) #endif /* CONFIG_RISCV_M_MODE */ -- 2.17.1