From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pf6yZ-0006qM-K3 for mharc-qemu-riscv@gnu.org; Wed, 22 Mar 2023 18:30:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pf6yY-0006qD-AR for qemu-riscv@nongnu.org; Wed, 22 Mar 2023 18:30:34 -0400 Received: from mail-yw1-f176.google.com ([209.85.128.176]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pf6wp-0006wd-7R for qemu-riscv@nongnu.org; Wed, 22 Mar 2023 18:30:34 -0400 Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-54184571389so364251887b3.4 for ; Wed, 22 Mar 2023 15:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1679524115; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KQVFUIY/tXjKk0i861GofmXXuiJZCtg1HgLexYrjEnI=; b=F0LhrGlSOTpvzrp1yoLtIyDG+Eso72+kZMOM5VVdeuNhjuGq8gSIVY0F9DR0+2/QVX KxHsIlDzVBghEHSevHbOViOlD9ZIFQhIBSDixNWw0/xsaqW9femDtHOJpsBxBSE6GaAp enn9oBfbnnOAjuH85BZnLPYiPBJSztw4uvbWdkuwwn0nmQJIXw7BjolqO4NEoMsL1EEu 7dH8uqDot7tAJNesEhXLbRzZDJ6nFsD6T+JL5P5e2jIsrnFF1jkzrRVdc/9PsM35XsTH BYtKylv2k68jDQJoKTLqUnRHwinZRPTeohiVpWzYUQT14foJqTT1R8P/i2Yp5jlOrRFM IblQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679524115; h=content-transfer-encoding:mime-version: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=KQVFUIY/tXjKk0i861GofmXXuiJZCtg1HgLexYrjEnI=; b=BKbS+Yj6muOGnexgpRk+6zvRY48JTt/D8vHBXZTUbl4JwaqES+8aZcfmVgHiqk1yO3 QrvEiK0v+aNr32oj0vQFhaq2+hJj/fAeYUiA84Rb6j5Sc3+CIc0MNKbresmt4GWGpVUD eTTldLaRJxqii5EQU9NJIuO/+lHNs2Yf43MEcSe0f9UsQ+K9S5B3vrpC5+h2utfkGq96 0slPN4XPgPcx2NdI/FBNGGIqyHSWJ6aAsoQPudnEA+eS37EmcldAtKh1HLqUyfrfOL1w 8LMuCfzZVd9TKOqxw1OrgZDRcA51b05JobUfczLTvMggWMSPrVpPphVlRtJocwrAC3v0 rxtw== X-Gm-Message-State: AO0yUKV9yzIa16ejkMnNKbr0ZbCsyEyVU9UPq9STvO/1usCxIQoj6oNt Bzs7ZBBX42jFKgjUma8rCL6RJf+DVPDN+0Qt28Q= X-Google-Smtp-Source: AKy350ar5mjBg2b94+oGEB9EL/EE7xZJiA4NXJKMRYAfruxgK9agg2LDCXgf/m4PtWjoQJ+0mTahdA== X-Received: by 2002:a05:6870:2190:b0:17a:bf1b:cab8 with SMTP id l16-20020a056870219000b0017abf1bcab8mr1014362oae.4.1679523634984; Wed, 22 Mar 2023 15:20:34 -0700 (PDT) Received: from grind.. ([177.95.89.231]) by smtp.gmail.com with ESMTPSA id ax35-20020a05687c022300b0017243edbe5bsm5586817oac.58.2023.03.22.15.20.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 15:20:34 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liweiwei@iscas.ac.cn, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza , Richard Henderson Subject: [PATCH for-8.1 v4 04/25] target/riscv: add PRIV_VERSION_LATEST Date: Wed, 22 Mar 2023 19:19:43 -0300 Message-Id: <20230322222004.357013-5-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322222004.357013-1-dbarboza@ventanamicro.com> References: <20230322222004.357013-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=209.85.128.176; envelope-from=dbarboza@ventanamicro.com; helo=mail-yw1-f176.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2023 22:30:34 -0000 All these generic CPUs are using the latest priv available, at this moment PRIV_VERSION_1_12_0: - riscv_any_cpu_init() - rv32_base_cpu_init() - rv64_base_cpu_init() - rv128_base_cpu_init() Create a new PRIV_VERSION_LATEST enum and use it in those cases. I'll make it easier to update everything at once when a new priv version is available. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Richard Henderson Reviewed-by: LIU Zhiwei --- target/riscv/cpu.c | 8 ++++---- target/riscv/cpu.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 18032dfd4e..1ee322001b 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -338,7 +338,7 @@ static void riscv_any_cpu_init(Object *obj) VM_1_10_SV32 : VM_1_10_SV57); #endif - env->priv_ver = PRIV_VERSION_1_12_0; + env->priv_ver = PRIV_VERSION_LATEST; register_cpu_props(obj); } @@ -350,7 +350,7 @@ static void rv64_base_cpu_init(Object *obj) set_misa(env, MXL_RV64, 0); register_cpu_props(obj); /* Set latest version of privileged specification */ - env->priv_ver = PRIV_VERSION_1_12_0; + env->priv_ver = PRIV_VERSION_LATEST; #ifndef CONFIG_USER_ONLY set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); #endif @@ -426,7 +426,7 @@ static void rv128_base_cpu_init(Object *obj) set_misa(env, MXL_RV128, 0); register_cpu_props(obj); /* Set latest version of privileged specification */ - env->priv_ver = PRIV_VERSION_1_12_0; + env->priv_ver = PRIV_VERSION_LATEST; #ifndef CONFIG_USER_ONLY set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV57); #endif @@ -439,7 +439,7 @@ static void rv32_base_cpu_init(Object *obj) set_misa(env, MXL_RV32, 0); register_cpu_props(obj); /* Set latest version of privileged specification */ - env->priv_ver = PRIV_VERSION_1_12_0; + env->priv_ver = PRIV_VERSION_LATEST; #ifndef CONFIG_USER_ONLY set_satp_mode_max_supported(RISCV_CPU(obj), VM_1_10_SV32); #endif diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 638e47c75a..76f81c6b68 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -88,6 +88,8 @@ enum { PRIV_VERSION_1_10_0 = 0, PRIV_VERSION_1_11_0, PRIV_VERSION_1_12_0, + + PRIV_VERSION_LATEST = PRIV_VERSION_1_12_0, }; #define VEXT_VERSION_1_00_0 0x00010000 -- 2.39.2