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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 13B31C77B7D for ; Wed, 17 May 2023 13:58:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzHf2-00013F-M6; Wed, 17 May 2023 09:57:48 -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 1pzHet-0000zM-IN for qemu-devel@nongnu.org; Wed, 17 May 2023 09:57:41 -0400 Received: from mail-oi1-x22f.google.com ([2607:f8b0:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzHer-0000VR-6g for qemu-devel@nongnu.org; Wed, 17 May 2023 09:57:39 -0400 Received: by mail-oi1-x22f.google.com with SMTP id 5614622812f47-38eb2984c82so330413b6e.0 for ; Wed, 17 May 2023 06:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1684331855; x=1686923855; 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=+AzVR8nq7ycPyzgqq+Qc5hSUqVlyii/kLSoYn9cWTds=; b=EgWqCL4Lfz2L0xemboHv33FDhXox7Fo4l7TM2wNLBQBXRqqcwDo2RhDfXBW1ZBSfEy WURm6bL+njYEsl1AWCtjmk1oftHZsY7LxR6LJcDv5x6vOg/tFK5XyR+Jx357dzp5d9ME R0XQzZdAkVhExVenTORFn5KAfJcCknQxMdHYVdlw0oNmDb8p9Y4NbJpyMf+OPNryxOwc F3zyRtdXeQ2HefIEai+snKABRqNSJFnp7Da2Xnmdhw/6PNc3thZgeNMj3vCeMErqGlNl LVspRQOq78rYqCcUgJ1FX/MLahPdBGV4Cd3hKC44xl10P1eHve1pOzZdvH6VwzO8TPzf xAyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684331855; x=1686923855; 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=+AzVR8nq7ycPyzgqq+Qc5hSUqVlyii/kLSoYn9cWTds=; b=DxOJ8j1+kb1FZ0gDboV52WYLrNDLKB/eH8+JB4qL703pTiA0KHCw0zV6E/C+gtwA2Q Nj5CE9+gsIYObiAvDkPqfhBopXmoeYMPKpTw9ZCFpGRALP1SQ70FpJvVS0A6LjgheZqT BmT5TXbWCajSHnVIKAGvBnvRLtHmaOp5MNxr3HAXXnHeQZr8JYUpcXowX+abFq3nqsrX Xg1+aJAc78Jttvr8r1K4UXnaB6EztPtt3muJlSdYNvFGThAw9pC6VbEcGI2l/ShluAzw BG2F+1aTnbwW1W0Rbf9VVwJxjDciM2SyLm2xF8waDzKxcHEDqEXTTGCtMDE6g/DwLb2F jNDQ== X-Gm-Message-State: AC+VfDwgCeWlQpCP6+pajYe/aFVc0CIf6FW0FGprKVmtP1KBkeyDnaYs fueYCXzWxnULckSxUTDRy+bySVyf+BPl9tlHs+E= X-Google-Smtp-Source: ACHHUZ4tCaHFD48fbUulD1Hqj74bXE2DkUclmKn5t77AwcpwUQ/VhwX4hOCqFrEEVSNo6txv5WzSdQ== X-Received: by 2002:a05:6808:4cf:b0:38d:ec3f:3118 with SMTP id a15-20020a05680804cf00b0038dec3f3118mr12894072oie.28.1684331855661; Wed, 17 May 2023 06:57:35 -0700 (PDT) Received: from grind.. (189-46-207-53.dsl.telesp.net.br. [189.46.207.53]) by smtp.gmail.com with ESMTPSA id j21-20020a544815000000b00383d9700294sm9409562oij.40.2023.05.17.06.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 06:57:35 -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 v9 04/11] target/riscv: add PRIV_VERSION_LATEST Date: Wed, 17 May 2023 10:57:07 -0300 Message-Id: <20230517135714.211809-5-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230517135714.211809-1-dbarboza@ventanamicro.com> References: <20230517135714.211809-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::22f; envelope-from=dbarboza@ventanamicro.com; helo=mail-oi1-x22f.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- 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 8ba86d54b2..b1a6675d1e 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -345,7 +345,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; } #if defined(TARGET_RISCV64) @@ -356,7 +356,7 @@ static void rv64_base_cpu_init(Object *obj) set_misa(env, MXL_RV64, 0); riscv_cpu_add_user_properties(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 @@ -462,7 +462,7 @@ static void rv128_base_cpu_init(Object *obj) set_misa(env, MXL_RV128, 0); riscv_cpu_add_user_properties(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 @@ -475,7 +475,7 @@ static void rv32_base_cpu_init(Object *obj) set_misa(env, MXL_RV32, 0); riscv_cpu_add_user_properties(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 de7e43126a..15423585d0 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -61,6 +61,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.40.1