From nobody Sun Feb 8 18:29:10 2026 Delivered-To: importer@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+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1684331901; cv=none; d=zohomail.com; s=zohoarc; b=CisoGQvrHP8/JOTrJQ4a8n/upSPdL/X49dFgs5zMPmo9fXgHSUINcQ3kVWtw9TGP9uln4+5B6NBwdSUQyhph3COOJi4ImFVXnDLmC4nbXqi/4Y6J1UoLsfjRqv3wZ8wJgopxehd52Dk46GXEP2GwpK/9rx9djfzxKqflM8ZLH/M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684331901; 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=lWt2ZMWA6z+B9QZASmH5IEOuVSLKg4cj3mZuVfKgT9E=; b=JdZdFvXN+L2gGGNGvrhAJ1JpyRifdSNI2CrY77ZUr4kMJm/IlpyHxNbmoztOftyu0FekY9qtv1oxFWe+SmpsDcZWLFrT+PhG1gCpTd1qdD+1Q1IPVas8vLwt4RfnVxwQJLIxMpFt79tNZQ15QpuHQEII4ow0JqE8Qz3uQ5HxxiQ= 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+importer=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 1684331901950272.9799530287893; Wed, 17 May 2023 06:58:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzHfC-0001M7-Na; Wed, 17 May 2023 09:57: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 1pzHf6-0001GL-9p for qemu-devel@nongnu.org; Wed, 17 May 2023 09:57:53 -0400 Received: from mail-oi1-x234.google.com ([2607:f8b0:4864:20::234]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzHf3-0000U8-Gw for qemu-devel@nongnu.org; Wed, 17 May 2023 09:57:51 -0400 Received: by mail-oi1-x234.google.com with SMTP id 5614622812f47-3941c3ba226so559129b6e.0 for ; Wed, 17 May 2023 06:57:49 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 06:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1684331868; x=1686923868; 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=lWt2ZMWA6z+B9QZASmH5IEOuVSLKg4cj3mZuVfKgT9E=; b=MGZdnd2ukuvB8MVF+0VU1dWqIfJVCIb5vmKGBBlIVHP5NHBef1riz2/1hyDbA/8fBb Dt5Cw+6KSd8LkAEwhFPPpxoumIUWpgjZPynbsmXjTrEH+vv+ap13OJPm+Dc+iSVRV41D yCj4hcpPFsSgJtBuwm/ZKUCHF6EZc5xZMtZXOZyzoaQIcvc7CL03KA//fBrQhC9ghAkC 9441ph/bq3oUnPTf3LEaeGNqx9xB7pWJbgWaL8wfOH2OqF9fBbaxLHHiUg3TSTCHO6R2 agolp4wqZ3L/22TUkIc64p0I/pPKb0P7/SybYACu8j7rTN9m/xQwJA8sNvuMWxZuMOeN wrzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684331868; x=1686923868; 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=lWt2ZMWA6z+B9QZASmH5IEOuVSLKg4cj3mZuVfKgT9E=; b=ib6nLRew24VbFt9khQbw7JLZpzJc637tP0/Vw5eIPiM8wRZw4ADsHdx7oKKU74oeAQ f6xGLZyuciBloTfzoIQPEA9WBagWO+QRNTP7fOqilvgNDasM3gITsecV2+2eVGDx2Cfj Tg66GDtBoUxLPn+WyRIW7lRLhybIDqC8o7VGtpCCjlsPwNP7VDETJzb0VE0vl3pSgaEz W385UwWbhNWJKRB0gofA4B18HR9jEJF5KNnKV4Ksxh7vzdUBE321S8RxM+Flz3A8RDob NMbBCT1/o75sdEI1tDQkRqUMlatrBQbgXf6e9lgmlDXdKHfwqdFkBpg9VgAItKxnsw4N cepQ== X-Gm-Message-State: AC+VfDz0wTATaX8ZIDAxSvjYnIl+c5Sf05hWYYye5r6c5RQYMsNFhfm9 eVazQf/BUgR4RxnkGE+oCDEiDmhJ8lMdoIvO75o= X-Google-Smtp-Source: ACHHUZ7eNlt0D86+8IoLPOpOBufgbJ0HEmranlwJPP3dLmHCQ4r9T2y/kF1WcVs3IEOwOwopX0yrhQ== X-Received: by 2002:a05:6808:10d1:b0:396:cd:82b1 with SMTP id s17-20020a05680810d100b0039600cd82b1mr8464034ois.2.1684331868646; Wed, 17 May 2023 06:57:48 -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 v9 09/11] target/riscv/cpu.c: validate extensions before riscv_timer_init() Date: Wed, 17 May 2023 10:57:12 -0300 Message-Id: <20230517135714.211809-10-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: 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::234; envelope-from=dbarboza@ventanamicro.com; helo=mail-oi1-x234.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1684331903998100001 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 32240a0b10..9e33fa4301 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1294,13 +1294,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); @@ -1308,6 +1301,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.1