From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBA06C4828D for ; Fri, 2 Feb 2024 02:26:45 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVjFP-0004bp-7I; Thu, 01 Feb 2024 21:25:43 -0500 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 1rVjFN-0004ao-Bl; Thu, 01 Feb 2024 21:25:41 -0500 Received: from mail-vk1-xa31.google.com ([2607:f8b0:4864:20::a31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVjFL-0006XC-5T; Thu, 01 Feb 2024 21:25:41 -0500 Received: by mail-vk1-xa31.google.com with SMTP id 71dfb90a1353d-4bdce906e11so539060e0c.1; Thu, 01 Feb 2024 18:25:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706840738; x=1707445538; darn=nongnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=RG1mBCndshn2WvKcOT7b+YS4q9wN7biAN8QUFpRyw8o=; b=BDTgJBBrDTjzt6l1O7n+C+k2s8x44asMlaYeRsjGSilN+3VYdakk7mUjOUC1t5Lzw/ QUwL95nhZWFJ8s5xoBLxh3pTDFKMTRrhYt0q19LsOslEJkSNP0HkmXECRGdkPciF8OII T1vJEQdoEHNhlktl1c1+yCCamGmipsj5Vc4aT0yqZQ/9RzF228HU5rAdxickTeo/S7ch azklrTJ3Tzhq68t8izom4CpalcPJda7IaQdqBjfrxkXOsqmB9DVCwMf4BWUMyMxPylOZ fjD1TtidM+nieIK7sHYuFv4mI1EeGmmQQDi2XwyPRmrj+QNv352xBlRj6tIEfgwZraKF pdNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706840738; x=1707445538; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RG1mBCndshn2WvKcOT7b+YS4q9wN7biAN8QUFpRyw8o=; b=K3HYwuReFMEWqyLwaBQVRKK2gbwOriGTq+Sd6jBcVHsVOLf9lUjNXxk0XMJbBS7NGt PxIpCNaFzmpC8fz5frUBZHm8K6NUL3pEgudvsJX4Aqr48QjMrqf2XBBxl2FIxCPshMgl jUHutvi/fb58NPRv0bfd1JWV+FX39X9pFQRRcIGMMLi37I+7jsosRudKI9//2ijAya6y 19uqU9GvrvUnRWYO2ejDm2DRFESzLFrSIZdNP/6O0tke6AdbSs1aalU8gpreVu/dKFMR Beeb+C9mMSqUaxd9uE0IVQRQ6nrF+N40xw32KfXaWGSwFqLSNGqanY8fZvXHbQ6t69w+ zRvA== X-Gm-Message-State: AOJu0Yy6+pJ8uFIk1n4oRbEMZVbSEx1NMP9JYvPYunef6mHxU+PuAw4+ LDi/wveaUPrsoR9ssO7Tf5gmIoWDFWVWN90v1+arY4n80vKgbaTka0TARf3B8Kphk2uWccHYQGI FmOXaSrMT+QDtdi+san/uUmvSf6k= X-Google-Smtp-Source: AGHT+IFGYInF9Q5C+kGw2W8o9OOeAuGIdbYeIDtN253Cfr873aLA8yaIdThL3xKUOllP58NhSJMY7NUq07ODyMj3/y4= X-Received: by 2002:a05:6122:98b:b0:4b7:41f2:9e9f with SMTP id g11-20020a056122098b00b004b741f29e9fmr857783vkd.9.1706840737731; Thu, 01 Feb 2024 18:25:37 -0800 (PST) MIME-Version: 1.0 References: <20240131123624.230982-1-vadim.shakirov@syntacore.com> In-Reply-To: <20240131123624.230982-1-vadim.shakirov@syntacore.com> From: Alistair Francis Date: Fri, 2 Feb 2024 12:25:11 +1000 Message-ID: Subject: Re: [PATCH v3] target/riscv: mcountinhibit, mcounteren, scounteren, hcounteren is 32-bit To: Vadim Shakirov Cc: qemu-devel@nongnu.org, Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::a31; envelope-from=alistair23@gmail.com; helo=mail-vk1-xa31.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, Jan 31, 2024 at 10:37=E2=80=AFPM Vadim Shakirov wrote: > > mcountinhibit, mcounteren, scounteren and hcounteren must always be 32-bi= t > by privileged spec > > Signed-off-by: Vadim Shakirov Reviewed-by: Alistair Francis Alistair > --- > target/riscv/cpu.h | 8 ++++---- > target/riscv/machine.c | 16 ++++++++-------- > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h > index 5b0824ef8f..88efd8a6f9 100644 > --- a/target/riscv/cpu.h > +++ b/target/riscv/cpu.h > @@ -254,7 +254,7 @@ struct CPUArchState { > target_ulong hstatus; > target_ulong hedeleg; > uint64_t hideleg; > - target_ulong hcounteren; > + uint32_t hcounteren; > target_ulong htval; > target_ulong htinst; > target_ulong hgatp; > @@ -317,10 +317,10 @@ struct CPUArchState { > */ > bool two_stage_indirect_lookup; > > - target_ulong scounteren; > - target_ulong mcounteren; > + uint32_t scounteren; > + uint32_t mcounteren; > > - target_ulong mcountinhibit; > + uint32_t mcountinhibit; > > /* PMU counter state */ > PMUCTRState pmu_ctrs[RV_MAX_MHPMCOUNTERS]; > diff --git a/target/riscv/machine.c b/target/riscv/machine.c > index fdde243e04..f129032b0d 100644 > --- a/target/riscv/machine.c > +++ b/target/riscv/machine.c > @@ -79,14 +79,14 @@ static bool hyper_needed(void *opaque) > > static const VMStateDescription vmstate_hyper =3D { > .name =3D "cpu/hyper", > - .version_id =3D 3, > - .minimum_version_id =3D 3, > + .version_id =3D 4, > + .minimum_version_id =3D 4, > .needed =3D hyper_needed, > .fields =3D (VMStateField[]) { > VMSTATE_UINTTL(env.hstatus, RISCVCPU), > VMSTATE_UINTTL(env.hedeleg, RISCVCPU), > VMSTATE_UINT64(env.hideleg, RISCVCPU), > - VMSTATE_UINTTL(env.hcounteren, RISCVCPU), > + VMSTATE_UINT32(env.hcounteren, RISCVCPU), > VMSTATE_UINTTL(env.htval, RISCVCPU), > VMSTATE_UINTTL(env.htinst, RISCVCPU), > VMSTATE_UINTTL(env.hgatp, RISCVCPU), > @@ -354,8 +354,8 @@ static const VMStateDescription vmstate_jvt =3D { > > const VMStateDescription vmstate_riscv_cpu =3D { > .name =3D "cpu", > - .version_id =3D 9, > - .minimum_version_id =3D 9, > + .version_id =3D 10, > + .minimum_version_id =3D 10, > .post_load =3D riscv_cpu_post_load, > .fields =3D (VMStateField[]) { > VMSTATE_UINTTL_ARRAY(env.gpr, RISCVCPU, 32), > @@ -398,9 +398,9 @@ const VMStateDescription vmstate_riscv_cpu =3D { > VMSTATE_UINTTL(env.mtval, RISCVCPU), > VMSTATE_UINTTL(env.miselect, RISCVCPU), > VMSTATE_UINTTL(env.siselect, RISCVCPU), > - VMSTATE_UINTTL(env.scounteren, RISCVCPU), > - VMSTATE_UINTTL(env.mcounteren, RISCVCPU), > - VMSTATE_UINTTL(env.mcountinhibit, RISCVCPU), > + VMSTATE_UINT32(env.scounteren, RISCVCPU), > + VMSTATE_UINT32(env.mcounteren, RISCVCPU), > + VMSTATE_UINT32(env.mcountinhibit, RISCVCPU), > VMSTATE_STRUCT_ARRAY(env.pmu_ctrs, RISCVCPU, RV_MAX_MHPMCOUNTERS= , 0, > vmstate_pmu_ctr_state, PMUCTRState), > VMSTATE_UINTTL_ARRAY(env.mhpmevent_val, RISCVCPU, RV_MAX_MHPMEVE= NTS), > -- > 2.34.1 > >