From nobody Fri Nov 14 20:46:02 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=1760101770; cv=none; d=zohomail.com; s=zohoarc; b=X+vsngpQEnNQAxmvkBMGuzENOnm41txwkDS5nEz734I+xQPVFlA5m9wWix1BX8FwCi1lGvpyr4j6XH9Yn11L8+91HgowxhcM5FtwgU0F8qJgzcgqy7N02GgvYR53XD5kcHd4FOahOyak56k8izYelt7BzaMm+1r+VJsatyRzyQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760101770; h=Content-Transfer-Encoding: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:Cc; bh=DIQMuibNNz2umv8aVbc23A1gLvp13ZKOlMOT1YNAnOM=; b=TQ6+/zvmIEA1hlrQGA4gGdQaERwf1UiBIYn/Ul+Efrr+XQiV2ev1Y/ZrrZeMXo3sWUoK2e429f7UaHhWAsFUCeWRowaTXCvDVnWGi1/PSSITpJiTt/xmdUHoGz07fTfcuOYJJB3SzIdga8V/4MlVzETSglQ4MOl62LonBHcfCRg= 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 1760101770981305.1535616331005; Fri, 10 Oct 2025 06:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7CqJ-0007E4-U6; Fri, 10 Oct 2025 09:07:31 -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 1v7CqB-000729-QE for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:07:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v7CpN-0003yR-2f for qemu-devel@nongnu.org; Fri, 10 Oct 2025 09:07:23 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-42420c7de22so960447f8f.1 for ; Fri, 10 Oct 2025 06:06:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-426ce583316sm4221657f8f.20.2025.10.10.06.06.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Oct 2025 06:06:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1760101584; x=1760706384; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=DIQMuibNNz2umv8aVbc23A1gLvp13ZKOlMOT1YNAnOM=; b=FCAP6xfLwW5noTwWb1qJC1u85N3FtxPytUz6Kii3KEZk0f5OrnM1wD7JUlTCjZFdqx arybvnPoZMLq/Kpo+5LRfXIrS63FFbL5MSU6q1EWhIe7lfGtM5GmLS+2Qx5ImmvHTVmH S93PN6GMqWlvQCzwSQQsBhofctiatUzHCVCOUEVMYfbSuMhPlYTXRRFRNImQi43YWSnr FD/duiITplH6eZDOuryv6quKtsS01AS/5GwlOZOUG3r3xoivmpezgZKKAHWgnKPQn3ZK R81fLL3InZ7NjQXG2v/eOH92s+SgmeUqSvpIk3nHLjZAX+wlDHQppU/ZtmAMHhG7HRuY oydg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760101584; x=1760706384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DIQMuibNNz2umv8aVbc23A1gLvp13ZKOlMOT1YNAnOM=; b=b2LGHt47JLUa7hNheIzAhMFMhX5JF7TkMGDyWQ9h0kkXaNfJCOzBVZQd7IQmB+y/oE UvOEOmngV8K5OKcfvQ4SGPvoVTnKayfmATRW3omg8JMWPog0EsqRag/F+7fmLRM+T3PW d/q/aU/qZreo/fGEmzyZ44bwWZs9EcqfanTUkeNgrEo0mFfyJl3lG2UrOdYwzGhiWPSN C4H31tl/VcHhBhhIbb57KZneNgR02YpR2f0p8VwmdrEefGg/y04xRXeW2okbf3uqxqFR Wkj2mkmMhcRSSXPrW3LyZ9aMq+pRAgl0/vIJV17ubQP5S6xQiPblqxI5T1W4W05RH5CO Unbw== X-Gm-Message-State: AOJu0YxG2bDLdC9+5gVULwwutugx9TvqtwsvquVTe57l7ORBkR0A8Ylz 0aylgRV0AhG9G4G/0Ec0Huajs9czHhTn4uWuUWNBjg43upQQ+F3YbGWn5Cu2T619LVVmsINbu56 WQ67F X-Gm-Gg: ASbGnctEfowFpw0+NEatS1fo9PM53ZURZh+Z3uiPeggH12eRifevtUp4jDwQp8fgEuH 8kH3aqyN1Z+5A6vUSW5S+ZiV4n+nkPzEjwy0RprIMXujFCAZhllUkYlVop/AJCcsRzzvqrMyxi4 SCy6srBYwOfkF/Kh6eQVpoGux4bwSnJ+eFYODEoLu58Ib9EuwQ0Cy5WSjtg3qu9bR3JCWh6D4S6 LMV/P/pXbhRUR96TOrXnCCcU9lpgdpBJoaNTL506qucBwiHSCfhEWFwP+jflxB74W8qR+RkHSCP IKuqrFMC17D4o7KrhhMt9shCwDl9XkrDLA2pTv5oIZxX3oQL7hC5H4earXmOLoJuGwImXBx5kip E5tb3ew+LJvNFWkoaZUrCfVoZTOCiQ7Xh3f3+JiE1ZpbA55DQHKBBsdWvVPu9tg== X-Google-Smtp-Source: AGHT+IHqf06bEvvGVQBVg5wVFndAb8XBdlyHJMHioeq1NgQ+wUCAVQ9I3s9HD/ip4gwDeuIxZk+6gQ== X-Received: by 2002:a05:6000:2301:b0:425:72cd:8364 with SMTP id ffacd0b85a97d-4266e8e1afamr7831486f8f.53.1760101584290; Fri, 10 Oct 2025 06:06:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 48/76] target/arm: Implement GCSPUSHM Date: Fri, 10 Oct 2025 14:04:59 +0100 Message-ID: <20251010130527.3921602-49-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251010130527.3921602-1-peter.maydell@linaro.org> References: <20251010130527.3921602-1-peter.maydell@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=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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: 1760101771953154100 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20251008215613.300150-49-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpregs.h | 3 +++ target/arm/cpregs-gcs.c | 15 +++++++++++++++ target/arm/tcg/translate-a64.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index a79f00351c8..d22ae383cdb 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -47,6 +47,8 @@ enum { ARM_CP_DC_ZVA =3D 0x0005, ARM_CP_DC_GVA =3D 0x0006, ARM_CP_DC_GZVA =3D 0x0007, + /* Special: gcs instructions */ + ARM_CP_GCSPUSHM =3D 0x0008, =20 /* Flag: reads produce resetvalue; writes ignored. */ ARM_CP_CONST =3D 1 << 4, @@ -871,6 +873,7 @@ typedef enum FGTBit { DO_BIT(HFGITR, DVPRCTX), DO_BIT(HFGITR, CPPRCTX), DO_BIT(HFGITR, DCCVAC), + DO_REV_BIT(HFGITR, NGCSPUSHM_EL1), DO_BIT(HFGITR, ATS1E1A), } FGTBit; =20 diff --git a/target/arm/cpregs-gcs.c b/target/arm/cpregs-gcs.c index 1ff041811d2..cc5a0b86e4b 100644 --- a/target/arm/cpregs-gcs.c +++ b/target/arm/cpregs-gcs.c @@ -43,6 +43,16 @@ static void gcspr_write(CPUARMState *env, const ARMCPReg= Info *ri, raw_write(env, ri, value & ~7); } =20 +static CPAccessResult access_gcspushm(CPUARMState *env, const ARMCPRegInfo= *ri, + bool isread) +{ + int el =3D arm_current_el(env); + if (!(env->cp15.gcscr_el[el] & GCSCR_PUSHMEN)) { + return CP_ACCESS_TRAP_BIT | (el ? el : 1); + } + return CP_ACCESS_OK; +} + static const ARMCPRegInfo gcs_reginfo[] =3D { { .name =3D "GCSCRE0_EL1", .state =3D ARM_CP_STATE_AA64, .opc0 =3D 3, .opc1 =3D 0, .crn =3D 2, .crm =3D 5, .opc2 =3D 2, @@ -85,6 +95,11 @@ static const ARMCPRegInfo gcs_reginfo[] =3D { .opc0 =3D 3, .opc1 =3D 6, .crn =3D 2, .crm =3D 5, .opc2 =3D 1, .access =3D PL3_RW, .writefn =3D gcspr_write, .fieldoffset =3D offsetof(CPUARMState, cp15.gcspr_el[2]) }, + + { .name =3D "GCSPUSHM", .state =3D ARM_CP_STATE_AA64, + .opc0 =3D 1, .opc1 =3D 3, .crn =3D 7, .crm =3D 7, .opc2 =3D 0, + .access =3D PL0_W, .accessfn =3D access_gcspushm, + .fgt =3D FGT_NGCSPUSHM_EL1, .type =3D ARM_CP_GCSPUSHM }, }; =20 void define_gcs_cpregs(ARMCPU *cpu) diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c index 38a1f51ed5e..625563d95be 100644 --- a/target/arm/tcg/translate-a64.c +++ b/target/arm/tcg/translate-a64.c @@ -26,6 +26,7 @@ #include "cpregs.h" =20 static TCGv_i64 cpu_X[32]; +static TCGv_i64 cpu_gcspr[4]; static TCGv_i64 cpu_pc; =20 /* Load/store exclusive handling */ @@ -77,6 +78,10 @@ static int scale_by_log2_tag_granule(DisasContext *s, in= t x) /* initialize TCG globals. */ void a64_translate_init(void) { + static const char gcspr_names[4][12] =3D { + "gcspr_el0", "gcspr_el1", "gcspr_el2", "gcspr_el3" + }; + int i; =20 cpu_pc =3D tcg_global_mem_new_i64(tcg_env, @@ -90,6 +95,13 @@ void a64_translate_init(void) =20 cpu_exclusive_high =3D tcg_global_mem_new_i64(tcg_env, offsetof(CPUARMState, exclusive_high), "exclusive_high"); + + for (i =3D 0; i < 4; i++) { + cpu_gcspr[i] =3D + tcg_global_mem_new_i64(tcg_env, + offsetof(CPUARMState, cp15.gcspr_el[i]), + gcspr_names[i]); + } } =20 /* @@ -420,6 +432,18 @@ static MemOp check_ordered_align(DisasContext *s, int = rn, int imm, return finalize_memop(s, mop); } =20 +static void gen_add_gcs_record(DisasContext *s, TCGv_i64 value) +{ + TCGv_i64 addr =3D tcg_temp_new_i64(); + TCGv_i64 gcspr =3D cpu_gcspr[s->current_el]; + int mmuidx =3D core_gcs_mem_index(s->mmu_idx); + MemOp mop =3D finalize_memop(s, MO_64 | MO_ALIGN); + + tcg_gen_addi_i64(addr, gcspr, -8); + tcg_gen_qemu_st_i64(value, clean_data_tbi(s, addr), mmuidx, mop); + tcg_gen_mov_i64(gcspr, addr); +} + typedef struct DisasCompare64 { TCGCond cond; TCGv_i64 value; @@ -2803,6 +2827,11 @@ static void handle_sys(DisasContext *s, bool isread, } } return; + case ARM_CP_GCSPUSHM: + if (s->gcs_en) { + gen_add_gcs_record(s, cpu_reg(s, rt)); + } + return; default: g_assert_not_reached(); } --=20 2.43.0