Received: by 2002:a17:504:6810:b0:1be9:327d:8ee3 with SMTP id f16csp928945njm; Wed, 5 Mar 2025 08:39:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVXvqI8KikaaM3PJ+s2PwtxwHocErpSLPyyDnm/FdfiHQe5ZecJFgHRsdZy6+/up7bi9EO7qKyZuEd6mQ==@linaro.org X-Google-Smtp-Source: AGHT+IF+EYG98nn039ZT0NVbxA8xqx5wt8i9AcAddfYhWPFPzZJXbBFQlA07EnoFOkfCixWCh2h2 X-Received: by 2002:a05:620a:4301:b0:7c3:ceeb:7d57 with SMTP id af79cd13be357-7c3d8e7bdcfmr511497985a.57.1741192751020; Wed, 05 Mar 2025 08:39:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741192751; cv=none; d=google.com; s=arc-20240605; b=IGL6k5SR74nWmTRrbpn+wHC1tJ69fHWM5E+oH+X0mDl2uTizXV9DX19NtRU/qXJSuJ /RTaFNJsLNaQGHg1z1NilWlfGHuBZSy6SeKiqGu/Tuo92foQDEW7M8Ce4CQp90VtSoJ3 EZUTv1b4kwJ9M7Cm09AR9mXedKf10tZw/yZJKjAn1AoVs1i5eADdT/faY7t3rf6D9t6B 9BGiPcP2sfeaIETVN9qw2/iE7nCmY+8SAGd6L1Wx4Y0jtFz0c2zp1iKZuXX6CUlLHpLg slEJP9AnaU5yvPNcACNNnIODYL0PEzb4BI8S0MIti6QPM0VEdZ0Y674ggStWmLmdxwi1 /vMA== 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=uUMQo/GFhIlPaJmbc9/NlgRu5qpMaVzUrYJkVynXBuE=; fh=zInp4xe4IkcRrNM2aFMptin5JRRr9I02FEAKlsM82YU=; b=ZrxVPphycfOryXYKWtsMFlDTibetrmCUs+go7gIFQaSRIFQjj+Hf6x+NMn5TRMVE3d JO3ndWrsjZV17zIlm5KVx1Ib2y/9VI06pZUsKiC2TCTk7hRRJYF8OkexxXcwmJeSMtMs oKyL70W5/2jzFWlb+EBYfb6HSu8vOgvTg1I0zLMM7qlomRftYuYXqXn3p5lVxc5uFdUn t23fVtFKFvHIkQvcV48nWcci8ix+teclmSlswW3c4WP0wnpSoiLI7ZALbPdI3e4Dw7AG pOAQWNpAzNGCCVeYrKYu0nzAE5BfgC/0h1y3n6Nn67SFYH6QSltEb8ijMQljR1CjS3rC Wt7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IzyKdBj3; 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-7c36fef6b0fsi1285670185a.186.2025.03.05.08.39.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 08:39:10 -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=IzyKdBj3; 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=1741192750; 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=uUMQo/GFhIlPaJmbc9/NlgRu5qpMaVzUrYJkVynXBuE=; b=IzyKdBj3BWuyvUd0hCFGmNuFpeq5Ogauxch6MBv0gIh2zGL/ZizvDeZlkiG0KMmuiTGqBf Sgaffn14McyvMFrxw7JThSEtTSK4osnR9uiMV/ITj1pG7em4hkg0KHYUR+Vli5WF5/OUiz e0PEqW5Xo6EcMiFc6CgYvNUl3GIC9N8= Received: from mx-prod-mc-06.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-331-cFv40QY9ORCkMCGynlov0A-1; Wed, 05 Mar 2025 11:39:01 -0500 X-MC-Unique: cFv40QY9ORCkMCGynlov0A-1 X-Mimecast-MFC-AGG-ID: cFv40QY9ORCkMCGynlov0A_1741192739 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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E3C0218001DB; Wed, 5 Mar 2025 16:38:58 +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 738131956095; Wed, 5 Mar 2025 16:38:42 +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 01/14] arm/cpu: Add sysreg definitions in cpu-sysregs.h Date: Wed, 5 Mar 2025 17:38:06 +0100 Message-ID: <20250305163819.2477553-2-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: gIeVJp39RGp9 From: Eric Auger This new header contains macros that define aarch64 registers. In a subsequent patch, this will be replaced by a more exhaustive version that will be generated from linux arch/arm64/tools/sysreg file. Those macros are sufficient to migrate the storage of those ID regs from named fields in isar struct to an array cell. [CH: reworked to use different structures] [CH: moved accessors from the patches first using them to here, dropped interaction with writable registers, which will happen later] Signed-off-by: Eric Auger Signed-off-by: Cornelia Huck --- target/arm/cpu-sysregs.h | 131 +++++++++++++++++++++++++++++++++++++++ target/arm/cpu.h | 49 +++++++++++++++ 2 files changed, 180 insertions(+) create mode 100644 target/arm/cpu-sysregs.h diff --git a/target/arm/cpu-sysregs.h b/target/arm/cpu-sysregs.h new file mode 100644 index 000000000000..de09ebae91a5 --- /dev/null +++ b/target/arm/cpu-sysregs.h @@ -0,0 +1,131 @@ +#ifndef ARM_CPU_SYSREGS_H +#define ARM_CPU_SYSREGS_H + +/* + * Following is similar to the coprocessor regs encodings, but with an argument + * ordering that matches the ARM ARM. We also reuse the various CP_REG_ defines + * that actually are the same as the equivalent KVM_REG_ values. + */ +#define ENCODE_ID_REG(op0, op1, crn, crm, op2) \ + (((op0) << CP_REG_ARM64_SYSREG_OP0_SHIFT) | \ + ((op1) << CP_REG_ARM64_SYSREG_OP1_SHIFT) | \ + ((crn) << CP_REG_ARM64_SYSREG_CRN_SHIFT) | \ + ((crm) << CP_REG_ARM64_SYSREG_CRM_SHIFT) | \ + ((op2) << CP_REG_ARM64_SYSREG_OP2_SHIFT)) + +typedef enum ARMIDRegisterIdx { + ID_AA64PFR0_EL1_IDX, + ID_AA64PFR1_EL1_IDX, + ID_AA64SMFR0_EL1_IDX, + ID_AA64DFR0_EL1_IDX, + ID_AA64DFR1_EL1_IDX, + ID_AA64ISAR0_EL1_IDX, + ID_AA64ISAR1_EL1_IDX, + ID_AA64ISAR2_EL1_IDX, + ID_AA64MMFR0_EL1_IDX, + ID_AA64MMFR1_EL1_IDX, + ID_AA64MMFR2_EL1_IDX, + ID_AA64MMFR3_EL1_IDX, + ID_PFR0_EL1_IDX, + ID_PFR1_EL1_IDX, + ID_DFR0_EL1_IDX, + ID_MMFR0_EL1_IDX, + ID_MMFR1_EL1_IDX, + ID_MMFR2_EL1_IDX, + ID_MMFR3_EL1_IDX, + ID_ISAR0_EL1_IDX, + ID_ISAR1_EL1_IDX, + ID_ISAR2_EL1_IDX, + ID_ISAR3_EL1_IDX, + ID_ISAR4_EL1_IDX, + ID_ISAR5_EL1_IDX, + ID_MMFR4_EL1_IDX, + ID_ISAR6_EL1_IDX, + MVFR0_EL1_IDX, + MVFR1_EL1_IDX, + MVFR2_EL1_IDX, + ID_PFR2_EL1_IDX, + ID_DFR1_EL1_IDX, + ID_MMFR5_EL1_IDX, + ID_AA64ZFR0_EL1_IDX, + CTR_EL0_IDX, + NUM_ID_IDX, +} ARMIDRegisterIdx; + +typedef enum ARMSysRegs { + SYS_ID_AA64PFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 4, 0), + SYS_ID_AA64PFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 4, 1), + SYS_ID_AA64SMFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 4, 5), + SYS_ID_AA64DFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 5, 0), + SYS_ID_AA64DFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 5, 1), + SYS_ID_AA64ISAR0_EL1 = ENCODE_ID_REG(3, 0, 0, 6, 0), + SYS_ID_AA64ISAR1_EL1 = ENCODE_ID_REG(3, 0, 0, 6, 1), + SYS_ID_AA64ISAR2_EL1 = ENCODE_ID_REG(3, 0, 0, 6, 2), + SYS_ID_AA64MMFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 7, 0), + SYS_ID_AA64MMFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 7, 1), + SYS_ID_AA64MMFR2_EL1 = ENCODE_ID_REG(3, 0, 0, 7, 2), + SYS_ID_AA64MMFR3_EL1 = ENCODE_ID_REG(3, 0, 0, 7, 3), + SYS_ID_PFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 0), + SYS_ID_PFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 1), + SYS_ID_DFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 2), + SYS_ID_MMFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 4), + SYS_ID_MMFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 5), + SYS_ID_MMFR2_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 6), + SYS_ID_MMFR3_EL1 = ENCODE_ID_REG(3, 0, 0, 1, 7), + SYS_ID_ISAR0_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 0), + SYS_ID_ISAR1_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 1), + SYS_ID_ISAR2_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 2), + SYS_ID_ISAR3_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 3), + SYS_ID_ISAR4_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 4), + SYS_ID_ISAR5_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 5), + SYS_ID_MMFR4_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 6), + SYS_ID_ISAR6_EL1 = ENCODE_ID_REG(3, 0, 0, 2, 7), + SYS_MVFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 0), + SYS_MVFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 1), + SYS_MVFR2_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 2), + SYS_ID_PFR2_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 4), + SYS_ID_DFR1_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 5), + SYS_ID_MMFR5_EL1 = ENCODE_ID_REG(3, 0, 0, 3, 6), + SYS_ID_AA64ZFR0_EL1 = ENCODE_ID_REG(3, 0, 0, 4, 4), + SYS_CTR_EL0 = ENCODE_ID_REG(3, 3, 0, 0, 1), +} ARMSysRegs; + +static const uint32_t id_register_sysreg[NUM_ID_IDX] = { + [ID_AA64PFR0_EL1_IDX] = SYS_ID_AA64PFR0_EL1, + [ID_AA64PFR1_EL1_IDX] = SYS_ID_AA64PFR1_EL1, + [ID_AA64SMFR0_EL1_IDX] = SYS_ID_AA64SMFR0_EL1, + [ID_AA64DFR0_EL1_IDX] = SYS_ID_AA64DFR0_EL1, + [ID_AA64DFR1_EL1_IDX] = SYS_ID_AA64DFR1_EL1, + [ID_AA64ISAR0_EL1_IDX] = SYS_ID_AA64ISAR0_EL1, + [ID_AA64ISAR1_EL1_IDX] = SYS_ID_AA64ISAR1_EL1, + [ID_AA64ISAR2_EL1_IDX] = SYS_ID_AA64ISAR2_EL1, + [ID_AA64MMFR0_EL1_IDX] = SYS_ID_AA64MMFR0_EL1, + [ID_AA64MMFR1_EL1_IDX] = SYS_ID_AA64MMFR1_EL1, + [ID_AA64MMFR2_EL1_IDX] = SYS_ID_AA64MMFR2_EL1, + [ID_AA64MMFR3_EL1_IDX] = SYS_ID_AA64MMFR3_EL1, + [ID_PFR0_EL1_IDX] = SYS_ID_PFR0_EL1, + [ID_PFR1_EL1_IDX] = SYS_ID_PFR1_EL1, + [ID_DFR0_EL1_IDX] = SYS_ID_DFR0_EL1, + [ID_MMFR0_EL1_IDX] = SYS_ID_MMFR0_EL1, + [ID_MMFR1_EL1_IDX] = SYS_ID_MMFR1_EL1, + [ID_MMFR2_EL1_IDX] = SYS_ID_MMFR2_EL1, + [ID_MMFR3_EL1_IDX] = SYS_ID_MMFR3_EL1, + [ID_ISAR0_EL1_IDX] = SYS_ID_ISAR0_EL1, + [ID_ISAR1_EL1_IDX] = SYS_ID_ISAR1_EL1, + [ID_ISAR2_EL1_IDX] = SYS_ID_ISAR2_EL1, + [ID_ISAR3_EL1_IDX] = SYS_ID_ISAR3_EL1, + [ID_ISAR4_EL1_IDX] = SYS_ID_ISAR4_EL1, + [ID_ISAR5_EL1_IDX] = SYS_ID_ISAR5_EL1, + [ID_MMFR4_EL1_IDX] = SYS_ID_MMFR4_EL1, + [ID_ISAR6_EL1_IDX] = SYS_ID_ISAR6_EL1, + [MVFR0_EL1_IDX] = SYS_MVFR0_EL1, + [MVFR1_EL1_IDX] = SYS_MVFR1_EL1, + [MVFR2_EL1_IDX] = SYS_MVFR2_EL1, + [ID_PFR2_EL1_IDX] = SYS_ID_PFR2_EL1, + [ID_DFR1_EL1_IDX] = SYS_ID_DFR1_EL1, + [ID_MMFR5_EL1_IDX] = SYS_ID_MMFR5_EL1, + [ID_AA64ZFR0_EL1_IDX] = SYS_ID_AA64ZFR0_EL1, + [CTR_EL0_IDX] = SYS_CTR_EL0, +}; + +#endif /* ARM_CPU_SYSREGS_H */ diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 215845c7e256..60335f8893fa 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -30,6 +30,7 @@ #include "qapi/qapi-types-common.h" #include "target/arm/multiprocessing.h" #include "target/arm/gtimer.h" +#include "target/arm/cpu-sysregs.h" #ifdef TARGET_AARCH64 #define KVM_HAVE_MCE_INJECTION 1 @@ -855,6 +856,53 @@ typedef struct { uint32_t map, init, supported; } ARMVQMap; +/* REG is ID_XXX */ +#define FIELD_DP64_IDREG(ISAR, REG, FIELD, VALUE) \ + ({ \ + ARMISARegisters *i_ = (ISAR); \ + uint64_t regval = i_->idregs[REG ## _EL1_IDX]; \ + regval = FIELD_DP64(regval, REG, FIELD, VALUE); \ + i_->idregs[REG ## _EL1_IDX] = regval; \ + }) + +#define FIELD_DP32_IDREG(ISAR, REG, FIELD, VALUE) \ + ({ \ + ARMISARegisters *i_ = (ISAR); \ + uint64_t regval = i_->idregs[REG ## _EL1_IDX]; \ + regval = FIELD_DP32(regval, REG, FIELD, VALUE); \ + i_->idregs[REG ## _EL1_IDX] = regval; \ + }) + +#define FIELD_EX64_IDREG(ISAR, REG, FIELD) \ + ({ \ + const ARMISARegisters *i_ = (ISAR); \ + FIELD_EX64(i_->idregs[REG ## _EL1_IDX], REG, FIELD); \ + }) + +#define FIELD_EX32_IDREG(ISAR, REG, FIELD) \ + ({ \ + const ARMISARegisters *i_ = (ISAR); \ + FIELD_EX32(i_->idregs[REG ## _EL1_IDX], REG, FIELD); \ + }) + +#define FIELD_SEX64_IDREG(ISAR, REG, FIELD) \ + ({ \ + const ARMISARegisters *i_ = (ISAR); \ + FIELD_SEX64(i_->idregs[REG ## _EL1_IDX], REG, FIELD); \ + }) + +#define SET_IDREG(ISAR, REG, VALUE) \ + ({ \ + ARMISARegisters *i_ = (ISAR); \ + i_->idregs[REG ## _EL1_IDX] = VALUE; \ + }) + +#define GET_IDREG(ISAR, REG) \ + ({ \ + const ARMISARegisters *i_ = (ISAR); \ + i_->idregs[REG ## _EL1_IDX]; \ + }) + /** * ARMCPU: * @env: #CPUARMState @@ -1063,6 +1111,7 @@ struct ArchCPU { uint64_t id_aa64zfr0; uint64_t id_aa64smfr0; uint64_t reset_pmcr_el0; + uint64_t idregs[NUM_ID_IDX]; } isar; uint64_t midr; uint32_t revidr; -- 2.48.1