From nobody Sat Jul 12 05:50:41 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1681982558; cv=none; d=zohomail.com; s=zohoarc; b=UvFXgmcGbX52SmoPr/KMIxL3B2Bim0rd2wLJlLHAPCUkeghKlSQrQcAR4g/B5tE7ORyrg1rhUB0tcxZ+r4NHGARM11YOH9VqTGHUjnUBOH8aUDPSukNoBuajGLriRL8eZNckCkHHaVoPgeFRgcU8QgjYj0N+e/5EEaKx3Wqt2Cs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681982558; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z2BCmuELRJPh5SQX498hmY8SpGq4Krgaf5b8ZbejSLc=; b=cBLS2oGF8W3juSN3aVsFqMGccJIgqBXVnxf4L9lO9zgXquyqALDpCwQf4jmkua0Y4Oh+APTDCLWnPNtkclyVVt3JcrA556sQsjqrPtgr7+AbnMwOLTq/MEIUJeWJb7uvHSoOUHBvzyKHMAIR19hEHBVKRqTsTe2frxPQLLiygFg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681982558625823.7984754787822; Thu, 20 Apr 2023 02:22:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppQTy-00009p-3S; Thu, 20 Apr 2023 05:21:38 -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 1ppQTw-0008Ri-MT for qemu-devel@nongnu.org; Thu, 20 Apr 2023 05:21:36 -0400 Received: from mail-oo1-xc35.google.com ([2607:f8b0:4864:20::c35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppQTv-00075X-47 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 05:21:36 -0400 Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-5422bb4603bso202558eaf.1 for ; Thu, 20 Apr 2023 02:21:34 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([191.255.108.232]) by smtp.gmail.com with ESMTPSA id t1-20020a056870e74100b0017280f7d653sm529668oak.35.2023.04.20.02.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 02:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1681982493; x=1684574493; 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=Z2BCmuELRJPh5SQX498hmY8SpGq4Krgaf5b8ZbejSLc=; b=Uo2nu2LIEHjEKvUrbFN6Y6C6YYmp6BgjPIdtsFxrDiusfIOwKh6QDpOqArH+s7satK AqLJT1NwxOgtEWrir5IBSUlQmvoF3nau/rqEyKQIdFDNq544ZNEIY8zOjAtCXBMexxZz /PaHXNl39FsLw79J53rBnCQaasYW2CFZexUCPqCZHUg6xnFQIQ/GblNEC+0ix6UMgjdq m3Xc23wAkXYyIq9ay6avKySZBFU0Nw0L8pxj8n09WhBp72VNG1ZigrWIOjuVtGa0rW86 2vs92z6ha8VhiJD7+95t5Y7G1F+5g4CQA1X1tHM2QEzm/PtxWVUMUqIFZjzYv3MUPVs9 1fQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681982493; x=1684574493; 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=Z2BCmuELRJPh5SQX498hmY8SpGq4Krgaf5b8ZbejSLc=; b=ccFHC6my1uFezOn9gr7Nt3Pp4U/UHcWSK3aO9501t+1tUKGvaj08AzWdK8WMqkRoDb 6Wml32tIiJmT9lX7DBoFifEITfhbTXf3SpezCT+DkIMRxqOpz3JRb19DQpoYeGYsuCgq mFvesLM23IcdGtUQed1EVSfysOWDkv97T+uu5Wprgk9V7MM5DpkHd4bsu6cf/k+RUHKB pUeuWuhNW+JG9QZKe3tbCZVrBcd4xCaPAoUopkpBM21yK3QjxOjLQmFlh7DCct07wfdy 0r+sG0LhjoUVVm8MUSGFJCTtg4feXYo31Y5w4CJIZCp/tcehyDM1zXwG0+49UaOfPDwI PqEQ== X-Gm-Message-State: AAQBX9d8swM4QrBYdVMCmI8hdrPnRK/yy4mqNTOell5E3uGhNh4Z7ybO K816HT+XZFZ7ZXV5V+VFDSZuOTp3WfFyGdx6e9I= X-Google-Smtp-Source: AKy350aN61rK2S73EeYm+IbsIBvcwjOpdDNpmTg21MdFAGuPcgRM+rT8+eB3M9dmAn++qgJ0vKofNA== X-Received: by 2002:a05:6870:ec91:b0:17f:84ba:a74d with SMTP id eo17-20020a056870ec9100b0017f84baa74dmr699520oab.53.1681982493607; Thu, 20 Apr 2023 02:21:33 -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 Subject: [PATCH RESEND v7 09/12] target/riscv/cpu.c: validate extensions before riscv_timer_init() Date: Thu, 20 Apr 2023 06:20:57 -0300 Message-Id: <20230420092100.177464-10-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230420092100.177464-1-dbarboza@ventanamicro.com> References: <20230420092100.177464-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c35; envelope-from=dbarboza@ventanamicro.com; helo=mail-oo1-xc35.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1681982559537100009 Content-Type: text/plain; charset="utf-8" There is no need to init timers if we're not even sure that our extensions are valid. Execute riscv_cpu_validate_set_extensions() before riscv_timer_init(). Signed-off-by: Daniel Henrique Barboza Reviewed-by: LIU Zhiwei Reviewed-by: Weiwei Li Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 43635144bd..2d7f0ac785 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1257,13 +1257,6 @@ static void riscv_cpu_realize(DeviceState *dev, Erro= r **errp) return; } =20 - -#ifndef CONFIG_USER_ONLY - if (cpu->cfg.ext_sstc) { - riscv_timer_init(cpu); - } -#endif /* CONFIG_USER_ONLY */ - riscv_cpu_validate_set_extensions(cpu, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); @@ -1271,6 +1264,10 @@ static void riscv_cpu_realize(DeviceState *dev, Erro= r **errp) } =20 #ifndef CONFIG_USER_ONLY + if (cpu->cfg.ext_sstc) { + riscv_timer_init(cpu); + } + if (cpu->cfg.pmu_num) { if (!riscv_pmu_init(cpu, cpu->cfg.pmu_num) && cpu->cfg.ext_sscofpm= f) { cpu->pmu_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, --=20 2.40.0