From nobody Mon Feb 9 20:30:34 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=1679528446; cv=none; d=zohomail.com; s=zohoarc; b=P/NRezb+iaGosjsPPHuHQj+TDq0Bg5sDc7xkonLdYp52bVvYVKcr6eWiurwGGgA2QvwjyQQyw8QlzwGn0O1R8FJi3re7opKgKitz9R0ri0zuvnt3YrJFHYBJ9gbI8Ve7Ip5PgAKFFTMnU2gn5xzScEo+TmuzAIECY5DvqNEAlwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679528446; 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=jEPTSkB86BpaaFtLEftxltn8EEKuvxXM6fE3vNx61Lo=; b=klxeucR42pom5GOZ4lzmmb5yd+jhtFZJ5jIbSFMqSxAtPTK/On6qPxegafgP0mHLKyHK6vHTQHt5d0w2D8QyFfQqQbrcHRf1fwd64ZarvLjBeIsb/IFPRGtf1gaFt1S3gZ4x8SnXjufvzvvshsgHoRxhHs7hSMvmBIfcoPORMcc= 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 1679528446385960.5692046791049; Wed, 22 Mar 2023 16:40:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pf6pf-0006Pf-Kk; Wed, 22 Mar 2023 18:21:23 -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 1pf6pe-0006PE-2a for qemu-devel@nongnu.org; Wed, 22 Mar 2023 18:21:22 -0400 Received: from mail-oa1-x2f.google.com ([2001:4860:4864:20::2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pf6pG-0006V5-2b for qemu-devel@nongnu.org; Wed, 22 Mar 2023 18:21:17 -0400 Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-1755e639b65so20931826fac.3 for ; Wed, 22 Mar 2023 15:20:57 -0700 (PDT) Received: from grind.. ([177.95.89.231]) by smtp.gmail.com with ESMTPSA id ax35-20020a05687c022300b0017243edbe5bsm5586817oac.58.2023.03.22.15.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 15:20:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1679523647; 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=jEPTSkB86BpaaFtLEftxltn8EEKuvxXM6fE3vNx61Lo=; b=l1RcBFaZs9QDDMMnvPk66caZ29GzphCzEHPlIFp27V9tpLCxG9KR5mHVdDtODCbq4p RZopJaao6B6PEJEs5lJzq9T2sP49yN+0NaaHlmsfLbVh0G0hr394RZu0wStONHBONhP8 x40KnYffGqF9Kdm/rQK9y3NzZHH5U6qetNgUg9ghdtSSwMqRUz0zHLqhjg3BKQgooHCN S3VT7JP0/B8C0E/8OgUK/JtjNxrAlys/iPgcKNh26rkx2xsAKWg6ggjInrRcimTXVP6V ujhFHkILsJz8FNyFdldzElbdukde/Nj0wx1wjE+edSRsgoZFwTsOLyo7e5jZ5GTs3ksP CrrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679523647; 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=jEPTSkB86BpaaFtLEftxltn8EEKuvxXM6fE3vNx61Lo=; b=SrlbrFGKGkgnSbd9z/c5li2Zi90gIoY9i+XfdRxYlSmAt1UGKqk8nQB0H0uw8NBlyh Bvz8q8J7WrpPE1QO2FPkpbNv0YfdW2o+cL+Z8eVlKUPPj++g3XhzAfX09YvBCSvsKk/s 23RGWqlABVTI0BAWz7zdQsu4KWMmp3kmy+Y2J4+DXp7hNOhb3tqNx9NS3/RI8uwcEWWZ hoznDB/oH5ET1rbpEE2Oo9ThwU6kyFEZLFKFJyNia2LDW2XKS6nJa0Ka/NWB354IDXRv qSM1nPo6Q4+mGYf8JPIY8fOY3N6jFqY57OfbRtjvcmTGZc4JqE0OGbqM+1xq5p4munC4 EU5A== X-Gm-Message-State: AAQBX9ejSvXruoU7+T6qs72REkJ5gbP/Bpl/a/DAukIGYwBx3zGovm// 3cXoDqtOyZORIEp880NyRM2yWc1MaLYrQBYDxfo= X-Google-Smtp-Source: AKy350ZNOMJ7M4EsOJkDXyb6z7sOJfOCZnEKTrnFrffCB5GOdt/hCO3EIUKKMnfx3ucKBGiYDL+6mw== X-Received: by 2002:a05:6870:a68f:b0:17e:e65:c922 with SMTP id i15-20020a056870a68f00b0017e0e65c922mr824017oam.36.1679523647246; Wed, 22 Mar 2023 15:20:47 -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 for-8.1 v4 08/25] target/riscv/cpu.c: validate extensions before riscv_timer_init() Date: Wed, 22 Mar 2023 19:19:47 -0300 Message-Id: <20230322222004.357013-9-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322222004.357013-1-dbarboza@ventanamicro.com> References: <20230322222004.357013-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=2001:4860:4864:20::2f; envelope-from=dbarboza@ventanamicro.com; helo=mail-oa1-x2f.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 autolearn=ham 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: 1679528447884100001 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 --- target/riscv/cpu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 7458845fec..fef55d7d79 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -1237,12 +1237,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); @@ -1250,6 +1244,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.39.2