Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp904023pxk; Thu, 10 Sep 2020 01:27:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1JtPI3M02muUYyzu7xB504vU8m+3Omi3p+KhEaQW1IYYhMnuS5CT12EZ6wze6Z56UghSN X-Received: by 2002:a17:906:3bca:: with SMTP id v10mr7470573ejf.57.1599726434335; Thu, 10 Sep 2020 01:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599726434; cv=none; d=google.com; s=arc-20160816; b=Ge2lO/ZNKOm7UE/M85C+BZ0c96pnnDObBC7jST+te+b4JPp4vqXbSArVWqOG3KgPPr FqN5J4LHG4Q7kbOhPMrCaemtu8k6rsWpYdcno8wwXVklpfthlqe7S3O8jstQkewlvUhl F37CNUpLEIhhtxL5P3L7AQz5HLC610QQgYhO1OqGILXD/rHAaXD36zeQWc6lp7DglQcP Gq+GUK6H2coQ5k9DE8AQYCSN7wZnNuI4/3yNiYFFUvKVT8oEDjOhfAtPOo9oYIVlmqfa nb2WgQdxAbZU/cKJ9RJMLYRUt/U7f2APSikwonGGaSC/ulXxxGTzfm6IR89GNiMtTzhq Cwyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=d6gpDdMtT2tdp8xTHPaHC5JAlYMUQ3HEqBOe763/EsE=; b=j7F7HfWCN5GgCfsJtsyr9F9+FWH69CC7czjime/tyh+wV8y+DMO0PTxagHJTnZBSTy rJgkBexx55oSn4Wfo7JfmEMxjv+jII+gLCxdM1I51fPGB+/74JaLM59rW8L1zP/2CpiB Zjxla/NrfE4aeLa3avFFyuCJnNBttGu/ELF00O7WcG25abutt6FLJG6AK+fAdFlv8sVT vpJO7/Q17HVqVEKGdiqhQrfBCB8UOCQGMFsmMFH+NrC6fOPn+NHeZ9BxWq8Zl9gFzluW UBkEB7nxZPug9drxCNv6r7pmvBTDbbtBv1rWFwo77fjfUdeWhdBVf2EZl2okT0eoQmEK fvtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=DaWHts7u; 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 u10si2822471ejy.154.2020.09.10.01.26.51; Thu, 10 Sep 2020 01:27:14 -0700 (PDT) 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=DaWHts7u; 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 S1730319AbgIJIXH (ORCPT + 99 others); Thu, 10 Sep 2020 04:23:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730085AbgIJINa (ORCPT ); Thu, 10 Sep 2020 04:13:30 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCC33C06179E for ; Thu, 10 Sep 2020 01:13:07 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id b17so2669187pji.1 for ; Thu, 10 Sep 2020 01:13:07 -0700 (PDT) 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=d6gpDdMtT2tdp8xTHPaHC5JAlYMUQ3HEqBOe763/EsE=; b=DaWHts7ul2rTOkzR0fXiKsZlAxJcEryhI52h1vKi4+m0kudoCx3/Q/QNH5H71lJ/c+ QpYqw9v9/g1q4MtgtVEYPtR1x213rMw/En9kNxknzYnUquuYfsrSQAaAeUx4JuQDWGi0 Z4a+O/or/BOQwf4zD8fC8FNX0MFFTsNjMSL5ukXvCw3GNGSq4bn3jpNbKbL1TogeNIrK S4U1wMBttaOIwMQkQ+91X08YczsrQ+jJdojoMKu2bnSVc8ZSg2eDDGZ6/uxAhMC94oDp 3sFzh/HL8mlVXPl9CmjOhir3+8Q3sTyntfV9EHVGgLlWgqokpCUbYxgsN+EVJ+FLGm8A MpGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d6gpDdMtT2tdp8xTHPaHC5JAlYMUQ3HEqBOe763/EsE=; b=RsKAgaVKYg6lkgkOUajQ9T+FhkNEVaL79iVteE4UGXDzpvD1cEbuRVnm8TjKA8pm3F qTIwbJ1anUj6mUZDWMG5Qt2hbaBkp1Dqhj6m111GZVZPZhRxi7oO7VjJAznFVBrlTj0/ gMLs6vb2R4cDJ7EaZbsdxrXtAciCh6mULJ1rfbjqo5r/5fqF0fXqA7mgmQjRvKzMxE3V jufYp1zKKQE8zQ2PbNZuH/Y51+f6+Q2tnVg8vTAaGsafQDlytxwA+5h6A5cjuPLD5qWU Pzx1LZiM8xhsjCjCTXgOXEHZz/zYlQc4THS8JmEOOZhGh0ienkuzsilctmmpzPnwSDdA Nrsg== X-Gm-Message-State: AOAM531AWbpVWoJbvsZ+Wz1C0c2FW7ZgMX41YeHGGV6VCgUvIGs1i10A LcpoNGzAv8rRoX8/FAhHA0F7dorj38R8sQdE X-Received: by 2002:a17:90a:5283:: with SMTP id w3mr4332541pjh.201.1599725587386; Thu, 10 Sep 2020 01:13:07 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id e1sm2196056pfl.162.2020.09.10.01.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 01:13:06 -0700 (PDT) From: Greentime Hu To: greentime.hu@sifive.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, aou@eecs.berkeley.edu, palmer@dabbelt.com, paul.walmsley@sifive.com Subject: [RFC PATCH v7 15/21] riscv: Use CSR_STATUS to replace sstatus in vector.S Date: Thu, 10 Sep 2020 16:12:10 +0800 Message-Id: <7a98a3a727b6fee760a6fe0beb4eb2f5f5e6f920.1599719352.git.greentime.hu@sifive.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org 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 --- 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 4c880b1c32aa..4f0c5a166e4e 100644 --- a/arch/riscv/kernel/vector.S +++ b/arch/riscv/kernel/vector.S @@ -32,7 +32,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 @@ -53,13 +53,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 li m_one, -1 vsetvli incr, m_one, e8, m8 @@ -79,6 +79,6 @@ 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.28.0