Received: by 2002:a17:504:6810:b0:1be9:327d:8ee3 with SMTP id f16csp930017njm; Wed, 5 Mar 2025 08:41:06 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVheNoOeq2i2lbY1ej8PYIvYLRst2HJdH6yHwPi+/4goUl0DHCuNYN+YvcKmA8gnwPm1Rut8qVe4ZTjXA==@linaro.org X-Google-Smtp-Source: AGHT+IGQVtAlohajDNTl/EOiRXBULA63dmPYnRNIHLAASfpSbsAEuZ3yzl7fskf2IYfvT2xKRZ5p X-Received: by 2002:a05:620a:4899:b0:7c3:c814:5943 with SMTP id af79cd13be357-7c3d8e1f77bmr611459785a.9.1741192865887; Wed, 05 Mar 2025 08:41:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741192865; cv=none; d=google.com; s=arc-20240605; b=VPxWxv7nTKtXijgbhMuEhYv+9gB8pZQvvXrLqfDY+nvdhYutR+ylPiW7BnUMZbfGdT For+iikgt7v7+k3Jz9DjGsDZtFBemVcLwueEqzDgXMrsronkTxoxyA9ETIa/dvcA2peG EcCnIQhntIvPYELyFJqOwEeCgEU9nLxHlj0TPyW5OdUYFcu5Q7e+I+UxyKesR5rxm7ec FFOStOOyEDP+su4mbR5LgDd5pyPb/iuOSdZtZMbyJY89hifu1fHiOS7YIMzFu1zXma7F bZrlmKJGLC5lOUsi3OMA0iTuP39oirLCBVwPkvgQpVgkmuWDUV5uDyMHNRNFxolIrR4h vt3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ySxbARIbk8Xen8gCejfXbkdbYRSQ9J1zU7rofHY9was=; fh=zInp4xe4IkcRrNM2aFMptin5JRRr9I02FEAKlsM82YU=; b=NNeK/1VFsJq/tXqceVuxq5dwln+bZiwMYaTRGqQBfs+qcNjfyF22A5lMQMXeB14SKT ZxH0brpoDArdMuwpbt6QiIu3blVTY6N7T5SlWr4Tsfgmd6oNoxHHGxXT6DQL74g3cxU2 r5rFBHb4YMT0/d+SG/tQxnG1FwzvqgqovoNfay6fbmdU6mHjHJyHg0agrQGAYnmmRoTz B0Da8FhkZkB+DAdw+7ETkONRFRU6x+VCGz4VcXgBEbKC6CbhxWAiqBrhXZnSQ5pp3jNo YE/oQkemG5JQ/GlVBRHq71raFluPG+4pjKqcDns3fYOVW3XbQdKNyoMlcq+aIguFYbxT QM1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fL+5evrQ; spf=pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=cohuck@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.129.124]) by mx.google.com with ESMTPS id af79cd13be357-7c36ff6bedbsi1279418785a.242.2025.03.05.08.41.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 08:41:05 -0800 (PST) Received-SPF: pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fL+5evrQ; spf=pass (google.com: domain of cohuck@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=cohuck@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741192865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ySxbARIbk8Xen8gCejfXbkdbYRSQ9J1zU7rofHY9was=; b=fL+5evrQUAoeDbo+DvDCtkwUum5gRXd307iHR+kmGcTaGSTNFPJb4Lg5fZGlEm6/17w35v oMES+xUCj/oUPNWUk2j4UudTiYxN0QZWEeIwAv7apg0zyV1ZNkr+ifahc4hZm+i2PbKZ42 2fM1wOgknBamPN6OAbwdkHoKK5F1eQc= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-663-t5oI2jTZN5iEndAuo43jxg-1; Wed, 05 Mar 2025 11:40:56 -0500 X-MC-Unique: t5oI2jTZN5iEndAuo43jxg-1 X-Mimecast-MFC-AGG-ID: t5oI2jTZN5iEndAuo43jxg_1741192854 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 31071180AB1D; Wed, 5 Mar 2025 16:40:54 +0000 (UTC) Received: from gondolin.redhat.com (unknown [10.67.24.9]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7223E1956095; Wed, 5 Mar 2025 16:40:38 +0000 (UTC) From: Cornelia Huck To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, kvmarm@lists.linux.dev, peter.maydell@linaro.org, richard.henderson@linaro.org, alex.bennee@linaro.org, maz@kernel.org, oliver.upton@linux.dev, sebott@redhat.com, shameerali.kolothum.thodi@huawei.com, armbru@redhat.com, berrange@redhat.com, abologna@redhat.com, jdenemar@redhat.com, agraf@csgraf.de Cc: shahuang@redhat.com, mark.rutland@arm.com, philmd@linaro.org, pbonzini@redhat.com, Cornelia Huck Subject: [PATCH v2 08/14] arm/cpu: Store aa64smfr0 into the idregs array Date: Wed, 5 Mar 2025 17:38:13 +0100 Message-ID: <20250305163819.2477553-9-cohuck@redhat.com> In-Reply-To: <20250305163819.2477553-1-cohuck@redhat.com> References: <20250305163819.2477553-1-cohuck@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-TUID: vLcqynlc2aE5 From: Eric Auger Signed-off-by: Eric Auger Signed-off-by: Cornelia Huck --- target/arm/cpu-features.h | 6 +++--- target/arm/cpu.h | 1 - target/arm/cpu64.c | 7 ++----- target/arm/helper.c | 2 +- target/arm/kvm.c | 3 +-- target/arm/tcg/cpu64.c | 4 ++-- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 7f6331ca437d..1ac1f3e95984 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -978,17 +978,17 @@ static inline bool isar_feature_aa64_sve_f64mm(const ARMISARegisters *id) static inline bool isar_feature_aa64_sme_f64f64(const ARMISARegisters *id) { - return FIELD_EX64(id->id_aa64smfr0, ID_AA64SMFR0, F64F64); + return FIELD_EX64_IDREG(id, ID_AA64SMFR0, F64F64); } static inline bool isar_feature_aa64_sme_i16i64(const ARMISARegisters *id) { - return FIELD_EX64(id->id_aa64smfr0, ID_AA64SMFR0, I16I64) == 0xf; + return FIELD_EX64_IDREG(id, ID_AA64SMFR0, I16I64) == 0xf; } static inline bool isar_feature_aa64_sme_fa64(const ARMISARegisters *id) { - return FIELD_EX64(id->id_aa64smfr0, ID_AA64SMFR0, FA64); + return FIELD_EX64_IDREG(id, ID_AA64SMFR0, FA64); } /* diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 04f19ce48cfe..b27522d8a139 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1097,7 +1097,6 @@ struct ArchCPU { uint32_t dbgdidr; uint32_t dbgdevid; uint32_t dbgdevid1; - uint64_t id_aa64smfr0; uint64_t reset_pmcr_el0; uint64_t idregs[NUM_ID_IDX]; } isar; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1d1657e127ef..e9668f82479e 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -306,7 +306,7 @@ void arm_cpu_sme_finalize(ARMCPU *cpu, Error **errp) if (vq_map == 0) { if (!cpu_isar_feature(aa64_sme, cpu)) { - cpu->isar.id_aa64smfr0 = 0; + SET_IDREG(&cpu->isar, ID_AA64SMFR0, 0); return; } @@ -359,11 +359,8 @@ static bool cpu_arm_get_sme_fa64(Object *obj, Error **errp) static void cpu_arm_set_sme_fa64(Object *obj, bool value, Error **errp) { ARMCPU *cpu = ARM_CPU(obj); - uint64_t t; - t = cpu->isar.id_aa64smfr0; - t = FIELD_DP64(t, ID_AA64SMFR0, FA64, value); - cpu->isar.id_aa64smfr0 = t; + FIELD_DP64_IDREG(&cpu->isar, ID_AA64SMFR0, FA64, value); } #ifdef CONFIG_USER_ONLY diff --git a/target/arm/helper.c b/target/arm/helper.c index 3a107044026c..66eda355794a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7725,7 +7725,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 4, .opc2 = 5, .access = PL1_R, .type = ARM_CP_CONST, .accessfn = access_aa64_tid3, - .resetvalue = cpu->isar.id_aa64smfr0 }, + .resetvalue = GET_IDREG(isar, ID_AA64SMFR0)}, { .name = "ID_AA64PFR6_EL1_RESERVED", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 4, .opc2 = 6, .access = PL1_R, .type = ARM_CP_CONST, diff --git a/target/arm/kvm.c b/target/arm/kvm.c index e0efdc97ce0b..22db87e11089 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -343,8 +343,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) err = 0; } else { err |= get_host_cpu_reg(fd, ahcf, ID_AA64PFR1_EL1_IDX); - err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64smfr0, - ARM64_SYS_REG(3, 0, 0, 4, 5)); + err |= get_host_cpu_reg(fd, ahcf, ID_AA64SMFR0_EL1_IDX); err |= get_host_cpu_reg(fd, ahcf, ID_AA64DFR0_EL1_IDX); err |= get_host_cpu_reg(fd, ahcf, ID_AA64DFR1_EL1_IDX); err |= get_host_cpu_reg(fd, ahcf, ID_AA64ISAR0_EL1_IDX); diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 41077b3dcd08..cadc1258fc40 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1268,7 +1268,7 @@ void aarch64_max_tcg_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64DFR0, HPMN0, 1); /* FEAT_HPMN0 */ SET_IDREG(isar, ID_AA64DFR0, t); - t = cpu->isar.id_aa64smfr0; + t = GET_IDREG(isar, ID_AA64SMFR0); t = FIELD_DP64(t, ID_AA64SMFR0, F32F32, 1); /* FEAT_SME */ t = FIELD_DP64(t, ID_AA64SMFR0, B16F32, 1); /* FEAT_SME */ t = FIELD_DP64(t, ID_AA64SMFR0, F16F32, 1); /* FEAT_SME */ @@ -1276,7 +1276,7 @@ void aarch64_max_tcg_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64SMFR0, F64F64, 1); /* FEAT_SME_F64F64 */ t = FIELD_DP64(t, ID_AA64SMFR0, I16I64, 0xf); /* FEAT_SME_I16I64 */ t = FIELD_DP64(t, ID_AA64SMFR0, FA64, 1); /* FEAT_SME_FA64 */ - cpu->isar.id_aa64smfr0 = t; + SET_IDREG(isar, ID_AA64SMFR0, t); /* Replicate the same data to the 32-bit id registers. */ aa32_max_features(cpu); -- 2.48.1