From nobody Sat Jul 12 10:12:49 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=1679169942; cv=none; d=zohomail.com; s=zohoarc; b=Nxxj7+/G4ZclhY4Zn/jyXLny34ABo7rgAxi9PIq4GXTcIU4rsF7jLilwY/Wni26Gv8nQkYyHnmSArlL/sEISGuqafmqxG43VqW3ug6WEIDr2Cd1nbWQEYmj1VnAxlbd47soRFQioLWsoMnWDCsnl1dmrE3qzGiZ9WCWzboJcaYQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1679169942; 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=jRxaT4woiWXaSaLtZ893V5mtUf48PrMEl3HdQBqO5UEMSvhI388jyFLMzLleSuZMMoRzdtamRBtgpMPyu8ReDz5U1nADRBMY5HIpuTwWzbsBGWdMM/Espc2lMBgHCiUHTm8Go1hGBYc/KFo9dPcUDGamZntSDyeuvx/Q1gXEF8w= 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 1679169942393660.128302729588; Sat, 18 Mar 2023 13:05:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pdcng-00055p-QC; Sat, 18 Mar 2023 16:05:12 -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 1pdcne-00054o-LF for qemu-devel@nongnu.org; Sat, 18 Mar 2023 16:05:10 -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 1pdcnb-00076X-5T for qemu-devel@nongnu.org; Sat, 18 Mar 2023 16:05:10 -0400 Received: by mail-oi1-x234.google.com with SMTP id r36so6207495oiw.7 for ; Sat, 18 Mar 2023 13:05:06 -0700 (PDT) Received: from grind.dc1.ventanamicro.com ([177.95.89.231]) by smtp.gmail.com with ESMTPSA id f69-20020a4a5848000000b004a3d98b2ccdsm2122219oob.42.2023.03.18.13.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 13:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1679169905; 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=TDDlvkp56ov3KIIHPlwZxNuiE87wOJf0PYPwXwb0XfAhmlqmDKEj1692eOnP5ehQMG NKhQ7YG6HPBGdM0gdspVNJzo4rgMSiFIaRcP4a2UAPrCWQl328GcJrQZ0VKkNnAX0dC4 s07juJFqiNrr8k5396eVZ1g7E2udYzrqvDz0WiZT4Jf8c3dkhFkToSMASC0G1auIpdpM /fwPwEYjsW9lW+zWHbkf82byWLDhUSDTKBaZCLpPutbMC3XMDXcTxBXCWI0ht669XE3O V8ukfKITIw1K/WM6xLbSRA8OEbmj+NStkjDIjvdMivF00flNyHo5PqXYY+lWgD+LCROi gPng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679169905; 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=gEJcQ70Kh0+QJZK7FcRnsZSlZOei8YFHVHBDTIi7+H50tnZSAGljhVb+xm6Te1/RhP ETBpc0gKfPfouyS4mCdeRHsSrMHNlggiNmqOoy5C2Kbjyru1wJ24PPxW/akfuZl074h2 Z5Lbz7OOjTft3HcHVwuihelB+iNTmhN+S66J3cTruVONkLx+PvonezRH7r44xMBnEX09 Y4URJl5YWZ3XAuY7fRvtHVBuM9ZvnCbWjc1FVw3m/BI+Y6D14UUG3IBXsn8KGfQNf3k4 UthLcLFqxm+aOC+ADAKT7+gqH5Nla4uRdFJvN+cWj/Lc3z3ZjO1KGos4Hue6w27MCiLJ Ta0A== X-Gm-Message-State: AO0yUKWfFNbAb8+Np/Ozqe47eLBvOEQRtTSuyaAcq1H2CJODu3PHLCNU btIpF6Y1fVEaunVR20xILrnbh8dfxpiZ98TAsvA= X-Google-Smtp-Source: AK7set+8OZMuZrhaWKjkioENyu81i8Ly80Fc+V2AGZqYMXA/LA96yokoVxKYnHJX6afKBZyMX3yfZA== X-Received: by 2002:a54:4498:0:b0:36d:f6c4:1860 with SMTP id v24-20020a544498000000b0036df6c41860mr6115865oiv.34.1679169905650; Sat, 18 Mar 2023 13:05:05 -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 v3 08/26] target/riscv/cpu.c: validate extensions before riscv_timer_init() Date: Sat, 18 Mar 2023 17:04:18 -0300 Message-Id: <20230318200436.299464-9-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230318200436.299464-1-dbarboza@ventanamicro.com> References: <20230318200436.299464-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::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 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: 1679169942731100001 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 --- 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