Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp259536pxh; Tue, 9 Nov 2021 10:15:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxrSbSKR2xAwcVXWaM1+BupdG6ZtJDGWl0gPecRrHCGGu1Aqcl7qtfK09IoRwtsIFaBt0N X-Received: by 2002:a05:6402:4d5:: with SMTP id n21mr12579394edw.303.1636481708816; Tue, 09 Nov 2021 10:15:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636481708; cv=none; d=google.com; s=arc-20160816; b=gf9aWfhfA2mHh71TTh6vy+yiuJdeGYezN8zX5Cx/RGpPTheLksCDnyqGL67+0Mr9ak hBNuz2dMeUgq9eXV3eqRxjcx0CYwPmRZStqpJiBeWvrgXQ1KyZLgXgS4kCluQ/D+CUOH 9qcL+4u82nO9z05dqpIiZO45sPEnK0BLTdgiLEijqviG8+XeJcWHA/rghwSb50niELYo lWWVtO5idKrzRzkANIdG88v0dcrAYCGKw0bDhjFl2SpJjLgA5m+bUnDTIwy7SVGBRJVt NEp5btA0FJgYGuxmJnpguzkAJERV75UNGn0YOwf3Jlnr1u3DokB+c8++kDkGg7S+JS80 jd4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=P9b3tDY+655xD0tPu9SBTJCGpaBZsqsfT1tLH+eh9ss=; b=Ig5xWIfVwSnn3L3C8YHSsshm7Rn/HOS/293F/3ogNyUh5PUIn1lf+2t6GWoVs4H1F6 mVvaiCa2A193xUYC05suO8BZ0Z2KsEAhaW74FHYHb3CogWLL4KFTAr3Oc0L4711m4pPP 8qCpD0Bz618AY+XMp7/W4fuPhIJDQf2Fs6EIItO2KLVLdIltVPtQsFLpHkw7AQPLoN0i D/Yj/KyInqeGObq0Xdny5IB78+CiyZIA7q+vRey3uz9pc81l8lY40D0guP+zkm/BAMkM HIyUiNjMxyUEMJFH8+LtdTVpSfoeVbAhQa1CR7zj3Z4YYFbmfdZY90awqmQP6QA8v42W 5SGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=lH+Zi+bt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nc35si35742707ejc.735.2021.11.09.10.14.42; Tue, 09 Nov 2021 10:15:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=lH+Zi+bt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244999AbhKIJwh (ORCPT + 99 others); Tue, 9 Nov 2021 04:52:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244164AbhKIJvj (ORCPT ); Tue, 9 Nov 2021 04:51:39 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B410CC061764 for ; Tue, 9 Nov 2021 01:48:53 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id y1so19905343plk.10 for ; Tue, 09 Nov 2021 01:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=P9b3tDY+655xD0tPu9SBTJCGpaBZsqsfT1tLH+eh9ss=; b=lH+Zi+btz0Y3PlO5Le6vD8gIS2gNoRc+CDGfvwK17wjnrtv9A40qM8mlBQvpTgMzfv eiKZw0ZQTiDbMwH/xUeRYTyag0FYNP1oWYpOmMyM2yiXFnw4/HcDC7w1AGojiPJ3Fn5y Fuw3/MPUiXHruI1mYFcflj+FDpE4U7yI4DIoQmV/hMk7+y/+ZKTCMkV8eJh1AuYi0Tmm i12FqNhrilpzfcYiwyAt39z+QKkiVw6/n0bdhmBtJwQ+rYaOvvQZaPrlitURm795ecsU 740yWzE/PYiFOuRFFyFCCRRZaNekgfQQWfkm+t8fLYq+tL2U1mau/YYPW3T1DID2M/XP UGYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P9b3tDY+655xD0tPu9SBTJCGpaBZsqsfT1tLH+eh9ss=; b=mlbAK3ahA0azrlu5qybtnarDAlAMWf0XvAkrxCOkJu9G2XakPjyfu+I0GxshdGbdgZ mnjvdmmO+YV687Q7OKQFzwdSB5o7XTgZ4fNpDrrXimyLHVslQFwh/QO0DIwGnYS9aLVy TH2WAzdWPX9vElU0gWQTofgqaJODAaTNjIUkCV3LwlJd/rM2y51wRmYKsaTA8PirObRC P8nB4DK9td7zN8VgNlKj6S8U/e20f/se6lf2jYK21JlVC1yqjTv+pX75ESvYfJGPyHAG K0fSyZAjry9UQTLdBQgWHRQjkhWpeMOJ1sqDUCfuj5QVzsBXfDFyvp4zfINzh0ovtotN dAnw== X-Gm-Message-State: AOAM531u2M1n9hqDoQjmpon9Wcj3NREhw0sWko5UQYZqAy6aEmnml1Bs LzSAsZS3lPPebc02L2b3/M774A== X-Received: by 2002:a17:90a:9291:: with SMTP id n17mr5695519pjo.243.1636451333257; Tue, 09 Nov 2021 01:48:53 -0800 (PST) Received: from hsinchu16.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id cv1sm1940511pjb.48.2021.11.09.01.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 01:48:53 -0800 (PST) From: Greentime Hu To: palmer@dabbelt.com, paul.walmsley@sifive.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, aou@eecs.berkeley.edu Subject: [PATCH v9 14/17] riscv: Use CSR_STATUS to replace sstatus in vector.S Date: Tue, 9 Nov 2021 17:48:26 +0800 Message-Id: <7204695c80a13a634381fed94ea1598ffd70c78f.1636362169.git.greentime.hu@sifive.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It should use the same logic here in both m-mode and s-mode. Signed-off-by: Greentime Hu Co-developed-by: Vincent Chen Signed-off-by: Vincent Chen --- arch/riscv/kernel/vector.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/vector.S b/arch/riscv/kernel/vector.S index a973532d2e7f..1a79e2485bfa 100644 --- a/arch/riscv/kernel/vector.S +++ b/arch/riscv/kernel/vector.S @@ -31,7 +31,7 @@ ENTRY(__vstate_save) li status, SR_VS - csrs sstatus, status + csrs CSR_STATUS, status csrr x_vstart, CSR_VSTART csrr x_vtype, CSR_VTYPE @@ -51,13 +51,13 @@ ENTRY(__vstate_save) REG_S x_vl, RISCV_V_STATE_VL(vstatep) REG_S x_vcsr, RISCV_V_STATE_VCSR(vstatep) - csrc sstatus, status + csrc CSR_STATUS, status ret ENDPROC(__vstate_save) ENTRY(__vstate_restore) li status, SR_VS - csrs sstatus, status + csrs CSR_STATUS, status vsetvli incr, x0, e8, m8 vle8.v v0, (datap) @@ -76,7 +76,7 @@ ENTRY(__vstate_restore) csrw CSR_VSTART, x_vstart csrw CSR_VCSR, x_vcsr - csrc sstatus, status + csrc CSR_STATUS, status ret ENDPROC(__vstate_restore) -- 2.31.1