From nobody Fri Mar 20 22:01: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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774012386; cv=none; d=zohomail.com; s=zohoarc; b=BGldIRiIHnbthkzswavnPuNMajEVsp1M2/4vkDky36Q9xrs22uMktpNvKFQlsugGhGAoqO8p39PccA/qNE249aAWvHrsmrAsRcIWtJ9RvQuDqenMDr8RKsKQdWpwwv0wHISluH4JBWJenvEHfuopBdoOQG26e2cEmZg5TuHlNLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774012386; h=Content-Type: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=HI5bsg6gI1dq5e33RiLLzAmqut1VQt7v+7lGbNwBtkY=; b=T31Oq79egjTvkSmsddNbp/95lccTa66oNXf4j8NaoZH3agvulWvzopOxbkVe2AxMWNx1glK/YLGl+dgZCbWOfoML9yea4PUN3MJBDU4O1EBijdRHPGyHpXEXe4wrwNSCPZ4x+/Otz8MPwNcbZLUnITb1tFR58M/fXTAlcMBUee0= 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 1774012386414652.1510813640108; Fri, 20 Mar 2026 06:13:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3ZYZ-0002yt-VU; Fri, 20 Mar 2026 09:06:28 -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 1w3ZYV-0002v2-CE for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:23 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3ZYS-000635-MA for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:23 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-667acaeae82so2864660a12.3 for ; Fri, 20 Mar 2026 06:06:20 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-668d1cc5f1dsm1356965a12.14.2026.03.20.06.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 06:06:16 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A65445F954; Fri, 20 Mar 2026 13:06:08 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774011979; x=1774616779; 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=HI5bsg6gI1dq5e33RiLLzAmqut1VQt7v+7lGbNwBtkY=; b=omSix8FM5u5OljAKjZ+/eBcp7139xPoGWbSvAI91L4KOeINbVvDWMTMHQnTu7XOOhg CVrdrxef9nybu7mVTqqhQ/pQblv/48omJo7qVa16zlGXIUF++zk+qEdA5ebxJCXJoxtT M5etfFmt8qgJcTURwehq+IpQRPG4zzRkiXG0GR+QBiSUWZ2libR1gx0HEVIyUxY26lek tGOxnxAb+gWZCHgGu/DTR1MAPA6FC2gkIVN6HVqI2ZJxqvWDgWUws9/gbATJQ68rr0Hq NRX7qGXUpGhgqlmTtQXQqqJIO3QxTtMMZNF88WbyG2GW4AesIloD4xTLwskGc0tAybdj ziWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774011979; x=1774616779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HI5bsg6gI1dq5e33RiLLzAmqut1VQt7v+7lGbNwBtkY=; b=tNP0BvJLaHnAZCqNi1P46hihSjUh1Cgo+8UrcOAT/Gjhr/qoPKH91N+W6gY7ykqUXY JiS6F8y1/0LEpOGfUqX4kUGDO6c4nVzIcAWI3liQuXkIezLCcAEQyntx2CwPbbJed0vX 9edncyHO25HdzwBx2Mz3Zx3IA0tpE+CTcipFv67ekDKt+YcBtw4gyD/bFV7uH/mrJq1f udPRxKZfClIju7qSxkwTQKhz8uOOgt+DYX5Ril6POixK8skZ7JNLVMKB6YdGOgLFbvDN XGugFyuy5Gc1d0dYQdfZsFjblbmVf8dNtTDKPHZt4jf02iCcpoFJXPz5VP9uhQeZLit5 peYw== X-Gm-Message-State: AOJu0YzLEALWIOcYpGjCb+lPK+iuHO8/lvXhUJwbKbOI92wYcLZ4RwPQ o9dWRKv3mSrbUsSxQd0miPKzOVPONlbxC9aCxBfX7ZCyd4kQtM9cyiS9KsfVJZbhSi7snJ2JAf5 c6S9kjKk= X-Gm-Gg: ATEYQzwRzQsrPnTcfZ0IFP+aPa2dCZc6r3fpqQxWGr0fY/jyuWdP0MpFo1wXxr218ZY XQe6oW9B1Y8DKSLWVtyoCrfZGwP+BgZzGUXe5Li4pHy9IDM3Rr/slMde6vqtNTuTKf8YVJOzLzM hVW0Wc21VKSTkb0OZamCQ1uIhnh+HHZlZgAVav/j0Kj+DBK9ayozvvSLyQBYVRBTWlmKTGAk43b P1/k1qjAkXR+ZF/Br+x2gY4qHV8A1YrHnmThM+3rveO3Qj3msP+a7BEIAxSlzQGpqzujiyNFHKT YzYKW1zViMJaOCZcvfjmbnpp5mKzQ2lstCmN0NYtoTIS4qaOSdPpn1lPgKg0KEXBlY1bnLL36av 7LUUcsuEc5ukReIsQCyArl3erjiXjmK5UFRujx39dzHrFjE6lZ3oRvTEvTx21CiEa3zWBFsN2Oj PgAbdIJMh6FhD5uAYtgySt5Gbmhxw3Br2lkQ== X-Received: by 2002:a05:6402:358f:b0:668:599e:103a with SMTP id 4fb4d7f45d1cf-668c91005famr2219464a12.8.1774011978920; Fri, 20 Mar 2026 06:06:18 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Alexander Graf , Peter Maydell , qemu-arm@nongnu.org, Pedro Barbuda , Mohamed Mediouni , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH 13/35] target/arm: migrate gcs syndromes to registerfields Date: Fri, 20 Mar 2026 13:05:44 +0000 Message-ID: <20260320130607.2071996-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320130607.2071996-1-alex.bennee@linaro.org> References: <20260320130607.2071996-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::529; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x529.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: qemu development 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: 1774012387987154100 Added a little comment to explain the RADDR<->ra mismatch. Signed-off-by: Alex Benn=C3=A9e --- target/arm/syndrome.h | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h index 503b19b5d02..76f66b3beef 100644 --- a/target/arm/syndrome.h +++ b/target/arm/syndrome.h @@ -690,21 +690,49 @@ static inline uint32_t syn_pcalignment(void) return res; } =20 +/* + * ISS encoding for a GCS exception + * + * Field validity depends on EXTYPE + */ +FIELD(GCS_ISS, IT, 0, 5) +FIELD(GCS_ISS, RN, 5, 5) /* only for non EXLOCK exceptions */ +FIELD(GCS_ISS, RADDR, 10, 5) /* only for GCSSTR/GCSSTTR traps */ +FIELD(GCS_ISS, EXTYPE, 20, 4) + static inline uint32_t syn_gcs_data_check(GCSInstructionType it, int rn) { - return ((EC_GCS << ARM_EL_EC_SHIFT) | ARM_EL_IL | - (GCS_ET_DataCheck << 20) | (rn << 5) | it); + uint32_t res =3D syn_set_ec(0, EC_GCS); + res =3D FIELD_DP32(res, SYNDROME, IL, 1); + + res =3D FIELD_DP32(res, GCS_ISS, EXTYPE, GCS_ET_DataCheck); + res =3D FIELD_DP32(res, GCS_ISS, RN, rn); + res =3D FIELD_DP32(res, GCS_ISS, IT, it); + + return res; } =20 static inline uint32_t syn_gcs_exlock(void) { - return (EC_GCS << ARM_EL_EC_SHIFT) | ARM_EL_IL | (GCS_ET_EXLOCK << 20); + uint32_t res =3D syn_set_ec(0, EC_GCS); + res =3D FIELD_DP32(res, SYNDROME, IL, 1); + + res =3D FIELD_DP32(res, GCS_ISS, EXTYPE, GCS_ET_EXLOCK); + + return res; } =20 static inline uint32_t syn_gcs_gcsstr(int ra, int rn) { - return ((EC_GCS << ARM_EL_EC_SHIFT) | ARM_EL_IL | - (GCS_ET_GCSSTR_GCSSTTR << 20) | (ra << 10) | (rn << 5)); + uint32_t res =3D syn_set_ec(0, EC_GCS); + res =3D FIELD_DP32(res, SYNDROME, IL, 1); + + res =3D FIELD_DP32(res, GCS_ISS, EXTYPE, GCS_ET_GCSSTR_GCSSTTR); + /* when ExType =3D=3D 0b0010 RADDR is the data register */ + res =3D FIELD_DP32(res, GCS_ISS, RADDR, ra); + res =3D FIELD_DP32(res, GCS_ISS, RN, rn); + + return res; } =20 static inline uint32_t syn_serror(uint32_t extra) --=20 2.47.3