From patchwork Thu Jun 22 13:56:56 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: 1798415 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=iYwBUwNh; 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 4Qn25P0lFdz20Xt for ; Thu, 22 Jun 2023 23:58:17 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qCKoz-0007rb-Dr; Thu, 22 Jun 2023 09:58:01 -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 1qCKow-0007p7-Hh for qemu-devel@nongnu.org; Thu, 22 Jun 2023 09:57:58 -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 1qCKou-0001lM-Ui for qemu-devel@nongnu.org; Thu, 22 Jun 2023 09:57:58 -0400 Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1ad1fce2594so1326946fac.0 for ; Thu, 22 Jun 2023 06:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1687442275; x=1690034275; 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=zUy8spMlJhAEp8KKmFBdTT3DjIC/nXTZCl3Npb8QGK8=; b=iYwBUwNhkPBxrsxqIvZPay6Gt5H2e48zXhwaef50/ZRKYD8y9yhsKC4FlWEj0cDFnv pftq6U6ZFOI2uQnN2ShM6ppy3LPgTaE5fmrtoRjtA6bYlAyocKrm1L4MyCzF9tmd5l21 5phy8cX369D5UmX/af5LTYwoVKE4ValEu7XTYpAVnLBDuhAn4H61x1uWlzqC1ZNlaumB 0gTuXiIvyXrNKTc0XQCT+94E5lYdyl3xxIfoEGR1CD0FfK23rtl4iWPNmfQwbDKbPbUS ryCdEw9nYeomgaFpsMCxXw+khXkdQF0tc5TJgLdV3PJLR5ybHVCXNGODtdSvHP99oUyf jY/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687442275; x=1690034275; 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=zUy8spMlJhAEp8KKmFBdTT3DjIC/nXTZCl3Npb8QGK8=; b=F8qK1nmwxkZu1i2xFHTJu33WzhxGtAyo6bH1S1B6WyLVqE+M10BAHmJA+9ds7DEKeM pcaWc7Adl8cQLt10SKJvsbiMBkReOQn/IVtdmEpX0dJWmxE8ZPb9k6G0ndsfy3gbhYpZ oZrJBM5uzTOSUwpj7/3H+mg0qrmdGBJaFOnPoqzBAsBOccAMMvLvO+fA5gFvccCb2TFW 93GL226XG4bRsoS0lYA9dDBrNsv8OoMKlACojhdYkxMVaJMg0y6Hkd3dfaKK98hM7GFb JZD6sGfaA7b5POuR2fmGEf0uhDPmKgdhv48fcKAG1RjWW1+g/f/NuFGMDckiIYYuy4Ha JnfQ== X-Gm-Message-State: AC+VfDx+8kDFAI4pUuijrUSpmP6wSWmgMuo+akcOwMFkyqcR+ZQqVxew NZrygve4m1/TcQNAV5ttEdcfN2nWkKGbGRuNewY= X-Google-Smtp-Source: ACHHUZ4OjM+W1Hz51ahUx7qZ1pUIni19v8ptxLiH5u10xPSv293O3CwLyLh5yh8LITPfBPNKeYATVQ== X-Received: by 2002:a05:6870:a486:b0:1ad:2b76:c3 with SMTP id j6-20020a056870a48600b001ad2b7600c3mr2312034oal.39.1687442275181; Thu, 22 Jun 2023 06:57:55 -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 w6-20020a4aa446000000b00562f06fb5easm156677ool.11.2023.06.22.06.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jun 2023 06:57:54 -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 v3 15/19] target/riscv/cpu.c: remove priv_ver check from riscv_isa_string_ext() Date: Thu, 22 Jun 2023 10:56:56 -0300 Message-ID: <20230622135700.105383-16-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230622135700.105383-1-dbarboza@ventanamicro.com> References: <20230622135700.105383-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 5a50cb1d0b..b65db165cc 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -2001,8 +2001,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;