From patchwork Fri Nov 3 13:46:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Henrique Barboza X-Patchwork-Id: 13444540 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 36D9BC0018A for ; Fri, 3 Nov 2023 13:47:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qyuVi-0001vo-U3; Fri, 03 Nov 2023 09:46:54 -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 1qyuVd-0001ro-5C for qemu-devel@nongnu.org; Fri, 03 Nov 2023 09:46:49 -0400 Received: from mail-yw1-x1134.google.com ([2607:f8b0:4864:20::1134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qyuVY-0000st-JP for qemu-devel@nongnu.org; Fri, 03 Nov 2023 09:46:48 -0400 Received: by mail-yw1-x1134.google.com with SMTP id 00721157ae682-5a8ee23f043so24662817b3.3 for ; Fri, 03 Nov 2023 06:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1699019202; x=1699624002; darn=nongnu.org; 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=87zCknPwYKyrBsfh5RUUQo4n9tvDl3QkiYsAvcYL4ys=; b=k2XmXeO7kWjPjimnOUaC85xYz1axO2rwt9Gq1ZJc42wwzx1qBh+d2agtt7K5+IUu4m 23luRnpHyUW55cSQhFM4gIfxFekUO6D6TmRQzCvEy0T9Aas9nreXAb9/ZEGSpYTKjBGn wJZ981Pdm0eCfeb0u29RzA2zpVIF9LZKEr4B+ac/bc0zHXBtVsRpu5VX0umQfGdCw2MZ UzdWV46OhDESUw685zizEJc/cSOih95KYDa3f/B19FBfQrIqcO8zR7IG8OOYCwi0rcXx D3p0aDEVo2Z32R4HjTUrSw/ezaXAFQLCyx2SUPXKS/3anxuLG8Bh6HqMwR6hrs3+VtO7 tjsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699019202; x=1699624002; 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=87zCknPwYKyrBsfh5RUUQo4n9tvDl3QkiYsAvcYL4ys=; b=fhmEph3pF29P8oC9Eb5n0ZFJJmJaYVjDEKmDOLYYvLkLn6JyNjz533qgfbykKDJmXp LWCCbVB0/WUwZUR25pfCaQWCKtqhUZcYemYvgkbNYUCsCxJf+BL5iRNC0odlWEdYWN00 UsP05Z0UsBS2RgByEkxGLUvcG4mbOAmTbTauaOljYRVIEtDc8uWBKGMQqbB+INtC5kU4 sKJvEcgBVl0jQ6xtENTNl+oi/Q1sF0DtWfECJOyoX4iluRCpmkOE+lsKh2f2T/n1RVyU cWJezNB7/lgh63MNeKSY9+SzI2nuCSshXFF3GXelgo1mRf34RdJdHcQJU//eWETlLTa1 Vhqg== X-Gm-Message-State: AOJu0YxA9oSu7FwoCu5hcDo/OehjkTaF7tQrbBNMF1hZ+jZ29SxE4Bna 0E45gO8mhAKx90yKJH1DirFnitewSCRNR8Xt7yo= X-Google-Smtp-Source: AGHT+IFPAxzR4yZAt11NMAKqvnAJRblggTvLVnv0Ss7pbT3UrzPMckEPr3PSye6eP+y1a0DxKa4+hA== X-Received: by 2002:a0d:d2c3:0:b0:594:e148:3c42 with SMTP id u186-20020a0dd2c3000000b00594e1483c42mr2356790ywd.52.1699019202650; Fri, 03 Nov 2023 06:46:42 -0700 (PDT) Received: from grind.. ([179.193.10.161]) by smtp.gmail.com with ESMTPSA id j68-20020a0df947000000b00582b239674esm935814ywf.129.2023.11.03.06.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 06:46:42 -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, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH v10 03/18] target/riscv/tcg: update priv_ver on user_set extensions Date: Fri, 3 Nov 2023 10:46:14 -0300 Message-ID: <20231103134629.561732-4-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231103134629.561732-1-dbarboza@ventanamicro.com> References: <20231103134629.561732-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1134; envelope-from=dbarboza@ventanamicro.com; helo=mail-yw1-x1134.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 We'll add a new bare CPU type that won't have any default priv_ver. This means that the CPU will default to priv_ver = 0, i.e. 1.10.0. At the same we'll allow these CPUs to enable extensions at will, but then, if the extension has a priv_ver newer than 1.10, we'll end up disabling it. Users will then need to manually set priv_ver to something other than 1.10 to enable the extensions they want, which is not ideal. Change the setter() of extensions to allow user enabled extensions to bump the priv_ver of the CPU. This will make it convenient for users to enable extensions for CPUs that doesn't set a default priv_ver. This change does not affect any existing CPU: vendor CPUs does not allow extensions to be enabled, and generic CPUs are already set to priv_ver LATEST. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/tcg/tcg-cpu.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 08f8dded56..3751f7711e 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -114,6 +114,26 @@ static int cpu_cfg_ext_get_min_version(uint32_t ext_offset) g_assert_not_reached(); } +static void cpu_validate_multi_ext_priv_ver(CPURISCVState *env, + uint32_t ext_offset) +{ + int ext_priv_ver; + + if (env->priv_ver == PRIV_VERSION_LATEST) { + return; + } + + ext_priv_ver = cpu_cfg_ext_get_min_version(ext_offset); + + if (env->priv_ver < ext_priv_ver) { + /* + * Note: the 'priv_spec' command line option, if present, + * will take precedence over this priv_ver bump. + */ + env->priv_ver = ext_priv_ver; + } +} + static void cpu_cfg_ext_auto_update(RISCVCPU *cpu, uint32_t ext_offset, bool value) { @@ -742,6 +762,14 @@ static void cpu_set_misa_ext_cfg(Object *obj, Visitor *v, const char *name, return; } + if (misa_bit == RVH && env->priv_ver < PRIV_VERSION_1_12_0) { + /* + * Note: the 'priv_spec' command line option, if present, + * will take precedence over this priv_ver bump. + */ + env->priv_ver = PRIV_VERSION_1_12_0; + } + env->misa_ext |= misa_bit; env->misa_ext_mask |= misa_bit; } else { @@ -871,6 +899,10 @@ static void cpu_set_multi_ext_cfg(Object *obj, Visitor *v, const char *name, return; } + if (value) { + cpu_validate_multi_ext_priv_ver(&cpu->env, multi_ext_cfg->offset); + } + isa_ext_update_enabled(cpu, multi_ext_cfg->offset, value); }