From patchwork Wed Jul 5 21:39:51 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: 1804055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ventanamicro.com header.i=@ventanamicro.com header.a=rsa-sha256 header.s=google header.b=FHxGqdON; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QxClw75bxz20bK for ; Thu, 6 Jul 2023 07:41:32 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHAF8-0005M4-In; Wed, 05 Jul 2023 17:40:58 -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 1qHAF6-0005IJ-DQ for qemu-devel@nongnu.org; Wed, 05 Jul 2023 17:40:56 -0400 Received: from mail-oa1-x2b.google.com ([2001:4860:4864:20::2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHAF3-0001of-UD for qemu-devel@nongnu.org; Wed, 05 Jul 2023 17:40:56 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1b00b0ab0daso108494fac.0 for ; Wed, 05 Jul 2023 14:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1688593252; x=1691185252; 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=9xHvxLB9xtcGXjVSbRp4EDf5ah7gB89LgOtfMTIsy9Y=; b=FHxGqdONPBfBBfCtM9bvl45lDce+DX48TlyiKZCFCF4w9r9oTeK9fIPttFUrCbXjH+ QZIXtQb8UwiqbubGHPPGhvKVHwnEs0p28FbyMRpTXAGDt1b6quhicCt3ZA4PzUB8cThd yqvrWzxJdG11ubj7GPuCnWV4cK7A1fcQfW35ArwlLKm5p6a1k5mUAP1ClDo2rNjxygHj bsZDnDJp/znp890QPJtAnhKuuSXmQIh936Pc2H2Utl2R4WEbpNxVTFboTCw/xts9J71m vxvMeCZCDYJAf/RuF3fPS+6K52tEZsRC4fSC06Y5nnyRUqqBJvbOaDYwYaPwiWdzrhPv 50Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688593252; x=1691185252; 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=9xHvxLB9xtcGXjVSbRp4EDf5ah7gB89LgOtfMTIsy9Y=; b=bPk01TWppGXYtIvs6FXC8e68wKBzqJ5tmIXVFENGJqncZfOF6QfvaboL3n8DO6HGV6 NRYg71F8AxoyVWKoJcV6UHg8FoV0zHiIY1vlsJKHXMGCeFCDn47T178oI3ZGb3bbV1sI k9zO+lpHNOt/8Ih4y2NisT0O82jLyADu1l3nu2i7ILoseJLopeJTuFHBbjxykZym6VGU s74LJnrG67wnVQUXKnxpPqRlrS4XlxODAJ1P4/gPR3ot8RkgxUhws2wBZAYWQ0VPiRRE 2kXkyuI+xYUcaNOpBezKOhWtU4iaZKvLhN2nnu3kItq5OySjxiddrFzU2st8x1c7axQb twDQ== X-Gm-Message-State: ABy/qLaHbtHUO0nWZhLP81DYM4Q4O9h7MOXExz/bi+NIwDSj57eWYbHc VaR/lZnSIkZUWasTgHqs2obL6zgEQXqSZUcBrKc= X-Google-Smtp-Source: APBJJlHotOge/O/Ts+61rUQCZmOV4erexUmjMqM2dJZ+Ih+sJWPetXhZgkZG4eqYQvTvmPzl0sSdpA== X-Received: by 2002:a05:6871:693:b0:1b0:6f69:89ab with SMTP id l19-20020a056871069300b001b06f6989abmr217528oao.46.1688593252499; Wed, 05 Jul 2023 14:40:52 -0700 (PDT) Received: from grind.. (201-69-66-110.dial-up.telesp.net.br. [201.69.66.110]) by smtp.gmail.com with ESMTPSA id m1-20020a4add01000000b0056665a16536sm70764oou.30.2023.07.05.14.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Jul 2023 14:40:52 -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 v8 16/20] target/riscv/cpu.c: remove priv_ver check from riscv_isa_string_ext() Date: Wed, 5 Jul 2023 18:39:51 -0300 Message-ID: <20230705213955.429895-17-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705213955.429895-1-dbarboza@ventanamicro.com> References: <20230705213955.429895-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::2b; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x2b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org riscv_isa_string_ext() is being used by riscv_isa_string(), which is then used by boards to retrieve the 'riscv,isa' string to be written in the FDT. All this happens after riscv_cpu_realize(), meaning that we're already past riscv_cpu_validate_set_extensions() and, more important, riscv_cpu_disable_priv_spec_isa_exts(). This means that all extensions that needed to be disabled due to priv_spec mismatch are already disabled. Checking this again during riscv_isa_string_ext() is unneeded. Remove it. As a bonus, riscv_isa_string_ext() can now be used with the 'host' KVM-only CPU type since it doesn't have a env->priv_ver assigned and it would fail this check for no good reason. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index deb3c0f035..2acf77949f 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2124,8 +2124,7 @@ static void riscv_isa_string_ext(RISCVCPU *cpu, char **isa_str, int i; for (i = 0; i < ARRAY_SIZE(isa_edata_arr); i++) { - if (cpu->env.priv_ver >= isa_edata_arr[i].min_version && - isa_ext_is_enabled(cpu, &isa_edata_arr[i])) { + if (isa_ext_is_enabled(cpu, &isa_edata_arr[i])) { new = g_strconcat(old, "_", isa_edata_arr[i].name, NULL); g_free(old); old = new;