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 BFA3CCAC5B0 for ; Fri, 3 Oct 2025 17:25:50 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v4jLW-0007Qr-FX; Fri, 03 Oct 2025 13:13:32 -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 1v4jKZ-0005Lm-E8 for qemu-devel@nongnu.org; Fri, 03 Oct 2025 13:12:34 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v4jJw-0007kh-3B for qemu-devel@nongnu.org; Fri, 03 Oct 2025 13:12:30 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7833765433cso3305973b3a.0 for ; Fri, 03 Oct 2025 10:11:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759511508; x=1760116308; 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=+vTcN1bmbjlBmSHOppZaWA7zST739/0Swmy38eG0HYE=; b=PMsAZ57n5Gkh6VdHmNQAFmHr8gib4F2QQayRWzbY+qef4DNqTwUGbhYK8uN7P+EiZG 2rdnEGT9f6gkon+0qRzWTFgrPVKehqEmUjCQSHu6MOsMzNeEYa3Gi5pZbHBYU5RyFoTp 8jRKTWMeoUDYIiZ6GLI/bFYTdy2xcplc4B5hWSsqoE7Fe8G+RecaUXVZwIAv/Lmvela4 SX2CXOyEbalPpONqotkyKdo/NmNlIiR08XNQysBPgA+d7fyhN0TTQaRFaehZOszgXNAM CioYj1nOJttnMlsH3ad+mAZsMvGInig0SAuQxya3+/iVJ7hzsIkzhjPmDeAPvUqbuLlI 5AiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759511508; x=1760116308; 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=+vTcN1bmbjlBmSHOppZaWA7zST739/0Swmy38eG0HYE=; b=sXoTunhxuaE6U/FCuDS8TUIaQzxUYYnu/NgQYDttIXSUPprwAVLskZKNj81XxJFj3N HgdImaC0ghq6McT64aoFWYlqAl3ebZlENshfvicGS8htcdtV7PA/+v3o5pooUJMnsbp8 KL7mUdqXPKr8XobOEtF3ohOPacyk/nmrmaIABD4G/fCVy+eFq93FsClcc4+TvvAptCf0 xb7eWxnwrt9oR7008Ov20d+IMTOb0AwoKdY23RUTLdgzx2Ic0WJde6rf1ApF5mq4A9Eo JmXlJsrD4Q5fE0uicbVoBPIL0dxaZr4i+VXHePX+ngc0CnEZiSmPwD4Ih/KLxBmp9FEO MK1g== X-Gm-Message-State: AOJu0YyAmYY91Iu31tRgcpODB9/0EDWowvgT09KurMBq1bsiAO/Lh68Y qmwCTJCxumLTEFg4h11MrgqiiSobL3iAm6CO6KdL2ueYq+JsXj7lKxexOAdJQW4nPqRkhQjhpM+ 3qmpmW/o= X-Gm-Gg: ASbGncuH9JR1ryTh8qoYoPxiizmrVjjGattofjf5KV+WtYGT1ZGAL2c4bkiCic8IWan GbXQpRxvECifWqpcbQ+L5UuvjAI351KlzW2ASEA8YlWwdEZKiZGaOvfBTdXxjX6g60GSUMYudxR qrghaG4a3gtAemukwip/irAzJ8s+CMRGlKRxxU702RE7zBlSKmM/ot3GEJZw4O781YH5LC5lhq4 j3y6joU+Gu4dEJNeJKIrOB5qBeh79JMzuR1gEpMNclVsZ9pg+OHRJiFCZnXnDhc1iy/XaTnSTXo HaHPh5sDIUhF3q8N996es8pFwIyF0KJQ8vdIdogLm//sIn46Q9d/GngNdfnXm4D9W7xE9/x74CE 6hRiiiWL5VlK/4Wvl6EByurh8eygQesmkbW0BmBkP+7UNyUWkOaR8Jus9 X-Google-Smtp-Source: AGHT+IHfPwHgOQ4193+Z5WW3eJcujKTU2cH1KfVCyhj70tyAAcd6xtES1KGcBOBcWLHg2fjZdJvLfQ== X-Received: by 2002:a05:6a00:1394:b0:783:6042:114a with SMTP id d2e1a72fcca58-78c98dfdb38mr4993172b3a.25.1759511507370; Fri, 03 Oct 2025 10:11:47 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-78b02053a51sm5418769b3a.46.2025.10.03.10.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Oct 2025 10:11:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v6 50/73] target/arm: Implement GCSPUSHX Date: Fri, 3 Oct 2025 10:07:37 -0700 Message-ID: <20251003170800.997167-51-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251003170800.997167-1-richard.henderson@linaro.org> References: <20251003170800.997167-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.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, T_SPF_TEMPERROR=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 Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- target/arm/cpregs.h | 2 ++ target/arm/cpregs-gcs.c | 17 ++++++++++++++++ target/arm/tcg/translate-a64.c | 37 ++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index 81d8f0e32b..909916b7fd 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -50,6 +50,7 @@ enum { /* Special: gcs instructions */ ARM_CP_GCSPUSHM = 0x0008, ARM_CP_GCSPOPM = 0x0009, + ARM_CP_GCSPUSHX = 0x000a, /* Flag: reads produce resetvalue; writes ignored. */ ARM_CP_CONST = 1 << 4, @@ -875,6 +876,7 @@ typedef enum FGTBit { DO_BIT(HFGITR, CPPRCTX), DO_BIT(HFGITR, DCCVAC), DO_REV_BIT(HFGITR, NGCSPUSHM_EL1), + DO_REV_BIT(HFGITR, NGCSEPP), DO_BIT(HFGITR, ATS1E1A), } FGTBit; diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c index 15d383b2a4..e6c7025d02 100644 --- a/target/arm/cpregs-gcs.c +++ b/target/arm/cpregs-gcs.c @@ -53,6 +53,19 @@ static CPAccessResult access_gcspushm(CPUARMState *env, const ARMCPRegInfo *ri, return CP_ACCESS_OK; } +static CPAccessResult access_gcspushx(CPUARMState *env, const ARMCPRegInfo *ri, + bool isread) +{ + /* Trap if lock taken, and enabled. */ + if (!(env->pstate & PSTATE_EXLOCK)) { + int el = arm_current_el(env); + if (env->cp15.gcscr_el[el] & GCSCR_EXLOCKEN) { + return CP_ACCESS_EXLOCK; + } + } + return CP_ACCESS_OK; +} + static const ARMCPRegInfo gcs_reginfo[] = { { .name = "GCSCRE0_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 2, .crm = 5, .opc2 = 2, @@ -103,6 +116,10 @@ static const ARMCPRegInfo gcs_reginfo[] = { { .name = "GCSPOPM", .state = ARM_CP_STATE_AA64, .opc0 = 1, .opc1 = 3, .crn = 7, .crm = 7, .opc2 = 1, .access = PL0_R, .type = ARM_CP_GCSPOPM }, + { .name = "GCSPUSHX", .state = ARM_CP_STATE_AA64, + .opc0 = 1, .opc1 = 0, .crn = 7, .crm = 7, .opc2 = 4, + .access = PL1_W, .accessfn = access_gcspushx, .fgt = FGT_NGCSEPP, + .type = ARM_CP_GCSPUSHX }, }; void define_gcs_cpregs(ARMCPU *cpu) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 6e088d638a..c918e3acfc 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -2539,6 +2539,35 @@ static void gen_gcspopm(DisasContext *s, int rt) tcg_gen_mov_i64(cpu_reg(s, rt), value); } +static void gen_gcspushx(DisasContext *s) +{ + TCGv_i64 gcspr = cpu_gcspr[s->current_el]; + int spsr_idx = aarch64_banked_spsr_index(s->current_el); + int spsr_off = offsetof(CPUARMState, banked_spsr[spsr_idx]); + int elr_off = offsetof(CPUARMState, elr_el[s->current_el]); + int mmuidx = core_gcs_mem_index(s->mmu_idx); + MemOp mop = finalize_memop(s, MO_64 | MO_ALIGN); + TCGv_i64 addr = tcg_temp_new_i64(); + TCGv_i64 tmp = tcg_temp_new_i64(); + + tcg_gen_addi_i64(addr, gcspr, -8); + tcg_gen_qemu_st_i64(cpu_reg(s, 30), addr, mmuidx, mop); + + tcg_gen_ld_i64(tmp, tcg_env, spsr_off); + tcg_gen_addi_i64(addr, addr, -8); + tcg_gen_qemu_st_i64(tmp, addr, mmuidx, mop); + + tcg_gen_ld_i64(tmp, tcg_env, elr_off); + tcg_gen_addi_i64(addr, addr, -8); + tcg_gen_qemu_st_i64(tmp, addr, mmuidx, mop); + + tcg_gen_addi_i64(addr, addr, -8); + tcg_gen_qemu_st_i64(tcg_constant_i64(0b1001), addr, mmuidx, mop); + + tcg_gen_mov_i64(gcspr, addr); + clear_pstate_bits(PSTATE_EXLOCK); +} + /* * Look up @key, returning the cpreg, which must exist. * Additionally, the new cpreg must also be accessible. @@ -2856,6 +2885,14 @@ static void handle_sys(DisasContext *s, bool isread, gen_gcspopm(s, rt); } return; + case ARM_CP_GCSPUSHX: + /* Choose the CONSTRAINED UNPREDICTABLE for UNDEF. */ + if (rt != 31) { + unallocated_encoding(s); + } else if (s->gcs_en) { + gen_gcspushx(s); + } + return; default: g_assert_not_reached(); } -- 2.43.0