From nobody Tue Feb 10 06:27:55 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552654994260279.1896767011932; Fri, 15 Mar 2019 06:03:14 -0700 (PDT) Received: from localhost ([127.0.0.1]:54587 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4mUM-0002vd-HS for importer@patchew.org; Fri, 15 Mar 2019 09:03:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4mSX-0002AM-Jv for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:01:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4mSM-0008KB-DZ for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:01:03 -0400 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]:46898) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4mSM-0008Je-4A for qemu-devel@nongnu.org; Fri, 15 Mar 2019 09:01:02 -0400 Received: by mail-pg1-x52f.google.com with SMTP id a22so6404080pgg.13 for ; Fri, 15 Mar 2019 06:01:02 -0700 (PDT) Received: from gamma06.internal.sifive.com ([64.62.193.194]) by smtp.gmail.com with ESMTPSA id f15sm2225401pfa.11.2019.03.15.03.27.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Mar 2019 03:27:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PIws0PkmsF4RC1TSl16G4ceM81JUpFdzAIEJmY/3Pl8=; b=BELIrwaXG6gT1teCCSyzyoJqidnDnRkCxmtNzR9Pg9Ce/Xr/rCZEfRjtHDqPFVIbgA MMun/3CThpdu7yTaoJ/ER/NnrlhZfDbqUyfevA4p6G2X789uflnxzMxAmRPw1ENCjTG8 iv7Gg/fjWIZ7FM/6TlIM+nN+hKjRFEBKtwBoY6/QZqP9ovXDT41fh5ZnKDagdP+0ogsj hx49S40N6jfEUZoZkaxKf+URalQQtawkvv3pTHhMrUOAh6Khf4ZAtSCrGVrFvPofM9wc QYBDKiB/arjkepfSjTJJ5btRL/IxWFVGz9SeOBJVJ63I+Nj8WIx+vluctJbsM0T2s9sF snjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PIws0PkmsF4RC1TSl16G4ceM81JUpFdzAIEJmY/3Pl8=; b=ssZgGCWgJMjR9V10X1y1OSCuhwYXc2xNYkIJYvUOBi+9v1v4xkaeqNHFsIuJ7C2Z3j Hr9Hz7PgDoOAcJ9GcXV9U6DudDgn6mMzgQGyW0tdZ1H7a+NzFyJ1qqch/MOrxKffzmOt aSWokhVG3QR1MbV4zmrRhZ1DiJzM1ScuEL7QVY69WM9JoxujTHg6Dv4xDUekbvAjmDyu ZeoNWtPJ3ZTl5PF2rsYFhQp5hT4mbI4FX70cpDcBVH9a4IIhjDHuKu9pflcA5+R3RcXU 1OCf3FXN67nYVQZ2Ij9v4dBxxEu8Dpgs+g/+FVHQj5QQ1lN2Yfv2HxMpQju5rTVfI0Y2 odGw== X-Gm-Message-State: APjAAAW3zMZJ6gABVYxt1x9veCEW/0I5o8DAc221NzYy6PH6Tmu6KRE9 AWn6i84GSqzzO8hm2TEyUhOtrwbBLSOtog== X-Google-Smtp-Source: APXvYqzfamd94F8WhlYLaJItilYF6OuZck6WBxEfdbvGDoasgTBcHMXkSdUlVQljjUpDCdgmTDUmRA== X-Received: by 2002:a17:902:2e01:: with SMTP id q1mr3461900plb.253.1552645666462; Fri, 15 Mar 2019 03:27:46 -0700 (PDT) From: Chih-Min Chao To: qemu-devel@nongnu.org Date: Fri, 15 Mar 2019 03:26:57 -0700 Message-Id: <1552645619-18244-4-git-send-email-chihmin.chao@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1552645619-18244-1-git-send-email-chihmin.chao@sifive.com> References: <1552645619-18244-1-git-send-email-chihmin.chao@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::52f Subject: [Qemu-devel] [PATCH v5 3/5] RISC-V: Fixes to CSR_* register macros. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-riscv@nongnu.org, Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Alistair Francis , Jim Wilson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jim Wilson This adds some missing CSR_* register macros, and documents some as being priv v1.9.1 specific. Signed-off-by: Jim Wilson Reviewed-by: Alistair Francis Message-Id: <20190212230830.9160-1-jimw@sifive.com> --- target/riscv/cpu_bits.h | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 7afcb24..7180fcc 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -135,16 +135,22 @@ /* Legacy Counter Setup (priv v1.9.1) */ #define CSR_MUCOUNTEREN 0x320 #define CSR_MSCOUNTEREN 0x321 +#define CSR_MHCOUNTEREN 0x322 =20 /* Machine Trap Handling */ #define CSR_MSCRATCH 0x340 #define CSR_MEPC 0x341 #define CSR_MCAUSE 0x342 -#define CSR_MBADADDR 0x343 +#define CSR_MTVAL 0x343 #define CSR_MIP 0x344 =20 +/* Legacy Machine Trap Handling (priv v1.9.1) */ +#define CSR_MBADADDR 0x343 + /* Supervisor Trap Setup */ #define CSR_SSTATUS 0x100 +#define CSR_SEDELEG 0x102 +#define CSR_SIDELEG 0x103 #define CSR_SIE 0x104 #define CSR_STVEC 0x105 #define CSR_SCOUNTEREN 0x106 @@ -153,9 +159,12 @@ #define CSR_SSCRATCH 0x140 #define CSR_SEPC 0x141 #define CSR_SCAUSE 0x142 -#define CSR_SBADADDR 0x143 +#define CSR_STVAL 0x143 #define CSR_SIP 0x144 =20 +/* Legacy Supervisor Trap Handling (priv v1.9.1) */ +#define CSR_SBADADDR 0x143 + /* Supervisor Protection and Translation */ #define CSR_SPTBR 0x180 #define CSR_SATP 0x180 @@ -282,6 +291,28 @@ #define CSR_MHPMCOUNTER30H 0xb9e #define CSR_MHPMCOUNTER31H 0xb9f =20 +/* Legacy Hypervisor Trap Setup (priv v1.9.1) */ +#define CSR_HSTATUS 0x200 +#define CSR_HEDELEG 0x202 +#define CSR_HIDELEG 0x203 +#define CSR_HIE 0x204 +#define CSR_HTVEC 0x205 + +/* Legacy Hypervisor Trap Handling (priv v1.9.1) */ +#define CSR_HSCRATCH 0x240 +#define CSR_HEPC 0x241 +#define CSR_HCAUSE 0x242 +#define CSR_HBADADDR 0x243 +#define CSR_HIP 0x244 + +/* Legacy Machine Protection and Translation (priv v1.9.1) */ +#define CSR_MBASE 0x380 +#define CSR_MBOUND 0x381 +#define CSR_MIBASE 0x382 +#define CSR_MIBOUND 0x383 +#define CSR_MDBASE 0x384 +#define CSR_MDBOUND 0x385 + /* mstatus CSR bits */ #define MSTATUS_UIE 0x00000001 #define MSTATUS_SIE 0x00000002 --=20 2.7.4