From nobody Sun Sep 28 17:06:23 2025 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1758567109; cv=none; d=zohomail.com; s=zohoarc; b=g4SF3dEQXiq7m+03LssZ2b/QcqEE+J3keeBDro/IRX11D2q55T17DAn+iP/2xIy8AyGNEmgx3GibYoh2ZU1g/h70Afs+oddP+x0ZlrSX/fUlCpFsbLQov5FAKFgygQoQmphw1Ok7+om8mksUUuNnI3hbMoGwBxk44w0JjAJGvUs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758567109; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qtUZ/Uu6kwNI+zAAOhv8j6MlV2cWVEsAAEi36fFJ9wU=; b=SEE1JZmPVhqhnP8S2hTmnhgO2JgyDDnC4Ly81tiTMWsQNScBchdtSMd0BkC0257dfXhrRFDgjsm55Su6qoXME/kHli3lagETjL0HPxsoDDowxMKXkG8Qweh+/y2oQzCe4Dsghhn8P5nzj/I7O0XOFZfhXBa6rFU3q5Za9JILrc8= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758567109524629.5027205400517; Mon, 22 Sep 2025 11:51:49 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v0lbk-0004kd-FU; Mon, 22 Sep 2025 14:49:52 -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 1v0lbf-0004gg-NH for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:49:47 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v0lbY-000464-HA for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:49:47 -0400 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-77dedf198d4so5063582b3a.0 for ; Mon, 22 Sep 2025 11:49:38 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77e5fe6de75sm10583861b3a.19.2025.09.22.11.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 11:49:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758566978; x=1759171778; darn=nongnu.org; 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=qtUZ/Uu6kwNI+zAAOhv8j6MlV2cWVEsAAEi36fFJ9wU=; b=OjDWBZMBLjnpJc7x6Aa4QgdSzygtjvRhUpowCykKcdF/9fRqJ4sdQHV3eIb7F+GsVn q3Fg0i+yttFksUw28ORI69sG4/BYFqBpzhc8M1cD3WAz8z7ZzFcsXlc0bK6q7pRbw+SZ jDaSKX7iYBwvfzcIF3joFtQd5I1mfrgpvBCtI7AdidzrweaUAP8vJMIASv0VOXFwWM/b j8sDrLwx6qcZVyWKcY0snGv71L8POmLLXzw6F9t8nt39i1B2+TwVaSsUl9wsjAGYLRlX 87VhMpDtAfC5Kda5jEMxT5nNJS2M6N043X+paHsK2pIfGXwBlmQD8HwjC5b094PtvFT5 RYEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758566978; x=1759171778; 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=qtUZ/Uu6kwNI+zAAOhv8j6MlV2cWVEsAAEi36fFJ9wU=; b=APLNyfbdIv4qluwfzNavljD0RBb7v12Tf3ZPfBamC8LQOIzDYwssLkKC+70C+uoJkE sKqQHjYuFbcWGdupzUGLKHEqv6cvq+v+UxBUAKwSiebK6jgaiFSRqmIe7FwIa8NUlFJk KS+z0MK6jRPw/59fVGqBV19NnpIRDshxwYvSOEtAeTXp0jgVO1MrPfRlUqMMFwa4LRhG tzQMbAP4rsvnYFISTpxgNSB+Lyhu+3VSzXmVhqd4mTevuvcZDdbaRUFjKpvmsslWrux0 wywXlK79cG4dgxZhZs3bWHZr9qgXmQ06QsOI4pG/buqeNW7QAmQ+B+gqBiFDDQNMoQQd r/Hw== X-Gm-Message-State: AOJu0YwTh6jkj5RDOL+AC6UxytS/1N5OB+nVf+h1szw/iLZqZFq+QyDh Lmp3XWYQaXMH6KAIS7UlPx3chZM7uTZPJhkwu53eMJMEyVwSut+/qKz9arEHnUMF0cKPyQSkLd5 xaXcp X-Gm-Gg: ASbGnct4qabVt3iY5ZZZKeIUQIbn5vqeT4CPtzJvx8ux30Ona25zsfuS7dfw+lWn4vp SELL2hwhY5PxgopM8SN5sZclaLMM4ndCOXH0LJAaz2b75Ho6CdapGz2p9cAiT625smD6WY7y1OJ hUAiq/kfg38J3CvL/4jA1DbJu50apbzNHMlqeM0fOaOEK5zmWCOtT+CX92wAzXwj6ewhsfkSNdr hSTuvQ4HOMIAw1kFFlrcbiO3J3THIuo20j+rdQwrseZ9xjceqI8C/NKKeLP7/gh8jkZYYJ+dFjF iRyXca5iSmN+HDRgl1RfmxEaOdMKSY0QdjYEv8HsPc7J1s1txygjLE15smZi0EfZmcKqObnNf40 B8bFUT6p0coKgw22o17dh+5UX2lpT X-Google-Smtp-Source: AGHT+IESM/forMLR2F+S29Rci4k5HQuQ8p3sORu0O/CLXi5/n/5F+jspnyzO2DfHSPetAMQXPz4UMw== X-Received: by 2002:a05:6a00:230a:b0:77f:3e56:c1c0 with SMTP id d2e1a72fcca58-77f3e56d116mr5522665b3a.32.1758566977707; Mon, 22 Sep 2025 11:49:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v5 09/76] target/arm: Expand CPUARMState.exception.syndrome to 64 bits Date: Mon, 22 Sep 2025 11:48:17 -0700 Message-ID: <20250922184924.2754205-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922184924.2754205-1-richard.henderson@linaro.org> References: <20250922184924.2754205-1-richard.henderson@linaro.org> 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::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.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 @linaro.org) X-ZM-MESSAGEID: 1758567110296116600 Content-Type: text/plain; charset="utf-8" This will be used for storing the ISS2 portion of the ESR_ELx registers in aarch64 state. Re-order the fsr member to eliminate two structure holes. Drop the comment about "if we implement EL2" since we have already done so. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/cpu.h | 7 ++----- target/arm/helper.c | 2 +- target/arm/machine.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index d17252f734..4dd4c6d4bf 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -633,13 +633,10 @@ typedef struct CPUArchState { * entry process. */ struct { - uint32_t syndrome; /* AArch64 format syndrome register */ - uint32_t fsr; /* AArch32 format fault status register info */ + uint64_t syndrome; /* AArch64 format syndrome register */ uint64_t vaddress; /* virtual addr associated with exception, if a= ny */ + uint32_t fsr; /* AArch32 format fault status register info */ uint32_t target_el; /* EL the exception should be targeted for */ - /* If we implement EL2 we will also need to store information - * about the intermediate physical address for stage 2 faults. - */ } exception; =20 /* Information associated with an SError */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 1111a16330..f66868f9ef 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9182,7 +9182,7 @@ void arm_cpu_do_interrupt(CPUState *cs) new_el); if (qemu_loglevel_mask(CPU_LOG_INT) && !excp_is_internal(cs->exception_index)) { - qemu_log_mask(CPU_LOG_INT, "...with ESR 0x%x/0x%" PRIx32 "\n", + qemu_log_mask(CPU_LOG_INT, "...with ESR 0x%x/0x%" PRIx64 "\n", syn_get_ec(env->exception.syndrome), env->exception.syndrome); } diff --git a/target/arm/machine.c b/target/arm/machine.c index 6666a0c50c..ce20b46f50 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -848,6 +848,23 @@ static const VMStateInfo vmstate_powered_off =3D { .put =3D put_power, }; =20 +static bool syndrome64_needed(void *opaque) +{ + ARMCPU *cpu =3D opaque; + return cpu->env.exception.syndrome > UINT32_MAX; +} + +static const VMStateDescription vmstate_syndrome64 =3D { + .name =3D "cpu/syndrome64", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D syndrome64_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT64(env.exception.syndrome, ARMCPU), + VMSTATE_END_OF_LIST() + }, +}; + static int cpu_pre_save(void *opaque) { ARMCPU *cpu =3D opaque; @@ -1065,7 +1082,19 @@ const VMStateDescription vmstate_arm_cpu =3D { VMSTATE_UINT64(env.exclusive_val, ARMCPU), VMSTATE_UINT64(env.exclusive_high, ARMCPU), VMSTATE_UNUSED(sizeof(uint64_t)), - VMSTATE_UINT32(env.exception.syndrome, ARMCPU), + /* + * If any bits are set in the upper 32 bits of syndrome, + * then the cpu/syndrome64 subsection will override this + * with the full 64 bit state. + */ + { + .name =3D "env.exception.syndrome", + .version_id =3D 0, + .size =3D sizeof(uint32_t), + .info =3D &vmstate_info_uint32, + .flags =3D VMS_SINGLE, + .offset =3D offsetoflow32(ARMCPU, env.exception.syndrome), + }, VMSTATE_UINT32(env.exception.fsr, ARMCPU), VMSTATE_UINT64(env.exception.vaddress, ARMCPU), VMSTATE_TIMER_PTR(gt_timer[GTIMER_PHYS], ARMCPU), @@ -1098,6 +1127,7 @@ const VMStateDescription vmstate_arm_cpu =3D { &vmstate_serror, &vmstate_irq_line_state, &vmstate_wfxt_timer, + &vmstate_syndrome64, NULL } }; --=20 2.43.0