kvm/arm: Introduce a customizable aarch64 KVM host model
Subsystems (2)
v6 cover kvm/arm: Introduce a customizable aarch64 KVM host model
This series enhances the current host KVM model with capability to set writable ID reg fields.
Since v6.7 kernel, KVM/arm allows the userspace to overwrite the values of a subset of ID regs. The list of writable fields continues to grow. The feature ID range is defined as the AArch64 System register space with op0==3, op1=={0, 1, 3}, CRn==0, CRm=={0-7}, op2=={0-7}.
The end goal is to get more flexibility when migrating guests between different host hardware.
QEMU retrieves the writable ID fields from KVM UAPI [1] and match them against a generated description of ID regs and their named fields that stem from AARCHMRS Registers.json file. Current description is based on latest 2026-03 edition. The content of the generated files was compared against kernel linux/arch/arm64/tools/sysreg file. It is not straightforward to have unit tests for python scripts as there are many cases for field extraction.
For each writable named field a uint64 property is created following the "SYSREG_<REG>_<FIELD>" naming convention. REG and FIELD names are those described in ARM ARM Reference manual.
The list of SYSREG_ID properties can be retrieved through the qmp monitor using query-cpu-model-expansion [2].
For the record, Jinqian was able to migrate between Hisilicon KunPeng HIP09 and HIP12 chips with this series using this kind of command:
-cpu host,pauth=off,pmu=off,sve=off,\
SYSREG_ID_AA64PFR1_EL1_NMI=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LS64=0x0,\
SYSREG_ID_AA64ISAR1_EL1_XS=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LRCPC=0x2,\
SYSREG_ID_AA64ISAR2_EL1_RPRFM=0x0,\
SYSREG_ID_AA64ISAR2_EL1_CLRBHB=0x0,\
SYSREG_ID_AA64ISAR2_EL1_PAC_frac=0x0,\
SYSREG_ID_AA64ISAR2_EL1_BC=0x0,\
SYSREG_ID_AA64ISAR2_EL1_RPRES=0x0,\
SYSREG_ID_AA64ISAR2_EL1_WFxT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_FGT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_BigEnd=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ECBHB=0x0,\
SYSREG_ID_AA64MMFR1_EL1_CMOW=0x0,\
SYSREG_ID_AA64MMFR1_EL1_TIDCP1=0x0,\
SYSREG_ID_AA64MMFR1_EL1_nTLBPA=0x0,\
SYSREG_ID_AA64MMFR1_EL1_AFP=0x0,\
SYSREG_ID_AA64MMFR1_EL1_HCX=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ETS=0x0,\
SYSREG_ID_AA64MMFR1_EL1_PAN=0x2,\
SYSREG_ID_AA64MMFR1_EL1_HAFDBS=0x2,\
SYSREG_ID_AA64MMFR2_EL1_CnP=0x0,\
SYSREG_ID_AA64MMFR3_EL1_TCRX=0x0,\
SYSREG_ID_AA64DFR0_EL1_PMUVer=0x6,\
SYSREG_ID_AA64DFR0_EL1_DebugVer=0x9,\
SYSREG_ID_AA64DFR0_EL1_DoubleLock=0xf,\
SYSREG_ID_AA64ZFR0_EL1_F64MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_F32MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SM4=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SHA3=0x0,\
SYSREG_ID_AA64ZFR0_EL1_BitPerm=0x0,\
SYSREG_ID_AA64ZFR0_EL1_AES=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SVEver=0x0,\
SYSREG_CTR_EL0_L1Ip=0x2 \
Connie & Eric
This series can be found at:
https://github.com/eauger/qemu/tree/arm-cpu-model-v6
History:
--------
v5 -> v6:
v6 is mostly for Khushit to see how he may work on top of this series. It fulfills some of his requirements:
- Upon Khushit request I added description for enum values and reserved fields
- set_sysreg_prop checks the input value against enum values if any
- writable_bitmap is now dispatched into the sysreg descripton and not stored in vcpu state anymore (besides it is VM wide)
- implemented write for qmp inspection. However this is not yet checked against KVM. That's the next step I think, ie. instantiate a scratch vcpu to test if the field value can be applied?
- if some inconsistencies between writable mask and idreg field, reserved fields only produce traces
- simplify checks related to availability of writable map
- this version does not yet fix some reported issues about host supporting nested virt. I will further sync with Khushit. so this is definitively not candidate to be applied, hence the RFC tag.
v4 -> v5:
- generate target/arm/cpu-idregs.h.inc that look similar to the format used in [RFC PATCH v1 02/13] target/arm:
named_cpu_model: Add ID Register Fields without the description of the value values nor safe policy/value. I guess valid values could be generated from the Registers.json file too. Safe policy/values cannot.
I reused one patch from the above series.
Let's see how both series can progress/coexist without any anticipated bias.
- Addressed all comments from Shameer on v4
- Addressed 2 comments from v4 that were missed including the issue of IDreg visibility affected by some other settings. Unfortunately I was not able to test it.
- Further look at overrides between low level id reg field properties versus legacy CPU options. I have the feeling they can coexist as long as we document the hierarchy between them:
host kvm default -> ID reg field props -> legacy CPU options
- Noticed more writable fields that are RES0/RAZ
- Improved commit messages in general
References:
-----------
[1]KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGESKVM_ARM_GET_REG_WRITABLE_MASKSDocumentation/virt/kvm/api.rst
[2]
qemu-system-aarch64 -qmp unix:/home/augere/TEST/QEMU/qmp-sock,server,nowait -M virt --enable-kvm -cpu host sudo build/run qmp-shell /home/augere/TEST/QEMU/qmp-sock
Welcome to the QMP low-level shell!
Connected to QEMU 11.0.50
(QEMU) query-cpu-model-expansion type=full model={"name":"host"}
Cornelia Huck (3):
target/arm/kvm: Retrieve writable ID reg map
arm-qmp-cmds: introspection for ID register props arm/cpu-features: document ID reg properties
Eric Auger (13):
scripts: introduce scripts/update-aarch64-cpu-sysregs-header.py target/arm/cpu-sysregs.h.inc: Sort by name alphabetical order target/arm/cpu-sysregs.h.inc: Update with automatic generation arm/cpu: Add infra to handle generated ID register definitions
scripts: Introduce scripts/aarch64_sysreg_helpers module
scripts: Introduce scripts/update-aarch64-cpu-sysreg-properties.py target/arm/cpu-idregs.h.inc: generate with script target/arm/cpu-idregs.h.inc: Generate enum values arm/kvm: Initialize all writable ID registers from host target/arm/kvm: Introduce kvm_arm_expose_idreg_properties target/arm/cpu: Expose writable ID reg field properties on the kvm
host vcpu model
target/arm/cpu-idregs.h.inc: Generate reserved fields target/arm/kvm: Ignore and trace unexpected writable reserved fields
Shaju Abraham (1):
target/arm/cpu_idregs: generate tables for Arm64 ID registers and
fields
docs/system/arm/cpu-features.rst | 106 +- target/arm/cpu-idregs.h | 41 + target/arm/kvm_arm.h | 10 + target/arm/cpu-idregs.h.inc | 2164 +++++++++++++++++ target/arm/cpu-sysregs.h.inc | 57 +- target/arm/arm-qmp-cmds.c | 29 + target/arm/cpu-idregs.c | 96 + target/arm/cpu64.c | 5 + target/arm/kvm.c | 311 ++- scripts/aarch64_sysreg_helpers.py | 109 + .../update-aarch64-cpu-sysreg-properties.py | 290 +++ scripts/update-aarch64-cpu-sysregs-header.py | 51 + target/arm/meson.build | 1 + target/arm/trace-events | 7 + 14 files changed, 3244 insertions(+), 33 deletions(-) create mode 100644 target/arm/cpu-idregs.h create mode 100644 target/arm/cpu-idregs.h.inc create mode 100644 target/arm/cpu-idregs.c create mode 100644 scripts/aarch64_sysreg_helpers.py create mode 100644 scripts/update-aarch64-cpu-sysreg-properties.py create mode 100755 scripts/update-aarch64-cpu-sysregs-header.py
Signature · 1 line
2.53.0
RFC PATCH v6 1/17 scripts: introduce scripts/update-aarch64-cpu-sysregs-header.py
Introduce a script that takes as input the Registers.json file delivered in the AARCHMRS Features Model downloadable from the Arm Developer A-Profile Architecture Exploration Tools page:
https://developer.arm.com/Architectures/A-Profile%20Architecture#Downloads
and outputs the list of ID regs in target/arm/cpu-sysregs.h.inc under the form of DEF(<name>, <op0>, <op1>, <crn>, <crm>, <op2>).
We only care about IDregs with opcodes satisfying:
op0 = 3, op1 = {0,1,3}, crn = 0, crm within [0, 7], op2 within [0, 7]
Message-ID: <[email protected]>
--- scripts/update-aarch64-cpu-sysregs-header.py | 134 +++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100755 scripts/update-aarch64-cpu-sysregs-header.py
scripts/update-aarch64-cpu-sysregs-header.py new file +134 -0
@@ -0,0 +1,134 @@ +#!/usr/bin/env python3 + +# This script takes as input the Registers.json file delivered in +# the AARCHMRS Features Model downloadable from the Arm Developer +# A-Profile Architecture Exploration Tools page: +# https://developer.arm.com/Architectures/A-Profile%20Architecture#Downloads +# and outputs the list of ID regs in target/arm/cpu-sysregs.h.inc +# under the form of DEF(<name>, <op0>, <op1>, <crn>, <crm>, <op2>) +# +# Copyright (C) 2026 Red Hat, Inc. +# +# Authors: Eric Auger <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0-or-later + + +import json +import os +import sys + +# Some regs have op code values like 000x, 001x. Anyway we don't need +# them. Besides some regs are undesired in the generated file such as +# VMPIDR_EL2 and VPIDR_EL2 which are outside of the IDreg scope we +# are interested in and are tricky to decode as their system accessor +# refer to MPIDR_EL1/MIDR_EL1 respectively + +skiplist = ['ALLINT', 'PM', 'S1_', 'S3_', 'SVCR', \ + 'VMPIDR_EL2', 'VPIDR_EL2'] + +# returns the int value of a given @opcode for a reg @encoding +def get_opcode(encoding, opcode): + fvalue = encoding.get(opcode) + if fvalue: + value = fvalue.get('value') + if isinstance(value, str): + value = value.strip("'") + value = int(value, 2) + return value + return -1 + +def extract_idregs_from_registers_json(filename): + """ + Load a Registers.json file and extract all ID registers, decode their + opcode and dump the information in target/arm/cpu-sysregs.h.inc + + Args: + filename (str): The path to the Registers.json + returns: + idregs: list of ID regs and their encoding + """ + if not os.path.exists(filename): + print(f"Error: {filename} could not be found!") + return {} + + try: + with open(filename, 'r') as f: + register_data = json.load(f) + + except json.JSONDecodeError: + print(f"Could not decode json from '{filename}'!") + return {} + except Exception as e: + print(f"Unexpected error while reading {filename}: {e}") + return {} + + registers = [r for r in register_data if isinstance(r, dict) and \ + r.get('_type') == 'Register'] + + idregs = {} + + for register in registers: + reg_name = register.get('name') + + is_skipped = any(term in (reg_name or "").upper() for term in skiplist) + + if reg_name and not is_skipped: + accessors = register.get('accessors', []) + + for accessor in accessors: + type = accessor.get('_type') + if type in ['Accessors.SystemAccessor']: + encoding_list = accessor.get('encoding') + + if isinstance(encoding_list, list) and encoding_list and \ + isinstance(encoding_list[0], dict): + encoding_wrapper = encoding_list[0] + encoding_source = encoding_wrapper.get('encodings', \ + encoding_wrapper) + + if isinstance(encoding_source, dict): + op0 = get_opcode(encoding_source, 'op0') + op1 = get_opcode(encoding_source, 'op1') + op2 = get_opcode(encoding_source, 'op2') + crn = get_opcode(encoding_source, 'CRn') + crm = get_opcode(encoding_source, 'CRm') + encoding_str=f"{op0} {op1} {crn} {crm} {op2}" + + # ID regs are assumed within this scope + if op0 == 3 and (op1 == 0 or op1 == 1 or op1 == 3) and \ + crn == 0 and (crm >= 0 and crm <= 7) and (op2 >= 0 and op2 <= 7): + idregs[reg_name] = encoding_str + + return idregs + +if __name__ == "__main__": + # Single arg expected: the path to the Registers.json file + if len(sys.argv) < 2: + print("Usage: python scripts/update-aarch64-cpu-sysregs-header.py " + "<path_to_registers_json>") + sys.exit(1) + else: + json_file_path = sys.argv[1] + + extracted_registers = extract_idregs_from_registers_json(json_file_path) + + if extracted_registers: + output_list = extracted_registers.items() + + # Sort by register name + sorted_output = sorted(output_list, key=lambda item: item[0]) + + # format lines as DEF(<name>, <op0>, <op1>, <crn>, <crm>, <op2>) + final_output = "" + for reg_name, encoding in sorted_output: + reformatted_encoding = encoding.replace(" ", ", ") + final_output += f"DEF({reg_name}, {reformatted_encoding})\n" + + with open("target/arm/cpu-sysregs.h.inc", 'w') as f: + f.write("/* SPDX-License-Identifier: GPL-2.0-or-later */\n\n") + f.write("/* This file is autogenerated by ") + f.write("scripts/update-aarch64-cpu-sysregs-header.py */\n") + f.write("/* DEF(<name>, <op0>, <op1>, <crn>, <crm>, <op2>) */\n\n") + f.write(final_output) + print("updated target/arm/cpu-sysregs.h.inc")
Signature · 1 line
2.53.0
RFC PATCH v6 2/17 target/arm/cpu-sysregs.h.inc: Sort by name alphabetical order
In reply to Eric AugerSort by register name alphabetical order. This will allow to easily diff with the future content, automatically generated.
No functional change intended.
---
v5 -> v6:
- v5 version conflicted because ID_AA64FPFR0_EL1 has been added
v4 -> v5:
- remove spurious CCSIDR definition
--- target/arm/cpu-sysregs.h.inc | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-)
target/arm/cpu-sysregs.h.inc +22 -22
@@ -1,13 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ -DEF(ID_AA64PFR0_EL1, 3, 0, 0, 4, 0) -DEF(ID_AA64PFR1_EL1, 3, 0, 0, 4, 1) -DEF(ID_AA64PFR2_EL1, 3, 0, 0, 4, 2) -DEF(ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) -DEF(ID_AA64FPFR0_EL1, 3, 0, 0, 4, 7) -DEF(ID_AA64DFR0_EL1, 3, 0, 0, 5, 0) -DEF(ID_AA64DFR1_EL1, 3, 0, 0, 5, 1) +DEF(CLIDR_EL1, 3, 1, 0, 0, 1) +DEF(CTR_EL0, 3, 3, 0, 0, 1) +DEF(DCZID_EL0, 3, 3, 0, 0, 7) DEF(ID_AA64AFR0_EL1, 3, 0, 0, 5, 4) DEF(ID_AA64AFR1_EL1, 3, 0, 0, 5, 5) +DEF(ID_AA64DFR0_EL1, 3, 0, 0, 5, 0) +DEF(ID_AA64DFR1_EL1, 3, 0, 0, 5, 1) +DEF(ID_AA64FPFR0_EL1, 3, 0, 0, 4, 7) DEF(ID_AA64ISAR0_EL1, 3, 0, 0, 6, 0) DEF(ID_AA64ISAR1_EL1, 3, 0, 0, 6, 1) DEF(ID_AA64ISAR2_EL1, 3, 0, 0, 6, 2)
@@ -17,29 +16,30 @@ DEF(ID_AA64MMFR1_EL1, 3, 0, 0, 7, 1) DEF(ID_AA64MMFR2_EL1, 3, 0, 0, 7, 2) DEF(ID_AA64MMFR3_EL1, 3, 0, 0, 7, 3) DEF(ID_AA64MMFR4_EL1, 3, 0, 0, 7, 4) -DEF(ID_PFR0_EL1, 3, 0, 0, 1, 0) -DEF(ID_PFR1_EL1, 3, 0, 0, 1, 1) -DEF(ID_DFR0_EL1, 3, 0, 0, 1, 2) +DEF(ID_AA64PFR0_EL1, 3, 0, 0, 4, 0) +DEF(ID_AA64PFR1_EL1, 3, 0, 0, 4, 1) +DEF(ID_AA64PFR2_EL1, 3, 0, 0, 4, 2) +DEF(ID_AA64SMFR0_EL1, 3, 0, 0, 4, 5) +DEF(ID_AA64ZFR0_EL1, 3, 0, 0, 4, 4) DEF(ID_AFR0_EL1, 3, 0, 0, 1, 3) -DEF(ID_MMFR0_EL1, 3, 0, 0, 1, 4) -DEF(ID_MMFR1_EL1, 3, 0, 0, 1, 5) -DEF(ID_MMFR2_EL1, 3, 0, 0, 1, 6) -DEF(ID_MMFR3_EL1, 3, 0, 0, 1, 7) +DEF(ID_DFR0_EL1, 3, 0, 0, 1, 2) +DEF(ID_DFR1_EL1, 3, 0, 0, 3, 5) DEF(ID_ISAR0_EL1, 3, 0, 0, 2, 0) DEF(ID_ISAR1_EL1, 3, 0, 0, 2, 1) DEF(ID_ISAR2_EL1, 3, 0, 0, 2, 2) DEF(ID_ISAR3_EL1, 3, 0, 0, 2, 3) DEF(ID_ISAR4_EL1, 3, 0, 0, 2, 4) DEF(ID_ISAR5_EL1, 3, 0, 0, 2, 5) -DEF(ID_MMFR4_EL1, 3, 0, 0, 2, 6) DEF(ID_ISAR6_EL1, 3, 0, 0, 2, 7) +DEF(ID_MMFR0_EL1, 3, 0, 0, 1, 4) +DEF(ID_MMFR1_EL1, 3, 0, 0, 1, 5) +DEF(ID_MMFR2_EL1, 3, 0, 0, 1, 6) +DEF(ID_MMFR3_EL1, 3, 0, 0, 1, 7) +DEF(ID_MMFR4_EL1, 3, 0, 0, 2, 6) +DEF(ID_MMFR5_EL1, 3, 0, 0, 3, 6) +DEF(ID_PFR0_EL1, 3, 0, 0, 1, 0) +DEF(ID_PFR1_EL1, 3, 0, 0, 1, 1) +DEF(ID_PFR2_EL1, 3, 0, 0, 3, 4) DEF(MVFR0_EL1, 3, 0, 0, 3, 0) DEF(MVFR1_EL1, 3, 0, 0, 3, 1) DEF(MVFR2_EL1, 3, 0, 0, 3, 2) -DEF(ID_PFR2_EL1, 3, 0, 0, 3, 4) -DEF(ID_DFR1_EL1, 3, 0, 0, 3, 5) -DEF(ID_MMFR5_EL1, 3, 0, 0, 3, 6) -DEF(CLIDR_EL1, 3, 1, 0, 0, 1) -DEF(ID_AA64ZFR0_EL1, 3, 0, 0, 4, 4) -DEF(CTR_EL0, 3, 3, 0, 0, 1) -DEF(DCZID_EL0, 3, 3, 0, 0, 7)
Signature · 1 line
2.53.0
RFC PATCH v6 3/17 target/arm/cpu-sysregs.h.inc: Update with automatic generation
In reply to Eric AugerGenerated definitions with scripts/update-aarch64-cpu-sysregs-header.py based on "AARCHMRS containing the JSON files for Arm A-profile architecture (2026-03)" Registers.json file.
--- target/arm/cpu-sysregs.h.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+)
target/arm/cpu-sysregs.h.inc +13 -0
@@ -1,11 +1,20 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* This file is autogenerated by scripts/update-aarch64-cpu-sysregs-header.py */ +/* DEF(<name>, <op0>, <op1>, <crn>, <crm>, <op2>) */ + +DEF(AIDR_EL1, 3, 1, 0, 0, 7) +DEF(CCSIDR2_EL1, 3, 1, 0, 0, 2) +DEF(CCSIDR_EL1, 3, 1, 0, 0, 0) DEF(CLIDR_EL1, 3, 1, 0, 0, 1) DEF(CTR_EL0, 3, 3, 0, 0, 1) DEF(DCZID_EL0, 3, 3, 0, 0, 7) +DEF(GMID_EL1, 3, 1, 0, 0, 4) DEF(ID_AA64AFR0_EL1, 3, 0, 0, 5, 4) DEF(ID_AA64AFR1_EL1, 3, 0, 0, 5, 5) DEF(ID_AA64DFR0_EL1, 3, 0, 0, 5, 0) DEF(ID_AA64DFR1_EL1, 3, 0, 0, 5, 1) +DEF(ID_AA64DFR2_EL1, 3, 0, 0, 5, 2) DEF(ID_AA64FPFR0_EL1, 3, 0, 0, 4, 7) DEF(ID_AA64ISAR0_EL1, 3, 0, 0, 6, 0) DEF(ID_AA64ISAR1_EL1, 3, 0, 0, 6, 1)
@@ -40,6 +49,10 @@ DEF(ID_MMFR5_EL1, 3, 0, 0, 3, 6) DEF(ID_PFR0_EL1, 3, 0, 0, 1, 0) DEF(ID_PFR1_EL1, 3, 0, 0, 1, 1) DEF(ID_PFR2_EL1, 3, 0, 0, 3, 4) +DEF(MIDR_EL1, 3, 0, 0, 0, 0) +DEF(MPIDR_EL1, 3, 0, 0, 0, 5) DEF(MVFR0_EL1, 3, 0, 0, 3, 0) DEF(MVFR1_EL1, 3, 0, 0, 3, 1) DEF(MVFR2_EL1, 3, 0, 0, 3, 2) +DEF(REVIDR_EL1, 3, 0, 0, 0, 6) +DEF(SMIDR_EL1, 3, 1, 0, 0, 6)
Signature · 1 line
2.53.0
RFC PATCH v6 4/17 arm/cpu: Add infra to handle generated ID register definitions
In reply to Eric AugerIntroduce an infrastructure to store the definition of all ID regs:
This include their name, index and array of named fields.
---
v5 -> v6:
- add ArmIdRegArchVal
--- target/arm/cpu-idregs.h | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 target/arm/cpu-idregs.h
target/arm/cpu-idregs.h new file +41 -0
@@ -0,0 +1,41 @@ +/* +* handle ID registers and their fields +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef TARGET_ARM_CPU_IDREGS_H +#define TARGET_ARM_CPU_IDREGS_H + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "cpu.h" +#include "cpu-sysregs.h" + +typedef struct ArmIdRegArchVal { +uint64_t value; +const char *name; +}ArmIdRegArchVal ; + +typedef struct ARM64SysRegField { +const char *name;/* name of the field, for instance CTR_EL0_IDC */ +ARMIDRegisterIdx index;/* parent register, e.g. CTR_EL0_IDX */ +int shift;/* lsb of the field in the register */ +int length;/* highest bit number */ +ArmIdRegArchVal *arch_vals; +uint32_t arch_vals_count; +}ARM64SysRegField ; + +typedef struct ARM64SysReg { +const char *name;/* name of the sysreg, for instance CTR_EL0 */ +ARMIDRegisterIdx index;/* register index, e.g. CTR_EL0_IDX */ +struct ARM64SysRegField *fields; +uint32_t fields_count; +uint64_t writable_mask; +}ARM64SysReg ; + +/* +* List of exposed ID regs (automatically populated from AARCHMRS Registers.json) +*/ +extern ARM64SysReg arm64_id_regs[NUM_ID_IDX ]; + +#endif
Signature · 1 line
2.53.0
Re: [RFC PATCH v6 04/17] arm/cpu: Add infra to handle generated ID register definitions
Quoted 7 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email
Quoted 8 lines
|-------------------------------------------------------------------!
Introduce an infrastructure to store the definition of all ID regs:
This include their name, index and array of named fields.Signed-off-by Eric Auger <[email protected]>Signed-off-by Cornelia Huck <[email protected]>Co-authored-by Khushit Shah <[email protected]>
Quoted 59 lines
---
v5 -> v6:
- add ArmIdRegArchVal
---target/arm/cpu-idregs.h| 41 +++++++++++++++++++++++++++++++++++++++++1 file changed, 41 insertions(+)create mode 100644
target/arm/cpu-idregs.htarget/arm/cpu-idregs.h new file +41
-0@@ -0,0 +1,41 @@ +/* +* handle ID registers and their fields +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef TARGET_ARM_CPU_IDREGS_H +#define TARGET_ARM_CPU_IDREGS_H + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "cpu.h" +#include "cpu-sysregs.h" + +typedef struct ArmIdRegArchVal { +uint64_t value; +const char *name; +}ArmIdRegArchVal ; + +typedef struct ARM64SysRegField { +const char *name;/* name of the field, for instance CTR_EL0_IDC */ +ARMIDRegisterIdx index;/* parent register, e.g. CTR_EL0_IDX */ +int shift;/* lsb of the field in the register */ +int length;/* highest bit number */ +ArmIdRegArchVal *arch_vals; +uint32_t arch_vals_count; +}ARM64SysRegField ; + +typedef struct ARM64SysReg { +const char *name;/* name of the sysreg, for instance CTR_EL0 */ +ARMIDRegisterIdx index;/* register index, e.g. CTR_EL0_IDX */ +struct ARM64SysRegField *fields; +uint32_t fields_count; +uint64_t writable_mask; +}ARM64SysReg ; + +/* +* List of exposed ID regs (automatically populated from AARCHMRS Registers.json) +*/ +extern ARM64SysReg arm64_id_regs[NUM_ID_IDX ]; + +#endif Signature · 1 line
2.53.0
RFC PATCH v6 5/17 scripts: Introduce scripts/aarch64_sysreg_helpers module
In reply to Eric AugerWe plan to reuse get_opcode() and extract_idregs_from_registers_json() functions in another script. So let's move them into a module
No functional change intended.
--- scripts/aarch64_sysreg_helpers.py | 109 +++++++++++++++++++ scripts/update-aarch64-cpu-sysregs-header.py | 85 +-------------- 2 files changed, 110 insertions(+), 84 deletions(-) create mode 100644 scripts/aarch64_sysreg_helpers.py
scripts/aarch64_sysreg_helpers.py new file +109 -0
@@ -0,0 +1,109 @@ +#!/usr/bin/env python3 + +# Helpers used in aarch64 sysreg definition generation +# +# Copyright (C) 2026 Red Hat, Inc. +# +# Authors: Eric Auger <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0-or-later + + +import json +import os + +# Some regs have op code values like 000x, 001x. Anyway we don't need +# them. Besides some regs are undesired in the generated file such as +# VMPIDR_EL2 and VPIDR_EL2 which are outside of the IDreg scope we +# are interested in and are tricky to decode as their system accessor +# refer to MPIDR_EL1/MIDR_EL1 respectively + +skiplist = ['ALLINT', 'PM', 'S1_', 'S3_', 'SVCR', \ + 'VMPIDR_EL2', 'VPIDR_EL2'] + +# returns the int value of a given @opcode for a reg @encoding +def get_opcode(encoding, opcode): + fvalue = encoding.get(opcode) + if fvalue: + value = fvalue.get('value') + if isinstance(value, str): + value = value.strip("'") + value = int(value, 2) + return value + return -1 + +def extract_idregs_from_registers_json(filename): + """ + Load a Registers.json file and extract all ID registers, decode their + opcode and dump the information in target/arm/cpu-sysregs.h.inc + + Args: + filename (str): The path to the Registers.json + returns: + idregs: list of ID regs and their encoding + """ + if not os.path.exists(filename): + print(f"Error: {filename} could not be found!") + return {} + + try: + with open(filename, 'r') as f: + register_data = json.load(f) + + except json.JSONDecodeError: + print(f"Could not decode json from '{filename}'!") + return {} + except Exception as e: + print(f"Unexpected error while reading {filename}: {e}") + return {} + + registers = [r for r in register_data if isinstance(r, dict) and \ + r.get('_type') == 'Register'] + + idregs = {} + + # Some regs have op code values like 000x, 001x. Anyway we don't need + # them. Besides some regs are undesired in the generated file such as + # VMPIDR_EL2 and VPIDR_EL2 which are outside of the IDreg scope we + # are interested in and are tricky to decode as their system accessor + # refer to MPIDR_EL1/MIDR_EL1 respectively + + skiplist = ['ALLINT', 'PM', 'S1_', 'S3_', 'SVCR', \ + 'VMPIDR_EL2', 'VPIDR_EL2'] + + for register in registers: + reg_name = register.get('name') + + is_skipped = any(term in (reg_name or "").upper() for term in skiplist) + + if reg_name and not is_skipped: + accessors = register.get('accessors', []) + + for accessor in accessors: + type = accessor.get('_type') + if type in ['Accessors.SystemAccessor']: + encoding_list = accessor.get('encoding') + + if isinstance(encoding_list, list) and encoding_list and \ + isinstance(encoding_list[0], dict): + encoding_wrapper = encoding_list[0] + encoding_source = encoding_wrapper.get('encodings', \ + encoding_wrapper) + + if isinstance(encoding_source, dict): + op0 = get_opcode(encoding_source, 'op0') + op1 = get_opcode(encoding_source, 'op1') + op2 = get_opcode(encoding_source, 'op2') + crn = get_opcode(encoding_source, 'CRn') + crm = get_opcode(encoding_source, 'CRm') + encoding_str=f"{op0} {op1} {crn} {crm} {op2}" + + # ID regs are assumed within this scope + if op0 == 3 and (op1 == 0 or op1 == 1 or op1 == 3) and \ + crn == 0 and (crm >= 0 and crm <= 7) and (op2 >= 0 and op2 <= 7): + idregs[reg_name] = encoding_str + + return idregs + + +
scripts/update-aarch64-cpu-sysregs-header.py +1 -84
91 lines not on this page · raw message
Signature · 1 line
2.53.0
RFC PATCH v6 6/17 scripts: Introduce scripts/update-aarch64-cpu-sysreg-properties.py
In reply to Eric AugerIntroduce a script that takes as input the Registers.json file delivered in the AARCHMRS Features Model downloadable from the Arm Developer A-Profile Architecture Exploration Tools page:
https://developer.arm.com/Architectures/A-Profile%20Architecture#Downloads
and automates the generation of system register properties definitions.
generates target/arm/cpu-idregs.h.inc containing definitions for feature ID registers.
We only care about IDregs with opcodes satisfying:
op0 = 3, op1 = {0,1,3}, crn = 0, crm within [0, 7], op2 within [0, 7]
---
v5 -> v6
- add ident
--- .../update-aarch64-cpu-sysreg-properties.py | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 scripts/update-aarch64-cpu-sysreg-properties.py
scripts/update-aarch64-cpu-sysreg-properties.py new file +166 -0
@@ -0,0 +1,166 @@ +#!/usr/bin/env python3 + +# This script takes as input the Registers.json file delivered in +# the AARCHMRS Features Model downloadable from the Arm Developer +# A-Profile Architecture Exploration Tools page: +# https://developer.arm.com/Architectures/A-Profile%20Architecture#Downloads +# and outputs target/arm/cpu-idregs.h.inc content. +# ID regs are defined using this pattern: +# +# IDREG_START(REG) +# IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) +# ... +# IDREG_END(REG) +# +# Copyright (C) 2026 Red Hat, Inc. +# +# Authors: Eric Auger <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0-or-later + + +import json +import os +import sys +from aarch64_sysreg_helpers import extract_idregs_from_registers_json + +def collect_fields(item, bit_offset=0): + """ + Recursively finds all field-like objects, handling Fields.Array, + Fields.ArrayField, and ConditionalField structures. + Applies bit_offset from containers to child fields. + """ + fields = [] + if not isinstance(item, dict): + return fields + + _type = item.get('_type', '') + + # Array types (for example CLIDR_EL1 Ctype<n>, Ttype<n>) + if _type == 'Fields.Array': + name_template = item.get('name') or item.get('label', '') + index_info = item.get('indexes', [{}])[0] + start_idx = index_info.get('start', 0) + count = index_info.get('width', 0) + + full_range = item.get('rangeset', [{}])[0] + bit_start = full_range.get('start', 0) + bit_offset + elem_width = full_range.get('width', 0) // count if count else 0 + + for i in range(count): + idx = start_idx + i + # Correctly handle indexed names like Ctype1, Ctype2 + field_name = name_template.replace('<n>', str(idx)) + fields.append({ + 'name': field_name, + 'rangeset': [{ + 'start': bit_start + (i * elem_width), + 'width': elem_width + }], + '_type': 'Fields.Field' + }) + return fields + + # ConditionalFields + elif _type == 'Fields.ConditionalField': + inner_offset = bit_offset + if item.get('rangeset'): + # Parent container defines the absolute start bit + inner_offset = item['rangeset'][0].get('start', bit_offset) + + for entry in item.get('fields', []): + inner = entry.get('field') + if inner: + fields.extend(collect_fields(inner, inner_offset)) + return fields + + # Normal Field Types + leaf_types = ['Fields.Field', 'Fields.ConstantField', + 'Fields.EnumeratedField', 'Fields.Bitfield'] + if _type in leaf_types: + field_copy = item.copy() + if field_copy.get('rangeset'): + new_ranges = [] + for r in field_copy['rangeset']: + nr = r.copy() + # Apply the cumulative offset to the field's start bit + nr['start'] = r.get('start', 0) + bit_offset + new_ranges.append(nr) + field_copy['rangeset'] = new_ranges + fields.append(field_copy) + return fields + + # Traverse the hierarchy for other cases + for key in ['fields', 'values', 'fieldsets']: + for nested in item.get(key, []): + fields.extend(collect_fields(nested, bit_offset)) + + return fields + + +def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path): + with open(raw_json_path, 'r') as f: + register_data = json.load(f) + + regs = {r.get('name'): r for r in register_data if r.get('_type') == 'Register'} + + final_output = "" + + for reg_name in id_reg_names: + register = regs.get(reg_name) + if not register: + continue + + final_output += f"IDREG_START({reg_name})\n" + + unique_fields = {} + for fieldset in register.get('fieldsets', []): + candidates = collect_fields(fieldset) + for val in candidates: + name = (val.get('name') or val.get('label', '')).strip() + if not name or "RESERVED" in name.upper(): + continue + for r in val.get('rangeset', []): + lsb = int(r.get('start')) + width = r.get('width') + msb = lsb + int(width) - 1 + + # Only keep the fields with the highest MSB + # needed fir CCSIDR_EL1 + if name not in unique_fields or msb > unique_fields[name]['msb']: + unique_fields[name] = {'lsb': lsb, 'msb': msb, 'width': width} + + # Sort decreasing lsbs + sorted_fields = sorted(unique_fields.items(), + key=lambda x: x[1]['lsb'], reverse=True) + + for name, bits in sorted_fields: + line = (f" IDREG_FIELD({reg_name}, " + f"{name}, {bits['lsb']}, {bits['width']})\n") + final_output += line + final_output += f"IDREG_END({reg_name})\n" + final_output += "\n" + + os.makedirs("target/arm", exist_ok=True) + with open("target/arm/cpu-idregs.h.inc", 'w') as f: + f.write("/* AUTOMATICALLY GENERATED, DO NOT MODIFY */\n\n") + f.write("/* SPDX-License-Identifier: GPL-2.0-or-later */\n\n") + f.write("/* IDREG_START(REG) */\n") + f.write("/* IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) */\n") + f.write("/* ... */\n") + f.write("/* IDREG_END(REG) */\n\n") + f.write(final_output) + +if __name__ == "__main__": + if len(sys.argv) < 2: + print("Usage: python scripts/update-aarch64-cpu-sysreg-properties.py " + "<path_to_registers_json>") + else: + json_path = sys.argv[1] + + id_regs_dict = extract_idregs_from_registers_json(json_path) + sorted_names = sorted(id_regs_dict.keys()) + + if sorted_names: + generate_sysreg_properties_from_registers_json(sorted_names, json_path) + print("Generated target/arm/cpu-idregs.h.inc")
Signature · 1 line
2.53.0
RFC PATCH v6 7/17 target/arm/cpu-idregs.h.inc: generate with script
In reply to Eric AugerGenerate ID reg definitions with the scripts/update-aarch64-cpu-sysreg-properties.py based on AARCHMRS_OPENSOURCE_A_profile_FAT-2026-03 Registers.json
Each register and fields are described with this pattern:
IDREG_START(REG)IDREG_FIELD(REG, FIELD, SHIFT, LENGTH)
...IDREG_END(REG)
--- target/arm/cpu-idregs.h.inc | 617 ++++++++++++++++++++++++++++++++++++ 1 file changed, 617 insertions(+) create mode 100644 target/arm/cpu-idregs.h.inc
target/arm/cpu-idregs.h.inc new file +617 -0
@@ -0,0 +1,617 @@ +/* AUTOMATICALLY GENERATED, DO NOT MODIFY */ + +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +/* IDREG_START(REG) */ +/* IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) */ +/* ... */ +/* IDREG_END(REG) */ + +IDREG_START(AIDR_EL1) +IDREG_END(AIDR_EL1) + +IDREG_START(CCSIDR2_EL1) + IDREG_FIELD(CCSIDR2_EL1, NumSets, 0, 24) +IDREG_END(CCSIDR2_EL1) + +IDREG_START(CCSIDR_EL1) + IDREG_FIELD(CCSIDR_EL1, NumSets, 32, 24) + IDREG_FIELD(CCSIDR_EL1, Associativity, 3, 21) + IDREG_FIELD(CCSIDR_EL1, LineSize, 0, 3) +IDREG_END(CCSIDR_EL1) + +IDREG_START(CLIDR_EL1) + IDREG_FIELD(CLIDR_EL1, Ttype7, 45, 2) + IDREG_FIELD(CLIDR_EL1, Ttype6, 43, 2) + IDREG_FIELD(CLIDR_EL1, Ttype5, 41, 2) + IDREG_FIELD(CLIDR_EL1, Ttype4, 39, 2) + IDREG_FIELD(CLIDR_EL1, Ttype3, 37, 2) + IDREG_FIELD(CLIDR_EL1, Ttype2, 35, 2) + IDREG_FIELD(CLIDR_EL1, Ttype1, 33, 2) + IDREG_FIELD(CLIDR_EL1, ICB, 30, 3) + IDREG_FIELD(CLIDR_EL1, LoUU, 27, 3) + IDREG_FIELD(CLIDR_EL1, LoC, 24, 3) + IDREG_FIELD(CLIDR_EL1, LoUIS, 21, 3) + IDREG_FIELD(CLIDR_EL1, Ctype7, 18, 3) + IDREG_FIELD(CLIDR_EL1, Ctype6, 15, 3) + IDREG_FIELD(CLIDR_EL1, Ctype5, 12, 3) + IDREG_FIELD(CLIDR_EL1, Ctype4, 9, 3) + IDREG_FIELD(CLIDR_EL1, Ctype3, 6, 3) + IDREG_FIELD(CLIDR_EL1, Ctype2, 3, 3) + IDREG_FIELD(CLIDR_EL1, Ctype1, 0, 3) +IDREG_END(CLIDR_EL1) + +IDREG_START(CTR_EL0) + IDREG_FIELD(CTR_EL0, TminLine, 32, 6) + IDREG_FIELD(CTR_EL0, DIC, 29, 1) + IDREG_FIELD(CTR_EL0, IDC, 28, 1) + IDREG_FIELD(CTR_EL0, CWG, 24, 4) + IDREG_FIELD(CTR_EL0, ERG, 20, 4) + IDREG_FIELD(CTR_EL0, DminLine, 16, 4) + IDREG_FIELD(CTR_EL0, L1Ip, 14, 2) + IDREG_FIELD(CTR_EL0, IminLine, 0, 4) +IDREG_END(CTR_EL0) + +IDREG_START(DCZID_EL0) + IDREG_FIELD(DCZID_EL0, TBS, 5, 4) + IDREG_FIELD(DCZID_EL0, DZP, 4, 1) + IDREG_FIELD(DCZID_EL0, BS, 0, 4) +IDREG_END(DCZID_EL0) + +IDREG_START(GMID_EL1) + IDREG_FIELD(GMID_EL1, BS, 0, 4) +IDREG_END(GMID_EL1) + +IDREG_START(ID_AA64AFR0_EL1) +IDREG_END(ID_AA64AFR0_EL1) + +IDREG_START(ID_AA64AFR1_EL1) +IDREG_END(ID_AA64AFR1_EL1) + +IDREG_START(ID_AA64DFR0_EL1) + IDREG_FIELD(ID_AA64DFR0_EL1, HPMN0, 60, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, ExtTrcBuff, 56, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, BRBE, 52, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, MTPMU, 48, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, TraceBuffer, 44, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, TraceFilt, 40, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, DoubleLock, 36, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, PMSVer, 32, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, PMSS, 16, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, BRPs, 12, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, PMUVer, 8, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, TraceVer, 4, 4) + IDREG_FIELD(ID_AA64DFR0_EL1, DebugVer, 0, 4) +IDREG_END(ID_AA64DFR0_EL1) + +IDREG_START(ID_AA64DFR1_EL1) + IDREG_FIELD(ID_AA64DFR1_EL1, ABL_CMPs, 56, 8) + IDREG_FIELD(ID_AA64DFR1_EL1, DPFZS, 52, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, EBEP, 48, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, ITE, 44, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, ABLE, 40, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, PMICNTR, 36, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, SPMU, 32, 4) + IDREG_FIELD(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8) + IDREG_FIELD(ID_AA64DFR1_EL1, WRPs, 16, 8) + IDREG_FIELD(ID_AA64DFR1_EL1, BRPs, 8, 8) + IDREG_FIELD(ID_AA64DFR1_EL1, SYSPMUID, 0, 8) +IDREG_END(ID_AA64DFR1_EL1) + +IDREG_START(ID_AA64DFR2_EL1) + IDREG_FIELD(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) + IDREG_FIELD(ID_AA64DFR2_EL1, SPE_nVM, 20, 4) + IDREG_FIELD(ID_AA64DFR2_EL1, SPE_EXC, 16, 4) + IDREG_FIELD(ID_AA64DFR2_EL1, BWE, 4, 4) + IDREG_FIELD(ID_AA64DFR2_EL1, STEP, 0, 4) +IDREG_END(ID_AA64DFR2_EL1) + +IDREG_START(ID_AA64FPFR0_EL1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8CVT, 31, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8FMA, 30, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP4, 29, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP2, 28, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM8, 27, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM4, 26, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F16MM2, 15, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) + IDREG_FIELD(ID_AA64FPFR0_EL1, F8E5M2, 0, 1) +IDREG_END(ID_AA64FPFR0_EL1) + +IDREG_START(ID_AA64ISAR0_EL1) + IDREG_FIELD(ID_AA64ISAR0_EL1, RNDR, 60, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, TLB, 56, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, TS, 52, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, FHM, 48, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, DP, 44, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, SM4, 40, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, SM3, 36, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, SHA3, 32, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, RDM, 28, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, Atomic, 20, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, CRC32, 16, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, SHA2, 12, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, SHA1, 8, 4) + IDREG_FIELD(ID_AA64ISAR0_EL1, AES, 4, 4) +IDREG_END(ID_AA64ISAR0_EL1) + +IDREG_START(ID_AA64ISAR1_EL1) + IDREG_FIELD(ID_AA64ISAR1_EL1, LS64, 60, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, XS, 56, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, I8MM, 52, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, DGH, 48, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, BF16, 44, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, SPECRES, 40, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, SB, 36, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, FRINTTS, 32, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, GPI, 28, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, GPA, 24, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, LRCPC, 20, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, FCMA, 16, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, JSCVT, 12, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, API, 8, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, APA, 4, 4) + IDREG_FIELD(ID_AA64ISAR1_EL1, DPB, 0, 4) +IDREG_END(ID_AA64ISAR1_EL1) + +IDREG_START(ID_AA64ISAR2_EL1) + IDREG_FIELD(ID_AA64ISAR2_EL1, ATS1A, 60, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, LUT, 56, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, CSSC, 52, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, RPRFM, 48, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, PCDPHINT, 44, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, PRFMSLC, 40, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, SYSINSTR_128, 36, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, SYSREG_128, 32, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, CLRBHB, 28, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, PAC_frac, 24, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, BC, 20, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, MOPS, 16, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, APA3, 12, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, GPA3, 8, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, RPRES, 4, 4) + IDREG_FIELD(ID_AA64ISAR2_EL1, WFxT, 0, 4) +IDREG_END(ID_AA64ISAR2_EL1) + +IDREG_START(ID_AA64ISAR3_EL1) + IDREG_FIELD(ID_AA64ISAR3_EL1, LSCP, 44, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, LSCSHINT, 40, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, MTETC, 36, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, PAC_frac2, 32, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, FPRCVT, 28, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, LSUI, 24, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, OCCMO, 20, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, LSFE, 16, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, PACM, 12, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, TLBIW, 8, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, FAMINMAX, 4, 4) + IDREG_FIELD(ID_AA64ISAR3_EL1, CPA, 0, 4) +IDREG_END(ID_AA64ISAR3_EL1) + +IDREG_START(ID_AA64MMFR0_EL1) + IDREG_FIELD(ID_AA64MMFR0_EL1, ECV, 60, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, FGT, 56, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, ExS, 44, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4_2, 40, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64_2, 36, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16_2, 32, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4, 28, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64, 24, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16, 20, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, BigEndEL0, 16, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, SNSMem, 12, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, BigEnd, 8, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, ASIDBits, 4, 4) + IDREG_FIELD(ID_AA64MMFR0_EL1, PARange, 0, 4) +IDREG_END(ID_AA64MMFR0_EL1) + +IDREG_START(ID_AA64MMFR1_EL1) + IDREG_FIELD(ID_AA64MMFR1_EL1, ECBHB, 60, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, CMOW, 56, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, TIDCP1, 52, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, nTLBPA, 48, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, AFP, 44, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, HCX, 40, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, ETS, 36, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, TWED, 32, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, XNX, 28, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, SpecSEI, 24, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, PAN, 20, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, LO, 16, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, HPDS, 12, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, VH, 8, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, VMIDBits, 4, 4) + IDREG_FIELD(ID_AA64MMFR1_EL1, HAFDBS, 0, 4) +IDREG_END(ID_AA64MMFR1_EL1) + +IDREG_START(ID_AA64MMFR2_EL1) + IDREG_FIELD(ID_AA64MMFR2_EL1, E0PD, 60, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, EVT, 56, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, BBM, 52, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, TTL, 48, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, FWB, 40, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, IDS, 36, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, AT, 32, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, ST, 28, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, NV, 24, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, CCIDX, 20, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, VARange, 16, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, IESB, 12, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, LSM, 8, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, UAO, 4, 4) + IDREG_FIELD(ID_AA64MMFR2_EL1, CnP, 0, 4) +IDREG_END(ID_AA64MMFR2_EL1) + +IDREG_START(ID_AA64MMFR3_EL1) + IDREG_FIELD(ID_AA64MMFR3_EL1, Spec_FPACC, 60, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, ADERR, 56, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, SDERR, 52, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, ANERR, 44, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, SNERR, 40, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, D128_2, 36, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, D128, 32, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, MEC, 28, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, AIE, 24, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, S2POE, 20, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, S1POE, 16, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, S2PIE, 12, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, S1PIE, 8, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, SCTLRX, 4, 4) + IDREG_FIELD(ID_AA64MMFR3_EL1, TCRX, 0, 4) +IDREG_END(ID_AA64MMFR3_EL1) + +IDREG_START(ID_AA64MMFR4_EL1) + IDREG_FIELD(ID_AA64MMFR4_EL1, MTEFGT, 60, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, SCRX, 56, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, TEV, 52, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, TPS, 48, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, SRMASK, 44, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, TLBID, 40, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, E3DSE, 36, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, EAESR, 32, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, RMEGDI, 28, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, E2H0, 24, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, NV_frac, 20, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, FGWTE3, 16, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, HACDBS, 12, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, ASID2, 8, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, EIESB, 4, 4) + IDREG_FIELD(ID_AA64MMFR4_EL1, PoPS, 0, 4) +IDREG_END(ID_AA64MMFR4_EL1) + +IDREG_START(ID_AA64PFR0_EL1) + IDREG_FIELD(ID_AA64PFR0_EL1, CSV3, 60, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, CSV2, 56, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, RME, 52, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, DIT, 48, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, AMU, 44, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, MPAM, 40, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, SEL2, 36, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, SVE, 32, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, RAS, 28, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, GIC, 24, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, AdvSIMD, 20, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, FP, 16, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, EL3, 12, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, EL2, 8, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, EL1, 4, 4) + IDREG_FIELD(ID_AA64PFR0_EL1, EL0, 0, 4) +IDREG_END(ID_AA64PFR0_EL1) + +IDREG_START(ID_AA64PFR1_EL1) + IDREG_FIELD(ID_AA64PFR1_EL1, PFAR, 60, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, DF2, 56, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, MTEX, 52, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, THE, 48, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, GCS, 44, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, MTE_frac, 40, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, NMI, 36, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, CSV2_frac, 32, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, RNDR_trap, 28, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, SME, 24, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, RAS_frac, 12, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, MTE, 8, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, SSBS, 4, 4) + IDREG_FIELD(ID_AA64PFR1_EL1, BT, 0, 4) +IDREG_END(ID_AA64PFR1_EL1) + +IDREG_START(ID_AA64PFR2_EL1) + IDREG_FIELD(ID_AA64PFR2_EL1, VMTETCL, 44, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, VMTETC, 40, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, VMTE, 36, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, FPMR, 32, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, MPAM2, 28, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, FGDT, 24, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, MTEEIRG, 20, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, UINJ, 16, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, GCIE, 12, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, MTEFAR, 8, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, MTESTOREONLY, 4, 4) + IDREG_FIELD(ID_AA64PFR2_EL1, MTEPERM, 0, 4) +IDREG_END(ID_AA64PFR2_EL1) + +IDREG_START(ID_AA64SMFR0_EL1) + IDREG_FIELD(ID_AA64SMFR0_EL1, FA64, 63, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, LUT6, 61, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, LUTv2, 60, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SMEver, 56, 4) + IDREG_FIELD(ID_AA64SMFR0_EL1, I16I64, 52, 4) + IDREG_FIELD(ID_AA64SMFR0_EL1, F64F64, 48, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, I16I32, 44, 4) + IDREG_FIELD(ID_AA64SMFR0_EL1, B16B16, 43, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, F16F16, 42, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, F8F16, 41, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, F8F32, 40, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, I8I32, 36, 4) + IDREG_FIELD(ID_AA64SMFR0_EL1, F16F32, 35, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, B16F32, 34, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, BI32I32, 33, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, F32F32, 32, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP4, 29, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP2, 28, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, AES, 24, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SFEXPA, 23, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, STMOP, 16, 1) + IDREG_FIELD(ID_AA64SMFR0_EL1, SMOP4, 0, 1) +IDREG_END(ID_AA64SMFR0_EL1) + +IDREG_START(ID_AA64ZFR0_EL1) + IDREG_FIELD(ID_AA64ZFR0_EL1, F64MM, 56, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, F32MM, 52, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, F16MM, 48, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, I8MM, 44, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, SM4, 40, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, SHA3, 32, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, B16B16, 24, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, BF16, 20, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, BitPerm, 16, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, EltPerm, 12, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, AES, 4, 4) + IDREG_FIELD(ID_AA64ZFR0_EL1, SVEver, 0, 4) +IDREG_END(ID_AA64ZFR0_EL1) + +IDREG_START(ID_AFR0_EL1) +IDREG_END(ID_AFR0_EL1) + +IDREG_START(ID_DFR0_EL1) + IDREG_FIELD(ID_DFR0_EL1, TraceFilt, 28, 4) + IDREG_FIELD(ID_DFR0_EL1, PerfMon, 24, 4) + IDREG_FIELD(ID_DFR0_EL1, MProfDbg, 20, 4) + IDREG_FIELD(ID_DFR0_EL1, MMapTrc, 16, 4) + IDREG_FIELD(ID_DFR0_EL1, CopTrc, 12, 4) + IDREG_FIELD(ID_DFR0_EL1, MMapDbg, 8, 4) + IDREG_FIELD(ID_DFR0_EL1, CopSDbg, 4, 4) + IDREG_FIELD(ID_DFR0_EL1, CopDbg, 0, 4) +IDREG_END(ID_DFR0_EL1) + +IDREG_START(ID_DFR1_EL1) + IDREG_FIELD(ID_DFR1_EL1, HPMN0, 4, 4) + IDREG_FIELD(ID_DFR1_EL1, MTPMU, 0, 4) +IDREG_END(ID_DFR1_EL1) + +IDREG_START(ID_ISAR0_EL1) + IDREG_FIELD(ID_ISAR0_EL1, Divide, 24, 4) + IDREG_FIELD(ID_ISAR0_EL1, Debug, 20, 4) + IDREG_FIELD(ID_ISAR0_EL1, Coproc, 16, 4) + IDREG_FIELD(ID_ISAR0_EL1, CmpBranch, 12, 4) + IDREG_FIELD(ID_ISAR0_EL1, BitField, 8, 4) + IDREG_FIELD(ID_ISAR0_EL1, BitCount, 4, 4) + IDREG_FIELD(ID_ISAR0_EL1, Swap, 0, 4) +IDREG_END(ID_ISAR0_EL1) + +IDREG_START(ID_ISAR1_EL1) + IDREG_FIELD(ID_ISAR1_EL1, Jazelle, 28, 4) + IDREG_FIELD(ID_ISAR1_EL1, Interwork, 24, 4) + IDREG_FIELD(ID_ISAR1_EL1, Immediate, 20, 4) + IDREG_FIELD(ID_ISAR1_EL1, IfThen, 16, 4) + IDREG_FIELD(ID_ISAR1_EL1, Extend, 12, 4) + IDREG_FIELD(ID_ISAR1_EL1, Except_AR, 8, 4) + IDREG_FIELD(ID_ISAR1_EL1, Except, 4, 4) + IDREG_FIELD(ID_ISAR1_EL1, Endian, 0, 4) +IDREG_END(ID_ISAR1_EL1) + +IDREG_START(ID_ISAR2_EL1) + IDREG_FIELD(ID_ISAR2_EL1, Reversal, 28, 4) + IDREG_FIELD(ID_ISAR2_EL1, PSR_AR, 24, 4) + IDREG_FIELD(ID_ISAR2_EL1, MultU, 20, 4) + IDREG_FIELD(ID_ISAR2_EL1, MultS, 16, 4) + IDREG_FIELD(ID_ISAR2_EL1, Mult, 12, 4) + IDREG_FIELD(ID_ISAR2_EL1, MultiAccessInt, 8, 4) + IDREG_FIELD(ID_ISAR2_EL1, MemHint, 4, 4) + IDREG_FIELD(ID_ISAR2_EL1, LoadStore, 0, 4) +IDREG_END(ID_ISAR2_EL1) + +IDREG_START(ID_ISAR3_EL1) + IDREG_FIELD(ID_ISAR3_EL1, T32EE, 28, 4) + IDREG_FIELD(ID_ISAR3_EL1, TrueNOP, 24, 4) + IDREG_FIELD(ID_ISAR3_EL1, T32Copy, 20, 4) + IDREG_FIELD(ID_ISAR3_EL1, TabBranch, 16, 4) + IDREG_FIELD(ID_ISAR3_EL1, SynchPrim, 12, 4) + IDREG_FIELD(ID_ISAR3_EL1, SVC, 8, 4) + IDREG_FIELD(ID_ISAR3_EL1, SIMD, 4, 4) + IDREG_FIELD(ID_ISAR3_EL1, Saturate, 0, 4) +IDREG_END(ID_ISAR3_EL1) + +IDREG_START(ID_ISAR4_EL1) + IDREG_FIELD(ID_ISAR4_EL1, SWP_frac, 28, 4) + IDREG_FIELD(ID_ISAR4_EL1, PSR_M, 24, 4) + IDREG_FIELD(ID_ISAR4_EL1, SynchPrim_frac, 20, 4) + IDREG_FIELD(ID_ISAR4_EL1, Barrier, 16, 4) + IDREG_FIELD(ID_ISAR4_EL1, SMC, 12, 4) + IDREG_FIELD(ID_ISAR4_EL1, Writeback, 8, 4) + IDREG_FIELD(ID_ISAR4_EL1, WithShifts, 4, 4) + IDREG_FIELD(ID_ISAR4_EL1, Unpriv, 0, 4) +IDREG_END(ID_ISAR4_EL1) + +IDREG_START(ID_ISAR5_EL1) + IDREG_FIELD(ID_ISAR5_EL1, VCMA, 28, 4) + IDREG_FIELD(ID_ISAR5_EL1, RDM, 24, 4) + IDREG_FIELD(ID_ISAR5_EL1, CRC32, 16, 4) + IDREG_FIELD(ID_ISAR5_EL1, SHA2, 12, 4) + IDREG_FIELD(ID_ISAR5_EL1, SHA1, 8, 4) + IDREG_FIELD(ID_ISAR5_EL1, AES, 4, 4) + IDREG_FIELD(ID_ISAR5_EL1, SEVL, 0, 4) +IDREG_END(ID_ISAR5_EL1) + +IDREG_START(ID_ISAR6_EL1) + IDREG_FIELD(ID_ISAR6_EL1, CLRBHB, 28, 4) + IDREG_FIELD(ID_ISAR6_EL1, I8MM, 24, 4) + IDREG_FIELD(ID_ISAR6_EL1, BF16, 20, 4) + IDREG_FIELD(ID_ISAR6_EL1, SPECRES, 16, 4) + IDREG_FIELD(ID_ISAR6_EL1, SB, 12, 4) + IDREG_FIELD(ID_ISAR6_EL1, FHM, 8, 4) + IDREG_FIELD(ID_ISAR6_EL1, DP, 4, 4) + IDREG_FIELD(ID_ISAR6_EL1, JSCVT, 0, 4) +IDREG_END(ID_ISAR6_EL1) + +IDREG_START(ID_MMFR0_EL1) + IDREG_FIELD(ID_MMFR0_EL1, InnerShr, 28, 4) + IDREG_FIELD(ID_MMFR0_EL1, FCSE, 24, 4) + IDREG_FIELD(ID_MMFR0_EL1, AuxReg, 20, 4) + IDREG_FIELD(ID_MMFR0_EL1, TCM, 16, 4) + IDREG_FIELD(ID_MMFR0_EL1, ShareLvl, 12, 4) + IDREG_FIELD(ID_MMFR0_EL1, OuterShr, 8, 4) + IDREG_FIELD(ID_MMFR0_EL1, PMSA, 4, 4) + IDREG_FIELD(ID_MMFR0_EL1, VMSA, 0, 4) +IDREG_END(ID_MMFR0_EL1) + +IDREG_START(ID_MMFR1_EL1) + IDREG_FIELD(ID_MMFR1_EL1, BPred, 28, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1TstCln, 24, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1Uni, 20, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1Hvd, 16, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1UniSW, 12, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1HvdSW, 8, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1UniVA, 4, 4) + IDREG_FIELD(ID_MMFR1_EL1, L1HvdVA, 0, 4) +IDREG_END(ID_MMFR1_EL1) + +IDREG_START(ID_MMFR2_EL1) + IDREG_FIELD(ID_MMFR2_EL1, HWAccFlg, 28, 4) + IDREG_FIELD(ID_MMFR2_EL1, WFIStall, 24, 4) + IDREG_FIELD(ID_MMFR2_EL1, MemBarr, 20, 4) + IDREG_FIELD(ID_MMFR2_EL1, UniTLB, 16, 4) + IDREG_FIELD(ID_MMFR2_EL1, HvdTLB, 12, 4) + IDREG_FIELD(ID_MMFR2_EL1, L1HvdRng, 8, 4) + IDREG_FIELD(ID_MMFR2_EL1, L1HvdBG, 4, 4) + IDREG_FIELD(ID_MMFR2_EL1, L1HvdFG, 0, 4) +IDREG_END(ID_MMFR2_EL1) + +IDREG_START(ID_MMFR3_EL1) + IDREG_FIELD(ID_MMFR3_EL1, Supersec, 28, 4) + IDREG_FIELD(ID_MMFR3_EL1, CMemSz, 24, 4) + IDREG_FIELD(ID_MMFR3_EL1, CohWalk, 20, 4) + IDREG_FIELD(ID_MMFR3_EL1, PAN, 16, 4) + IDREG_FIELD(ID_MMFR3_EL1, MaintBcst, 12, 4) + IDREG_FIELD(ID_MMFR3_EL1, BPMaint, 8, 4) + IDREG_FIELD(ID_MMFR3_EL1, CMaintSW, 4, 4) + IDREG_FIELD(ID_MMFR3_EL1, CMaintVA, 0, 4) +IDREG_END(ID_MMFR3_EL1) + +IDREG_START(ID_MMFR4_EL1) + IDREG_FIELD(ID_MMFR4_EL1, EVT, 28, 4) + IDREG_FIELD(ID_MMFR4_EL1, CCIDX, 24, 4) + IDREG_FIELD(ID_MMFR4_EL1, LSM, 20, 4) + IDREG_FIELD(ID_MMFR4_EL1, HPDS, 16, 4) + IDREG_FIELD(ID_MMFR4_EL1, CnP, 12, 4) + IDREG_FIELD(ID_MMFR4_EL1, XNX, 8, 4) + IDREG_FIELD(ID_MMFR4_EL1, AC2, 4, 4) + IDREG_FIELD(ID_MMFR4_EL1, SpecSEI, 0, 4) +IDREG_END(ID_MMFR4_EL1) + +IDREG_START(ID_MMFR5_EL1) + IDREG_FIELD(ID_MMFR5_EL1, nTLBPA, 4, 4) + IDREG_FIELD(ID_MMFR5_EL1, ETS, 0, 4) +IDREG_END(ID_MMFR5_EL1) + +IDREG_START(ID_PFR0_EL1) + IDREG_FIELD(ID_PFR0_EL1, RAS, 28, 4) + IDREG_FIELD(ID_PFR0_EL1, DIT, 24, 4) + IDREG_FIELD(ID_PFR0_EL1, AMU, 20, 4) + IDREG_FIELD(ID_PFR0_EL1, CSV2, 16, 4) + IDREG_FIELD(ID_PFR0_EL1, State3, 12, 4) + IDREG_FIELD(ID_PFR0_EL1, State2, 8, 4) + IDREG_FIELD(ID_PFR0_EL1, State1, 4, 4) + IDREG_FIELD(ID_PFR0_EL1, State0, 0, 4) +IDREG_END(ID_PFR0_EL1) + +IDREG_START(ID_PFR1_EL1) + IDREG_FIELD(ID_PFR1_EL1, GIC, 28, 4) + IDREG_FIELD(ID_PFR1_EL1, Virt_frac, 24, 4) + IDREG_FIELD(ID_PFR1_EL1, Sec_frac, 20, 4) + IDREG_FIELD(ID_PFR1_EL1, GenTimer, 16, 4) + IDREG_FIELD(ID_PFR1_EL1, Virtualization, 12, 4) + IDREG_FIELD(ID_PFR1_EL1, MProgMod, 8, 4) + IDREG_FIELD(ID_PFR1_EL1, Security, 4, 4) + IDREG_FIELD(ID_PFR1_EL1, ProgMod, 0, 4) +IDREG_END(ID_PFR1_EL1) + +IDREG_START(ID_PFR2_EL1) + IDREG_FIELD(ID_PFR2_EL1, RAS_frac, 8, 4) + IDREG_FIELD(ID_PFR2_EL1, SSBS, 4, 4) + IDREG_FIELD(ID_PFR2_EL1, CSV3, 0, 4) +IDREG_END(ID_PFR2_EL1) + +IDREG_START(MIDR_EL1) + IDREG_FIELD(MIDR_EL1, Implementer, 24, 8) + IDREG_FIELD(MIDR_EL1, Variant, 20, 4) + IDREG_FIELD(MIDR_EL1, Architecture, 16, 4) + IDREG_FIELD(MIDR_EL1, PartNum, 4, 12) + IDREG_FIELD(MIDR_EL1, Revision, 0, 4) +IDREG_END(MIDR_EL1) + +IDREG_START(MPIDR_EL1) + IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8) + IDREG_FIELD(MPIDR_EL1, U, 30, 1) + IDREG_FIELD(MPIDR_EL1, MT, 24, 1) + IDREG_FIELD(MPIDR_EL1, Aff2, 16, 8) + IDREG_FIELD(MPIDR_EL1, Aff1, 8, 8) + IDREG_FIELD(MPIDR_EL1, Aff0, 0, 8) +IDREG_END(MPIDR_EL1) + +IDREG_START(MVFR0_EL1) + IDREG_FIELD(MVFR0_EL1, FPRound, 28, 4) + IDREG_FIELD(MVFR0_EL1, FPShVec, 24, 4) + IDREG_FIELD(MVFR0_EL1, FPSqrt, 20, 4) + IDREG_FIELD(MVFR0_EL1, FPDivide, 16, 4) + IDREG_FIELD(MVFR0_EL1, FPTrap, 12, 4) + IDREG_FIELD(MVFR0_EL1, FPDP, 8, 4) + IDREG_FIELD(MVFR0_EL1, FPSP, 4, 4) + IDREG_FIELD(MVFR0_EL1, SIMDReg, 0, 4) +IDREG_END(MVFR0_EL1) + +IDREG_START(MVFR1_EL1) + IDREG_FIELD(MVFR1_EL1, SIMDFMAC, 28, 4) + IDREG_FIELD(MVFR1_EL1, FPHP, 24, 4) + IDREG_FIELD(MVFR1_EL1, SIMDHP, 20, 4) + IDREG_FIELD(MVFR1_EL1, SIMDSP, 16, 4) + IDREG_FIELD(MVFR1_EL1, SIMDInt, 12, 4) + IDREG_FIELD(MVFR1_EL1, SIMDLS, 8, 4) + IDREG_FIELD(MVFR1_EL1, FPDNaN, 4, 4) + IDREG_FIELD(MVFR1_EL1, FPFtZ, 0, 4) +IDREG_END(MVFR1_EL1) + +IDREG_START(MVFR2_EL1) + IDREG_FIELD(MVFR2_EL1, FPMisc, 4, 4) + IDREG_FIELD(MVFR2_EL1, SIMDMisc, 0, 4) +IDREG_END(MVFR2_EL1) + +IDREG_START(REVIDR_EL1) +IDREG_END(REVIDR_EL1) + +IDREG_START(SMIDR_EL1) + IDREG_FIELD(SMIDR_EL1, NSMC, 56, 4) + IDREG_FIELD(SMIDR_EL1, HIP, 52, 4) + IDREG_FIELD(SMIDR_EL1, Affinity2, 32, 20) + IDREG_FIELD(SMIDR_EL1, Implementer, 24, 8) + IDREG_FIELD(SMIDR_EL1, Revision, 16, 8) + IDREG_FIELD(SMIDR_EL1, SMPS, 15, 1) + IDREG_FIELD(SMIDR_EL1, SH, 13, 2) + IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12) +IDREG_END(SMIDR_EL1) +
Signature · 1 line
2.53.0
RFC PATCH v6 8/17 target/arm/cpu-idregs.h.inc: Generate enum values
In reply to Eric AugerModify the python script so that enum values are also extracted from Registers.json.
If enum values are found, the field and its enum values are defined within IDREG_FIELD_START/END. Each enum value is defined with IDREG_FIELD_ARCH_VAL() macro.
--- target/arm/cpu-idregs.h.inc | 2290 ++++++++++++++--- .../update-aarch64-cpu-sysreg-properties.py | 77 +- 2 files changed, 1959 insertions(+), 408 deletions(-)
target/arm/cpu-idregs.h.inc +1886 -404
@@ -4,7 +4,11 @@ /* IDREG_START(REG) */ /* IDREG_FIELD(REG, FIELD, SHIFT, LENGTH) */ +/* or for fields with enum values */ +/* IDREG_FIELD_START(REG, FIELD, SHIFT, LENGTH) */ +/* IDREG_FIELD_ARCH_VAL(VALUE) */ /* ... */ +/* IDREG_FIELD_END(REG, FIELD) */ /* IDREG_END(REG) */ IDREG_START(AIDR_EL1)
@@ -28,7 +32,16 @@ IDREG_START(CLIDR_EL1) IDREG_FIELD(CLIDR_EL1, Ttype3, 37, 2) IDREG_FIELD(CLIDR_EL1, Ttype2, 35, 2) IDREG_FIELD(CLIDR_EL1, Ttype1, 33, 2) - IDREG_FIELD(CLIDR_EL1, ICB, 30, 3) + IDREG_FIELD_START(CLIDR_EL1, ICB, 30, 3) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_END(CLIDR_EL1, ICB) IDREG_FIELD(CLIDR_EL1, LoUU, 27, 3) IDREG_FIELD(CLIDR_EL1, LoC, 24, 3) IDREG_FIELD(CLIDR_EL1, LoUIS, 21, 3)
@@ -43,12 +56,23 @@ IDREG_END(CLIDR_EL1) IDREG_START(CTR_EL0) IDREG_FIELD(CTR_EL0, TminLine, 32, 6) - IDREG_FIELD(CTR_EL0, DIC, 29, 1) - IDREG_FIELD(CTR_EL0, IDC, 28, 1) + IDREG_FIELD_START(CTR_EL0, DIC, 29, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(CTR_EL0, DIC) + IDREG_FIELD_START(CTR_EL0, IDC, 28, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(CTR_EL0, IDC) IDREG_FIELD(CTR_EL0, CWG, 24, 4) IDREG_FIELD(CTR_EL0, ERG, 20, 4) IDREG_FIELD(CTR_EL0, DminLine, 16, 4) - IDREG_FIELD(CTR_EL0, L1Ip, 14, 2) + IDREG_FIELD_START(CTR_EL0, L1Ip, 14, 2) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(CTR_EL0, L1Ip) IDREG_FIELD(CTR_EL0, IminLine, 0, 4) IDREG_END(CTR_EL0)
@@ -69,549 +93,2007 @@ IDREG_START(ID_AA64AFR1_EL1) IDREG_END(ID_AA64AFR1_EL1) IDREG_START(ID_AA64DFR0_EL1) - IDREG_FIELD(ID_AA64DFR0_EL1, HPMN0, 60, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, ExtTrcBuff, 56, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, BRBE, 52, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, MTPMU, 48, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, TraceBuffer, 44, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, TraceFilt, 40, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, DoubleLock, 36, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, PMSVer, 32, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) + IDREG_FIELD_START(ID_AA64DFR0_EL1, HPMN0, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR0_EL1, HPMN0) + IDREG_FIELD_START(ID_AA64DFR0_EL1, ExtTrcBuff, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR0_EL1, ExtTrcBuff) + IDREG_FIELD_START(ID_AA64DFR0_EL1, BRBE, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64DFR0_EL1, BRBE) + IDREG_FIELD_START(ID_AA64DFR0_EL1, MTPMU, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, MTPMU) + IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceBuffer, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceBuffer) + IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceFilt, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceFilt) + IDREG_FIELD_START(ID_AA64DFR0_EL1, DoubleLock, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, DoubleLock) + IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSVer, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSVer) + IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs) IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, PMSS, 16, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, BRPs, 12, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, PMUVer, 8, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, TraceVer, 4, 4) - IDREG_FIELD(ID_AA64DFR0_EL1, DebugVer, 0, 4) + IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSS) + IDREG_FIELD_START(ID_AA64DFR0_EL1, BRPs, 12, 4) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, BRPs) + IDREG_FIELD_START(ID_AA64DFR0_EL1, PMUVer, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_ARCH_VAL(8) + IDREG_FIELD_ARCH_VAL(9) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, PMUVer) + IDREG_FIELD_START(ID_AA64DFR0_EL1, TraceVer, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR0_EL1, TraceVer) + IDREG_FIELD_START(ID_AA64DFR0_EL1, DebugVer, 0, 4) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_ARCH_VAL(8) + IDREG_FIELD_ARCH_VAL(9) + IDREG_FIELD_ARCH_VAL(10) + IDREG_FIELD_ARCH_VAL(11) + IDREG_FIELD_END(ID_AA64DFR0_EL1, DebugVer) IDREG_END(ID_AA64DFR0_EL1) IDREG_START(ID_AA64DFR1_EL1) IDREG_FIELD(ID_AA64DFR1_EL1, ABL_CMPs, 56, 8) - IDREG_FIELD(ID_AA64DFR1_EL1, DPFZS, 52, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, EBEP, 48, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, ITE, 44, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, ABLE, 40, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, PMICNTR, 36, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, SPMU, 32, 4) - IDREG_FIELD(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8) - IDREG_FIELD(ID_AA64DFR1_EL1, WRPs, 16, 8) - IDREG_FIELD(ID_AA64DFR1_EL1, BRPs, 8, 8) + IDREG_FIELD_START(ID_AA64DFR1_EL1, DPFZS, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR1_EL1, DPFZS) + IDREG_FIELD_START(ID_AA64DFR1_EL1, EBEP, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR1_EL1, EBEP) + IDREG_FIELD_START(ID_AA64DFR1_EL1, ITE, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR1_EL1, ITE) + IDREG_FIELD_START(ID_AA64DFR1_EL1, ABLE, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR1_EL1, ABLE) + IDREG_FIELD_START(ID_AA64DFR1_EL1, PMICNTR, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR1_EL1, PMICNTR) + IDREG_FIELD_START(ID_AA64DFR1_EL1, SPMU, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64DFR1_EL1, SPMU) + IDREG_FIELD_START(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, CTX_CMPs) + IDREG_FIELD_START(ID_AA64DFR1_EL1, WRPs, 16, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, WRPs) + IDREG_FIELD_START(ID_AA64DFR1_EL1, BRPs, 8, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, BRPs) IDREG_FIELD(ID_AA64DFR1_EL1, SYSPMUID, 0, 8) IDREG_END(ID_AA64DFR1_EL1) IDREG_START(ID_AA64DFR2_EL1) - IDREG_FIELD(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) - IDREG_FIELD(ID_AA64DFR2_EL1, SPE_nVM, 20, 4) - IDREG_FIELD(ID_AA64DFR2_EL1, SPE_EXC, 16, 4) - IDREG_FIELD(ID_AA64DFR2_EL1, BWE, 4, 4) - IDREG_FIELD(ID_AA64DFR2_EL1, STEP, 0, 4) + IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR2_EL1, TRBE_EXC) + IDREG_FIELD_START(ID_AA64DFR2_EL1, SPE_nVM, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_nVM) + IDREG_FIELD_START(ID_AA64DFR2_EL1, SPE_EXC, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC) + IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64DFR2_EL1, BWE) + IDREG_FIELD_START(ID_AA64DFR2_EL1, STEP, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64DFR2_EL1, STEP) IDREG_END(ID_AA64DFR2_EL1) IDREG_START(ID_AA64FPFR0_EL1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8CVT, 31, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8FMA, 30, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP4, 29, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8DP2, 28, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM8, 27, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8MM4, 26, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F16MM2, 15, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) - IDREG_FIELD(ID_AA64FPFR0_EL1, F8E5M2, 0, 1) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8CVT) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8FMA, 30, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8FMA) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8DP4, 29, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8DP4) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8DP2, 28, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8DP2) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8MM8, 27, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM8) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8MM4, 26, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F16MM2, 15, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F16MM2) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8E4M3) + IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E5M2, 0, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8E5M2) IDREG_END(ID_AA64FPFR0_EL1) IDREG_START(ID_AA64ISAR0_EL1) - IDREG_FIELD(ID_AA64ISAR0_EL1, RNDR, 60, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, TLB, 56, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, TS, 52, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, FHM, 48, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, DP, 44, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, SM4, 40, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, SM3, 36, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, SHA3, 32, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, RDM, 28, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, Atomic, 20, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, CRC32, 16, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, SHA2, 12, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, SHA1, 8, 4) - IDREG_FIELD(ID_AA64ISAR0_EL1, AES, 4, 4) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, RNDR, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, RNDR) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, TLB, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, TLB) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, TS, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, TS) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, FHM, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, FHM) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, DP, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, DP) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, SM4, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, SM4) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, SM3, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, SM3) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA3, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA3) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, RDM, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, Atomic) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, CRC32, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, CRC32) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA2, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA2) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, SHA1, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, SHA1) + IDREG_FIELD_START(ID_AA64ISAR0_EL1, AES, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES) IDREG_END(ID_AA64ISAR0_EL1) IDREG_START(ID_AA64ISAR1_EL1) - IDREG_FIELD(ID_AA64ISAR1_EL1, LS64, 60, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, XS, 56, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, I8MM, 52, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, DGH, 48, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, BF16, 44, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, SPECRES, 40, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, SB, 36, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, FRINTTS, 32, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, GPI, 28, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, GPA, 24, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, LRCPC, 20, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, FCMA, 16, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, JSCVT, 12, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, API, 8, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, APA, 4, 4) - IDREG_FIELD(ID_AA64ISAR1_EL1, DPB, 0, 4) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, LS64, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, LS64) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, XS, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, XS) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, I8MM, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, I8MM) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, DGH, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, DGH) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, BF16, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, BF16) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, SPECRES, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, SPECRES) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, SB, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, SB) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, FRINTTS, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, FRINTTS) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, GPI, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, GPI) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, GPA, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, GPA) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, LRCPC, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, LRCPC) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, FCMA, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, FCMA) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, JSCVT, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, JSCVT) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, API, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, API) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, APA, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, APA) + IDREG_FIELD_START(ID_AA64ISAR1_EL1, DPB, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR1_EL1, DPB) IDREG_END(ID_AA64ISAR1_EL1) IDREG_START(ID_AA64ISAR2_EL1) - IDREG_FIELD(ID_AA64ISAR2_EL1, ATS1A, 60, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, LUT, 56, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, CSSC, 52, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, RPRFM, 48, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, PCDPHINT, 44, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, PRFMSLC, 40, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, SYSINSTR_128, 36, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, SYSREG_128, 32, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, CLRBHB, 28, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, PAC_frac, 24, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, BC, 20, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, MOPS, 16, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, APA3, 12, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, GPA3, 8, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, RPRES, 4, 4) - IDREG_FIELD(ID_AA64ISAR2_EL1, WFxT, 0, 4) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, ATS1A, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, ATS1A) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, LUT, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, LUT) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, CSSC, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, CSSC) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, RPRFM, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, RPRFM) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, PCDPHINT, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, PCDPHINT) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, PRFMSLC, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, PRFMSLC) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, SYSINSTR_128, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, SYSINSTR_128) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, SYSREG_128, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, SYSREG_128) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, CLRBHB, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, CLRBHB) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, PAC_frac, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, PAC_frac) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, BC, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, BC) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, MOPS, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, MOPS) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, APA3, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, APA3) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, GPA3, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, GPA3) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, RPRES, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, RPRES) + IDREG_FIELD_START(ID_AA64ISAR2_EL1, WFxT, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR2_EL1, WFxT) IDREG_END(ID_AA64ISAR2_EL1) IDREG_START(ID_AA64ISAR3_EL1) - IDREG_FIELD(ID_AA64ISAR3_EL1, LSCP, 44, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, LSCSHINT, 40, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, MTETC, 36, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, PAC_frac2, 32, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, FPRCVT, 28, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, LSUI, 24, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, OCCMO, 20, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, LSFE, 16, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, PACM, 12, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, TLBIW, 8, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, FAMINMAX, 4, 4) - IDREG_FIELD(ID_AA64ISAR3_EL1, CPA, 0, 4) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSCP) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCSHINT, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSCSHINT) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, MTETC, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, MTETC) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, PAC_frac2, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, PAC_frac2) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, FPRCVT, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, FPRCVT) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSUI, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSUI) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, OCCMO, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, OCCMO) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSFE, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, LSFE) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, PACM, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, PACM) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, TLBIW, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, TLBIW) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, FAMINMAX, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, FAMINMAX) + IDREG_FIELD_START(ID_AA64ISAR3_EL1, CPA, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ISAR3_EL1, CPA) IDREG_END(ID_AA64ISAR3_EL1) IDREG_START(ID_AA64MMFR0_EL1) - IDREG_FIELD(ID_AA64MMFR0_EL1, ECV, 60, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, FGT, 56, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, ExS, 44, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4_2, 40, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64_2, 36, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16_2, 32, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran4, 28, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran64, 24, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, TGran16, 20, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, BigEndEL0, 16, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, SNSMem, 12, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, BigEnd, 8, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, ASIDBits, 4, 4) - IDREG_FIELD(ID_AA64MMFR0_EL1, PARange, 0, 4) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, ECV, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, ECV) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, FGT, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, ExS) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran4_2, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran4_2) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran64_2, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran64_2) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran16_2, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran16_2) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran4, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran4) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran64, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran64) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, TGran16, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, TGran16) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, BigEndEL0, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, BigEndEL0) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, SNSMem, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, SNSMem) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, BigEnd, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, BigEnd) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, ASIDBits, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, ASIDBits) + IDREG_FIELD_START(ID_AA64MMFR0_EL1, PARange, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_END(ID_AA64MMFR0_EL1, PARange) IDREG_END(ID_AA64MMFR0_EL1) IDREG_START(ID_AA64MMFR1_EL1) - IDREG_FIELD(ID_AA64MMFR1_EL1, ECBHB, 60, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, CMOW, 56, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, TIDCP1, 52, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, nTLBPA, 48, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, AFP, 44, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, HCX, 40, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, ETS, 36, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, TWED, 32, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, XNX, 28, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, SpecSEI, 24, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, PAN, 20, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, LO, 16, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, HPDS, 12, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, VH, 8, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, VMIDBits, 4, 4) - IDREG_FIELD(ID_AA64MMFR1_EL1, HAFDBS, 0, 4) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, ECBHB, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, ECBHB) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, CMOW, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, CMOW) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, TIDCP1, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, TIDCP1) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, nTLBPA, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, nTLBPA) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, AFP, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, AFP) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, HCX, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, HCX) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, ETS, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, ETS) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, TWED, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, TWED) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, XNX, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, XNX) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, SpecSEI, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, SpecSEI) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, PAN, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, PAN) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, LO, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, LO) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, HPDS, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, HPDS) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, VH, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, VH) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, VMIDBits, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, VMIDBits) + IDREG_FIELD_START(ID_AA64MMFR1_EL1, HAFDBS, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_AA64MMFR1_EL1, HAFDBS) IDREG_END(ID_AA64MMFR1_EL1) IDREG_START(ID_AA64MMFR2_EL1) - IDREG_FIELD(ID_AA64MMFR2_EL1, E0PD, 60, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, EVT, 56, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, BBM, 52, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, TTL, 48, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, FWB, 40, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, IDS, 36, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, AT, 32, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, ST, 28, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, NV, 24, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, CCIDX, 20, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, VARange, 16, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, IESB, 12, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, LSM, 8, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, UAO, 4, 4) - IDREG_FIELD(ID_AA64MMFR2_EL1, CnP, 0, 4) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, E0PD, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, E0PD) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, EVT, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, EVT) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, BBM, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, BBM) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, TTL, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, FWB) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, IDS, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, IDS) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, AT, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, AT) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, ST, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, ST) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, NV, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, NV) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, CCIDX, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, CCIDX) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, VARange, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, VARange) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, IESB, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, IESB) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, LSM, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, LSM) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, UAO, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, UAO) + IDREG_FIELD_START(ID_AA64MMFR2_EL1, CnP, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR2_EL1, CnP) IDREG_END(ID_AA64MMFR2_EL1) IDREG_START(ID_AA64MMFR3_EL1) - IDREG_FIELD(ID_AA64MMFR3_EL1, Spec_FPACC, 60, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, ADERR, 56, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, SDERR, 52, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, ANERR, 44, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, SNERR, 40, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, D128_2, 36, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, D128, 32, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, MEC, 28, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, AIE, 24, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, S2POE, 20, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, S1POE, 16, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, S2PIE, 12, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, S1PIE, 8, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, SCTLRX, 4, 4) - IDREG_FIELD(ID_AA64MMFR3_EL1, TCRX, 0, 4) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, Spec_FPACC, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, Spec_FPACC) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, ADERR, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, ADERR) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, SDERR, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, ANERR) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, SNERR, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, SNERR) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, D128_2, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, D128_2) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, D128, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, D128) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, MEC, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, MEC) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, AIE, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, AIE) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, S2POE, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, S2POE) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, S1POE, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, S1POE) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, S2PIE, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, S2PIE) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, S1PIE, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, S1PIE) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, SCTLRX, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, SCTLRX) + IDREG_FIELD_START(ID_AA64MMFR3_EL1, TCRX, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR3_EL1, TCRX) IDREG_END(ID_AA64MMFR3_EL1) IDREG_START(ID_AA64MMFR4_EL1) - IDREG_FIELD(ID_AA64MMFR4_EL1, MTEFGT, 60, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, SCRX, 56, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, TEV, 52, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, TPS, 48, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, SRMASK, 44, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, TLBID, 40, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, E3DSE, 36, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, EAESR, 32, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, RMEGDI, 28, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, E2H0, 24, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, NV_frac, 20, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, FGWTE3, 16, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, HACDBS, 12, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, ASID2, 8, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, EIESB, 4, 4) - IDREG_FIELD(ID_AA64MMFR4_EL1, PoPS, 0, 4) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, MTEFGT, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, MTEFGT) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, SCRX, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, SCRX) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, TEV, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, TEV) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, TPS, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, TPS) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, SRMASK, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, SRMASK) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, TLBID, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, TLBID) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, E3DSE, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, E3DSE) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, EAESR, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, EAESR) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, RMEGDI, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, RMEGDI) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, E2H0, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(14) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, E2H0) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, NV_frac, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, NV_frac) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, FGWTE3, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, FGWTE3) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, HACDBS, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, HACDBS) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, ASID2, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, ASID2) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, EIESB, 4, 4) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, EIESB) + IDREG_FIELD_START(ID_AA64MMFR4_EL1, PoPS, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64MMFR4_EL1, PoPS) IDREG_END(ID_AA64MMFR4_EL1) IDREG_START(ID_AA64PFR0_EL1) - IDREG_FIELD(ID_AA64PFR0_EL1, CSV3, 60, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, CSV2, 56, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, RME, 52, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, DIT, 48, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, AMU, 44, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, MPAM, 40, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, SEL2, 36, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, SVE, 32, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, RAS, 28, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, GIC, 24, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, AdvSIMD, 20, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, FP, 16, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, EL3, 12, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, EL2, 8, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, EL1, 4, 4) - IDREG_FIELD(ID_AA64PFR0_EL1, EL0, 0, 4) + IDREG_FIELD_START(ID_AA64PFR0_EL1, CSV3, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR0_EL1, CSV3) + IDREG_FIELD_START(ID_AA64PFR0_EL1, CSV2, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR0_EL1, CSV2) + IDREG_FIELD_START(ID_AA64PFR0_EL1, RME, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR0_EL1, RME) + IDREG_FIELD_START(ID_AA64PFR0_EL1, DIT, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, DIT) + IDREG_FIELD_START(ID_AA64PFR0_EL1, AMU, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, AMU) + IDREG_FIELD_START(ID_AA64PFR0_EL1, MPAM, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR0_EL1, MPAM) + IDREG_FIELD_START(ID_AA64PFR0_EL1, SEL2, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR0_EL1, SEL2) + IDREG_FIELD_START(ID_AA64PFR0_EL1, SVE, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR0_EL1, SVE) + IDREG_FIELD_START(ID_AA64PFR0_EL1, RAS, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR0_EL1, RAS) + IDREG_FIELD_START(ID_AA64PFR0_EL1, GIC, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR0_EL1, GIC) + IDREG_FIELD_START(ID_AA64PFR0_EL1, AdvSIMD, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64PFR0_EL1, AdvSIMD) + IDREG_FIELD_START(ID_AA64PFR0_EL1, FP, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64PFR0_EL1, FP) + IDREG_FIELD_START(ID_AA64PFR0_EL1, EL3, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, EL3) + IDREG_FIELD_START(ID_AA64PFR0_EL1, EL2, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, EL2) + IDREG_FIELD_START(ID_AA64PFR0_EL1, EL1, 4, 4) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, EL1) + IDREG_FIELD_START(ID_AA64PFR0_EL1, EL0, 0, 4) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR0_EL1, EL0) IDREG_END(ID_AA64PFR0_EL1) IDREG_START(ID_AA64PFR1_EL1) - IDREG_FIELD(ID_AA64PFR1_EL1, PFAR, 60, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, DF2, 56, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, MTEX, 52, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, THE, 48, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, GCS, 44, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, MTE_frac, 40, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, NMI, 36, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, CSV2_frac, 32, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, RNDR_trap, 28, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, SME, 24, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, RAS_frac, 12, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, MTE, 8, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, SSBS, 4, 4) - IDREG_FIELD(ID_AA64PFR1_EL1, BT, 0, 4) + IDREG_FIELD_START(ID_AA64PFR1_EL1, PFAR, 60, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, PFAR) + IDREG_FIELD_START(ID_AA64PFR1_EL1, DF2, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, DF2) + IDREG_FIELD_START(ID_AA64PFR1_EL1, MTEX, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, MTEX) + IDREG_FIELD_START(ID_AA64PFR1_EL1, THE, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, THE) + IDREG_FIELD_START(ID_AA64PFR1_EL1, GCS, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, GCS) + IDREG_FIELD_START(ID_AA64PFR1_EL1, MTE_frac, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64PFR1_EL1, MTE_frac) + IDREG_FIELD_START(ID_AA64PFR1_EL1, NMI, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, NMI) + IDREG_FIELD_START(ID_AA64PFR1_EL1, CSV2_frac, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR1_EL1, CSV2_frac) + IDREG_FIELD_START(ID_AA64PFR1_EL1, RNDR_trap, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, RNDR_trap) + IDREG_FIELD_START(ID_AA64PFR1_EL1, SME, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR1_EL1, SME) + IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, MPAM_frac) + IDREG_FIELD_START(ID_AA64PFR1_EL1, RAS_frac, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR1_EL1, RAS_frac) + IDREG_FIELD_START(ID_AA64PFR1_EL1, MTE, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR1_EL1, MTE) + IDREG_FIELD_START(ID_AA64PFR1_EL1, SSBS, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR1_EL1, SSBS) + IDREG_FIELD_START(ID_AA64PFR1_EL1, BT, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR1_EL1, BT) IDREG_END(ID_AA64PFR1_EL1) IDREG_START(ID_AA64PFR2_EL1) - IDREG_FIELD(ID_AA64PFR2_EL1, VMTETCL, 44, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, VMTETC, 40, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, VMTE, 36, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, FPMR, 32, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, MPAM2, 28, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, FGDT, 24, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, MTEEIRG, 20, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, UINJ, 16, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, GCIE, 12, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, MTEFAR, 8, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, MTESTOREONLY, 4, 4) - IDREG_FIELD(ID_AA64PFR2_EL1, MTEPERM, 0, 4) + IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTETCL) + IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETC, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTETC) + IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTE, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR2_EL1, VMTE) + IDREG_FIELD_START(ID_AA64PFR2_EL1, FPMR, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, FPMR) + IDREG_FIELD_START(ID_AA64PFR2_EL1, MPAM2, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, MPAM2) + IDREG_FIELD_START(ID_AA64PFR2_EL1, FGDT, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64PFR2_EL1, FGDT) + IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEEIRG, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEEIRG) + IDREG_FIELD_START(ID_AA64PFR2_EL1, UINJ, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, UINJ) + IDREG_FIELD_START(ID_AA64PFR2_EL1, GCIE, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, GCIE) + IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEFAR, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEFAR) + IDREG_FIELD_START(ID_AA64PFR2_EL1, MTESTOREONLY, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, MTESTOREONLY) + IDREG_FIELD_START(ID_AA64PFR2_EL1, MTEPERM, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64PFR2_EL1, MTEPERM) IDREG_END(ID_AA64PFR2_EL1) IDREG_START(ID_AA64SMFR0_EL1) - IDREG_FIELD(ID_AA64SMFR0_EL1, FA64, 63, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, LUT6, 61, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, LUTv2, 60, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SMEver, 56, 4) - IDREG_FIELD(ID_AA64SMFR0_EL1, I16I64, 52, 4) - IDREG_FIELD(ID_AA64SMFR0_EL1, F64F64, 48, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, I16I32, 44, 4) - IDREG_FIELD(ID_AA64SMFR0_EL1, B16B16, 43, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, F16F16, 42, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, F8F16, 41, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, F8F32, 40, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, I8I32, 36, 4) - IDREG_FIELD(ID_AA64SMFR0_EL1, F16F32, 35, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, B16F32, 34, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, BI32I32, 33, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, F32F32, 32, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP4, 29, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SF8DP2, 28, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, AES, 24, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SFEXPA, 23, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, STMOP, 16, 1) - IDREG_FIELD(ID_AA64SMFR0_EL1, SMOP4, 0, 1) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, FA64, 63, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, LUT6) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUTv2, 60, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, LUTv2) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMEver, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SMEver) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, I16I64, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F64F64) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, I16I32, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, B16B16, 43, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, B16B16) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F16F16, 42, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F16F16) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F8F16, 41, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F8F16) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F8F32, 40, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F8F32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, I8I32, 36, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, I8I32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F16F32, 35, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F16F32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, B16F32, 34, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, B16F32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, BI32I32, 33, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, BI32I32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, F32F32, 32, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8FMA) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8DP4, 29, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP4) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8DP2, 28, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SBitPerm) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, AES, 24, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, AES) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SFEXPA, 23, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, STMOP, 16, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, STMOP) + IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64SMFR0_EL1, SMOP4) IDREG_END(ID_AA64SMFR0_EL1) IDREG_START(ID_AA64ZFR0_EL1) - IDREG_FIELD(ID_AA64ZFR0_EL1, F64MM, 56, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, F32MM, 52, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, F16MM, 48, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, I8MM, 44, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, SM4, 40, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, SHA3, 32, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, B16B16, 24, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, BF16, 20, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, BitPerm, 16, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, EltPerm, 12, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, AES, 4, 4) - IDREG_FIELD(ID_AA64ZFR0_EL1, SVEver, 0, 4) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, F64MM) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, F32MM, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, F32MM) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, F16MM, 48, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, F16MM) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, I8MM, 44, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, I8MM) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, SM4, 40, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, SHA3, 32, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, SHA3) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, B16B16) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, BF16, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, BF16) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, BitPerm, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, BitPerm) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, EltPerm, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, AES) + IDREG_FIELD_START(ID_AA64ZFR0_EL1, SVEver, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_AA64ZFR0_EL1, SVEver) IDREG_END(ID_AA64ZFR0_EL1) IDREG_START(ID_AFR0_EL1) IDREG_END(ID_AFR0_EL1) IDREG_START(ID_DFR0_EL1) - IDREG_FIELD(ID_DFR0_EL1, TraceFilt, 28, 4) - IDREG_FIELD(ID_DFR0_EL1, PerfMon, 24, 4) - IDREG_FIELD(ID_DFR0_EL1, MProfDbg, 20, 4) - IDREG_FIELD(ID_DFR0_EL1, MMapTrc, 16, 4) - IDREG_FIELD(ID_DFR0_EL1, CopTrc, 12, 4) - IDREG_FIELD(ID_DFR0_EL1, MMapDbg, 8, 4) + IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_DFR0_EL1, TraceFilt) + IDREG_FIELD_START(ID_DFR0_EL1, PerfMon, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_ARCH_VAL(8) + IDREG_FIELD_ARCH_VAL(9) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_DFR0_EL1, PerfMon) + IDREG_FIELD_START(ID_DFR0_EL1, MProfDbg, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_DFR0_EL1, MProfDbg) + IDREG_FIELD_START(ID_DFR0_EL1, MMapTrc, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_DFR0_EL1, MMapTrc) + IDREG_FIELD_START(ID_DFR0_EL1, CopTrc, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_DFR0_EL1, CopTrc) + IDREG_FIELD_START(ID_DFR0_EL1, MMapDbg, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_END(ID_DFR0_EL1, MMapDbg) IDREG_FIELD(ID_DFR0_EL1, CopSDbg, 4, 4) - IDREG_FIELD(ID_DFR0_EL1, CopDbg, 0, 4) + IDREG_FIELD_START(ID_DFR0_EL1, CopDbg, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_ARCH_VAL(8) + IDREG_FIELD_ARCH_VAL(9) + IDREG_FIELD_ARCH_VAL(10) + IDREG_FIELD_ARCH_VAL(11) + IDREG_FIELD_END(ID_DFR0_EL1, CopDbg) IDREG_END(ID_DFR0_EL1) IDREG_START(ID_DFR1_EL1) - IDREG_FIELD(ID_DFR1_EL1, HPMN0, 4, 4) - IDREG_FIELD(ID_DFR1_EL1, MTPMU, 0, 4) + IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_DFR1_EL1, HPMN0) + IDREG_FIELD_START(ID_DFR1_EL1, MTPMU, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_DFR1_EL1, MTPMU) IDREG_END(ID_DFR1_EL1) IDREG_START(ID_ISAR0_EL1) - IDREG_FIELD(ID_ISAR0_EL1, Divide, 24, 4) - IDREG_FIELD(ID_ISAR0_EL1, Debug, 20, 4) - IDREG_FIELD(ID_ISAR0_EL1, Coproc, 16, 4) - IDREG_FIELD(ID_ISAR0_EL1, CmpBranch, 12, 4) - IDREG_FIELD(ID_ISAR0_EL1, BitField, 8, 4) - IDREG_FIELD(ID_ISAR0_EL1, BitCount, 4, 4) - IDREG_FIELD(ID_ISAR0_EL1, Swap, 0, 4) + IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR0_EL1, Divide) + IDREG_FIELD_START(ID_ISAR0_EL1, Debug, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR0_EL1, Debug) + IDREG_FIELD_START(ID_ISAR0_EL1, Coproc, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_ISAR0_EL1, Coproc) + IDREG_FIELD_START(ID_ISAR0_EL1, CmpBranch, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR0_EL1, CmpBranch) + IDREG_FIELD_START(ID_ISAR0_EL1, BitField, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR0_EL1, BitField) + IDREG_FIELD_START(ID_ISAR0_EL1, BitCount, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR0_EL1, BitCount) + IDREG_FIELD_START(ID_ISAR0_EL1, Swap, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR0_EL1, Swap) IDREG_END(ID_ISAR0_EL1) IDREG_START(ID_ISAR1_EL1) - IDREG_FIELD(ID_ISAR1_EL1, Jazelle, 28, 4) - IDREG_FIELD(ID_ISAR1_EL1, Interwork, 24, 4) - IDREG_FIELD(ID_ISAR1_EL1, Immediate, 20, 4) - IDREG_FIELD(ID_ISAR1_EL1, IfThen, 16, 4) - IDREG_FIELD(ID_ISAR1_EL1, Extend, 12, 4) - IDREG_FIELD(ID_ISAR1_EL1, Except_AR, 8, 4) - IDREG_FIELD(ID_ISAR1_EL1, Except, 4, 4) - IDREG_FIELD(ID_ISAR1_EL1, Endian, 0, 4) + IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, Jazelle) + IDREG_FIELD_START(ID_ISAR1_EL1, Interwork, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_ISAR1_EL1, Interwork) + IDREG_FIELD_START(ID_ISAR1_EL1, Immediate, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, Immediate) + IDREG_FIELD_START(ID_ISAR1_EL1, IfThen, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, IfThen) + IDREG_FIELD_START(ID_ISAR1_EL1, Extend, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR1_EL1, Extend) + IDREG_FIELD_START(ID_ISAR1_EL1, Except_AR, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, Except_AR) + IDREG_FIELD_START(ID_ISAR1_EL1, Except, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, Except) + IDREG_FIELD_START(ID_ISAR1_EL1, Endian, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR1_EL1, Endian) IDREG_END(ID_ISAR1_EL1) IDREG_START(ID_ISAR2_EL1) - IDREG_FIELD(ID_ISAR2_EL1, Reversal, 28, 4) - IDREG_FIELD(ID_ISAR2_EL1, PSR_AR, 24, 4) - IDREG_FIELD(ID_ISAR2_EL1, MultU, 20, 4) - IDREG_FIELD(ID_ISAR2_EL1, MultS, 16, 4) - IDREG_FIELD(ID_ISAR2_EL1, Mult, 12, 4) - IDREG_FIELD(ID_ISAR2_EL1, MultiAccessInt, 8, 4) - IDREG_FIELD(ID_ISAR2_EL1, MemHint, 4, 4) - IDREG_FIELD(ID_ISAR2_EL1, LoadStore, 0, 4) + IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR2_EL1, Reversal) + IDREG_FIELD_START(ID_ISAR2_EL1, PSR_AR, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR2_EL1, PSR_AR) + IDREG_FIELD_START(ID_ISAR2_EL1, MultU, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR2_EL1, MultU) + IDREG_FIELD_START(ID_ISAR2_EL1, MultS, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_ISAR2_EL1, MultS) + IDREG_FIELD_START(ID_ISAR2_EL1, Mult, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR2_EL1, Mult) + IDREG_FIELD_START(ID_ISAR2_EL1, MultiAccessInt, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR2_EL1, MultiAccessInt) + IDREG_FIELD_START(ID_ISAR2_EL1, MemHint, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_ISAR2_EL1, MemHint) + IDREG_FIELD_START(ID_ISAR2_EL1, LoadStore, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR2_EL1, LoadStore) IDREG_END(ID_ISAR2_EL1) IDREG_START(ID_ISAR3_EL1) - IDREG_FIELD(ID_ISAR3_EL1, T32EE, 28, 4) - IDREG_FIELD(ID_ISAR3_EL1, TrueNOP, 24, 4) - IDREG_FIELD(ID_ISAR3_EL1, T32Copy, 20, 4) - IDREG_FIELD(ID_ISAR3_EL1, TabBranch, 16, 4) - IDREG_FIELD(ID_ISAR3_EL1, SynchPrim, 12, 4) - IDREG_FIELD(ID_ISAR3_EL1, SVC, 8, 4) - IDREG_FIELD(ID_ISAR3_EL1, SIMD, 4, 4) - IDREG_FIELD(ID_ISAR3_EL1, Saturate, 0, 4) + IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, T32EE) + IDREG_FIELD_START(ID_ISAR3_EL1, TrueNOP, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, TrueNOP) + IDREG_FIELD_START(ID_ISAR3_EL1, T32Copy, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, T32Copy) + IDREG_FIELD_START(ID_ISAR3_EL1, TabBranch, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, TabBranch) + IDREG_FIELD_START(ID_ISAR3_EL1, SynchPrim, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR3_EL1, SynchPrim) + IDREG_FIELD_START(ID_ISAR3_EL1, SVC, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, SVC) + IDREG_FIELD_START(ID_ISAR3_EL1, SIMD, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_ISAR3_EL1, SIMD) + IDREG_FIELD_START(ID_ISAR3_EL1, Saturate, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR3_EL1, Saturate) IDREG_END(ID_ISAR3_EL1) IDREG_START(ID_ISAR4_EL1) - IDREG_FIELD(ID_ISAR4_EL1, SWP_frac, 28, 4) - IDREG_FIELD(ID_ISAR4_EL1, PSR_M, 24, 4) - IDREG_FIELD(ID_ISAR4_EL1, SynchPrim_frac, 20, 4) - IDREG_FIELD(ID_ISAR4_EL1, Barrier, 16, 4) - IDREG_FIELD(ID_ISAR4_EL1, SMC, 12, 4) - IDREG_FIELD(ID_ISAR4_EL1, Writeback, 8, 4) - IDREG_FIELD(ID_ISAR4_EL1, WithShifts, 4, 4) - IDREG_FIELD(ID_ISAR4_EL1, Unpriv, 0, 4) + IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR4_EL1, SWP_frac) + IDREG_FIELD_START(ID_ISAR4_EL1, PSR_M, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR4_EL1, PSR_M) + IDREG_FIELD_START(ID_ISAR4_EL1, SynchPrim_frac, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_ISAR4_EL1, SynchPrim_frac) + IDREG_FIELD_START(ID_ISAR4_EL1, Barrier, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR4_EL1, Barrier) + IDREG_FIELD_START(ID_ISAR4_EL1, SMC, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR4_EL1, SMC) + IDREG_FIELD_START(ID_ISAR4_EL1, Writeback, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR4_EL1, Writeback) + IDREG_FIELD_START(ID_ISAR4_EL1, WithShifts, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_ISAR4_EL1, WithShifts) + IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR4_EL1, Unpriv) IDREG_END(ID_ISAR4_EL1) IDREG_START(ID_ISAR5_EL1) - IDREG_FIELD(ID_ISAR5_EL1, VCMA, 28, 4) - IDREG_FIELD(ID_ISAR5_EL1, RDM, 24, 4) - IDREG_FIELD(ID_ISAR5_EL1, CRC32, 16, 4) - IDREG_FIELD(ID_ISAR5_EL1, SHA2, 12, 4) - IDREG_FIELD(ID_ISAR5_EL1, SHA1, 8, 4) - IDREG_FIELD(ID_ISAR5_EL1, AES, 4, 4) - IDREG_FIELD(ID_ISAR5_EL1, SEVL, 0, 4) + IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, VCMA) + IDREG_FIELD_START(ID_ISAR5_EL1, RDM, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, RDM) + IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, CRC32) + IDREG_FIELD_START(ID_ISAR5_EL1, SHA2, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, SHA2) + IDREG_FIELD_START(ID_ISAR5_EL1, SHA1, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, SHA1) + IDREG_FIELD_START(ID_ISAR5_EL1, AES, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR5_EL1, AES) + IDREG_FIELD_START(ID_ISAR5_EL1, SEVL, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR5_EL1, SEVL) IDREG_END(ID_ISAR5_EL1) IDREG_START(ID_ISAR6_EL1) - IDREG_FIELD(ID_ISAR6_EL1, CLRBHB, 28, 4) - IDREG_FIELD(ID_ISAR6_EL1, I8MM, 24, 4) - IDREG_FIELD(ID_ISAR6_EL1, BF16, 20, 4) - IDREG_FIELD(ID_ISAR6_EL1, SPECRES, 16, 4) - IDREG_FIELD(ID_ISAR6_EL1, SB, 12, 4) - IDREG_FIELD(ID_ISAR6_EL1, FHM, 8, 4) - IDREG_FIELD(ID_ISAR6_EL1, DP, 4, 4) - IDREG_FIELD(ID_ISAR6_EL1, JSCVT, 0, 4) + IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, CLRBHB) + IDREG_FIELD_START(ID_ISAR6_EL1, I8MM, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, I8MM) + IDREG_FIELD_START(ID_ISAR6_EL1, BF16, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, BF16) + IDREG_FIELD_START(ID_ISAR6_EL1, SPECRES, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_ISAR6_EL1, SPECRES) + IDREG_FIELD_START(ID_ISAR6_EL1, SB, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, SB) + IDREG_FIELD_START(ID_ISAR6_EL1, FHM, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, FHM) + IDREG_FIELD_START(ID_ISAR6_EL1, DP, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, DP) + IDREG_FIELD_START(ID_ISAR6_EL1, JSCVT, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_ISAR6_EL1, JSCVT) IDREG_END(ID_ISAR6_EL1) IDREG_START(ID_MMFR0_EL1) - IDREG_FIELD(ID_MMFR0_EL1, InnerShr, 28, 4) - IDREG_FIELD(ID_MMFR0_EL1, FCSE, 24, 4) - IDREG_FIELD(ID_MMFR0_EL1, AuxReg, 20, 4) - IDREG_FIELD(ID_MMFR0_EL1, TCM, 16, 4) - IDREG_FIELD(ID_MMFR0_EL1, ShareLvl, 12, 4) - IDREG_FIELD(ID_MMFR0_EL1, OuterShr, 8, 4) - IDREG_FIELD(ID_MMFR0_EL1, PMSA, 4, 4) - IDREG_FIELD(ID_MMFR0_EL1, VMSA, 0, 4) + IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_MMFR0_EL1, InnerShr) + IDREG_FIELD_START(ID_MMFR0_EL1, FCSE, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR0_EL1, FCSE) + IDREG_FIELD_START(ID_MMFR0_EL1, AuxReg, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR0_EL1, AuxReg) + IDREG_FIELD_START(ID_MMFR0_EL1, TCM, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR0_EL1, TCM) + IDREG_FIELD_START(ID_MMFR0_EL1, ShareLvl, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR0_EL1, ShareLvl) + IDREG_FIELD_START(ID_MMFR0_EL1, OuterShr, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_MMFR0_EL1, OuterShr) + IDREG_FIELD_START(ID_MMFR0_EL1, PMSA, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR0_EL1, PMSA) + IDREG_FIELD_START(ID_MMFR0_EL1, VMSA, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_END(ID_MMFR0_EL1, VMSA) IDREG_END(ID_MMFR0_EL1) IDREG_START(ID_MMFR1_EL1) - IDREG_FIELD(ID_MMFR1_EL1, BPred, 28, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1TstCln, 24, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1Uni, 20, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1Hvd, 16, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1UniSW, 12, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1HvdSW, 8, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1UniVA, 4, 4) - IDREG_FIELD(ID_MMFR1_EL1, L1HvdVA, 0, 4) + IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(ID_MMFR1_EL1, BPred) + IDREG_FIELD_START(ID_MMFR1_EL1, L1TstCln, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR1_EL1, L1TstCln) + IDREG_FIELD_START(ID_MMFR1_EL1, L1Uni, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR1_EL1, L1Uni) + IDREG_FIELD_START(ID_MMFR1_EL1, L1Hvd, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR1_EL1, L1Hvd) + IDREG_FIELD_START(ID_MMFR1_EL1, L1UniSW, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR1_EL1, L1UniSW) + IDREG_FIELD_START(ID_MMFR1_EL1, L1HvdSW, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR1_EL1, L1HvdSW) + IDREG_FIELD_START(ID_MMFR1_EL1, L1UniVA, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR1_EL1, L1UniVA) + IDREG_FIELD_START(ID_MMFR1_EL1, L1HvdVA, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR1_EL1, L1HvdVA) IDREG_END(ID_MMFR1_EL1) IDREG_START(ID_MMFR2_EL1) - IDREG_FIELD(ID_MMFR2_EL1, HWAccFlg, 28, 4) - IDREG_FIELD(ID_MMFR2_EL1, WFIStall, 24, 4) - IDREG_FIELD(ID_MMFR2_EL1, MemBarr, 20, 4) - IDREG_FIELD(ID_MMFR2_EL1, UniTLB, 16, 4) + IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR2_EL1, HWAccFlg) + IDREG_FIELD_START(ID_MMFR2_EL1, WFIStall, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR2_EL1, WFIStall) + IDREG_FIELD_START(ID_MMFR2_EL1, MemBarr, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR2_EL1, MemBarr) + IDREG_FIELD_START(ID_MMFR2_EL1, UniTLB, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_END(ID_MMFR2_EL1, UniTLB) IDREG_FIELD(ID_MMFR2_EL1, HvdTLB, 12, 4) - IDREG_FIELD(ID_MMFR2_EL1, L1HvdRng, 8, 4) - IDREG_FIELD(ID_MMFR2_EL1, L1HvdBG, 4, 4) - IDREG_FIELD(ID_MMFR2_EL1, L1HvdFG, 0, 4) + IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdRng, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdRng) + IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdBG, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdBG) + IDREG_FIELD_START(ID_MMFR2_EL1, L1HvdFG, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR2_EL1, L1HvdFG) IDREG_END(ID_MMFR2_EL1) IDREG_START(ID_MMFR3_EL1) - IDREG_FIELD(ID_MMFR3_EL1, Supersec, 28, 4) - IDREG_FIELD(ID_MMFR3_EL1, CMemSz, 24, 4) - IDREG_FIELD(ID_MMFR3_EL1, CohWalk, 20, 4) - IDREG_FIELD(ID_MMFR3_EL1, PAN, 16, 4) - IDREG_FIELD(ID_MMFR3_EL1, MaintBcst, 12, 4) - IDREG_FIELD(ID_MMFR3_EL1, BPMaint, 8, 4) - IDREG_FIELD(ID_MMFR3_EL1, CMaintSW, 4, 4) - IDREG_FIELD(ID_MMFR3_EL1, CMaintVA, 0, 4) + IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_MMFR3_EL1, Supersec) + IDREG_FIELD_START(ID_MMFR3_EL1, CMemSz, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR3_EL1, CMemSz) + IDREG_FIELD_START(ID_MMFR3_EL1, CohWalk, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR3_EL1, CohWalk) + IDREG_FIELD_START(ID_MMFR3_EL1, PAN, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR3_EL1, PAN) + IDREG_FIELD_START(ID_MMFR3_EL1, MaintBcst, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR3_EL1, MaintBcst) + IDREG_FIELD_START(ID_MMFR3_EL1, BPMaint, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR3_EL1, BPMaint) + IDREG_FIELD_START(ID_MMFR3_EL1, CMaintSW, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR3_EL1, CMaintSW) + IDREG_FIELD_START(ID_MMFR3_EL1, CMaintVA, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR3_EL1, CMaintVA) IDREG_END(ID_MMFR3_EL1) IDREG_START(ID_MMFR4_EL1) - IDREG_FIELD(ID_MMFR4_EL1, EVT, 28, 4) - IDREG_FIELD(ID_MMFR4_EL1, CCIDX, 24, 4) - IDREG_FIELD(ID_MMFR4_EL1, LSM, 20, 4) - IDREG_FIELD(ID_MMFR4_EL1, HPDS, 16, 4) - IDREG_FIELD(ID_MMFR4_EL1, CnP, 12, 4) - IDREG_FIELD(ID_MMFR4_EL1, XNX, 8, 4) - IDREG_FIELD(ID_MMFR4_EL1, AC2, 4, 4) - IDREG_FIELD(ID_MMFR4_EL1, SpecSEI, 0, 4) + IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR4_EL1, EVT) + IDREG_FIELD_START(ID_MMFR4_EL1, CCIDX, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, CCIDX) + IDREG_FIELD_START(ID_MMFR4_EL1, LSM, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, LSM) + IDREG_FIELD_START(ID_MMFR4_EL1, HPDS, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_MMFR4_EL1, HPDS) + IDREG_FIELD_START(ID_MMFR4_EL1, CnP, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, CnP) + IDREG_FIELD_START(ID_MMFR4_EL1, XNX, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, XNX) + IDREG_FIELD_START(ID_MMFR4_EL1, AC2, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, AC2) + IDREG_FIELD_START(ID_MMFR4_EL1, SpecSEI, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR4_EL1, SpecSEI) IDREG_END(ID_MMFR4_EL1) IDREG_START(ID_MMFR5_EL1) - IDREG_FIELD(ID_MMFR5_EL1, nTLBPA, 4, 4) - IDREG_FIELD(ID_MMFR5_EL1, ETS, 0, 4) + IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_MMFR5_EL1, nTLBPA) + IDREG_FIELD_START(ID_MMFR5_EL1, ETS, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_MMFR5_EL1, ETS) IDREG_END(ID_MMFR5_EL1) IDREG_START(ID_PFR0_EL1) - IDREG_FIELD(ID_PFR0_EL1, RAS, 28, 4) - IDREG_FIELD(ID_PFR0_EL1, DIT, 24, 4) - IDREG_FIELD(ID_PFR0_EL1, AMU, 20, 4) - IDREG_FIELD(ID_PFR0_EL1, CSV2, 16, 4) - IDREG_FIELD(ID_PFR0_EL1, State3, 12, 4) - IDREG_FIELD(ID_PFR0_EL1, State2, 8, 4) - IDREG_FIELD(ID_PFR0_EL1, State1, 4, 4) - IDREG_FIELD(ID_PFR0_EL1, State0, 0, 4) + IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_PFR0_EL1, RAS) + IDREG_FIELD_START(ID_PFR0_EL1, DIT, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR0_EL1, DIT) + IDREG_FIELD_START(ID_PFR0_EL1, AMU, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR0_EL1, AMU) + IDREG_FIELD_START(ID_PFR0_EL1, CSV2, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR0_EL1, CSV2) + IDREG_FIELD_START(ID_PFR0_EL1, State3, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR0_EL1, State3) + IDREG_FIELD_START(ID_PFR0_EL1, State2, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR0_EL1, State2) + IDREG_FIELD_START(ID_PFR0_EL1, State1, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_PFR0_EL1, State1) + IDREG_FIELD_START(ID_PFR0_EL1, State0, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR0_EL1, State0) IDREG_END(ID_PFR0_EL1) IDREG_START(ID_PFR1_EL1) - IDREG_FIELD(ID_PFR1_EL1, GIC, 28, 4) - IDREG_FIELD(ID_PFR1_EL1, Virt_frac, 24, 4) - IDREG_FIELD(ID_PFR1_EL1, Sec_frac, 20, 4) - IDREG_FIELD(ID_PFR1_EL1, GenTimer, 16, 4) - IDREG_FIELD(ID_PFR1_EL1, Virtualization, 12, 4) - IDREG_FIELD(ID_PFR1_EL1, MProgMod, 8, 4) - IDREG_FIELD(ID_PFR1_EL1, Security, 4, 4) - IDREG_FIELD(ID_PFR1_EL1, ProgMod, 0, 4) + IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(ID_PFR1_EL1, GIC) + IDREG_FIELD_START(ID_PFR1_EL1, Virt_frac, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR1_EL1, Virt_frac) + IDREG_FIELD_START(ID_PFR1_EL1, Sec_frac, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR1_EL1, Sec_frac) + IDREG_FIELD_START(ID_PFR1_EL1, GenTimer, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR1_EL1, GenTimer) + IDREG_FIELD_START(ID_PFR1_EL1, Virtualization, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR1_EL1, Virtualization) + IDREG_FIELD_START(ID_PFR1_EL1, MProgMod, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR1_EL1, MProgMod) + IDREG_FIELD_START(ID_PFR1_EL1, Security, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(ID_PFR1_EL1, Security) + IDREG_FIELD_START(ID_PFR1_EL1, ProgMod, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR1_EL1, ProgMod) IDREG_END(ID_PFR1_EL1) IDREG_START(ID_PFR2_EL1) - IDREG_FIELD(ID_PFR2_EL1, RAS_frac, 8, 4) - IDREG_FIELD(ID_PFR2_EL1, SSBS, 4, 4) - IDREG_FIELD(ID_PFR2_EL1, CSV3, 0, 4) + IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR2_EL1, RAS_frac) + IDREG_FIELD_START(ID_PFR2_EL1, SSBS, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR2_EL1, SSBS) + IDREG_FIELD_START(ID_PFR2_EL1, CSV3, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(ID_PFR2_EL1, CSV3) IDREG_END(ID_PFR2_EL1) IDREG_START(MIDR_EL1) - IDREG_FIELD(MIDR_EL1, Implementer, 24, 8) + IDREG_FIELD_START(MIDR_EL1, Implementer, 24, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(65) + IDREG_FIELD_ARCH_VAL(66) + IDREG_FIELD_ARCH_VAL(67) + IDREG_FIELD_ARCH_VAL(68) + IDREG_FIELD_ARCH_VAL(70) + IDREG_FIELD_ARCH_VAL(73) + IDREG_FIELD_ARCH_VAL(77) + IDREG_FIELD_ARCH_VAL(78) + IDREG_FIELD_ARCH_VAL(80) + IDREG_FIELD_ARCH_VAL(81) + IDREG_FIELD_ARCH_VAL(86) + IDREG_FIELD_ARCH_VAL(105) + IDREG_FIELD_ARCH_VAL(192) + IDREG_FIELD_END(MIDR_EL1, Implementer) IDREG_FIELD(MIDR_EL1, Variant, 20, 4) - IDREG_FIELD(MIDR_EL1, Architecture, 16, 4) + IDREG_FIELD_START(MIDR_EL1, Architecture, 16, 4) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_ARCH_VAL(5) + IDREG_FIELD_ARCH_VAL(6) + IDREG_FIELD_ARCH_VAL(7) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(MIDR_EL1, Architecture) IDREG_FIELD(MIDR_EL1, PartNum, 4, 12) IDREG_FIELD(MIDR_EL1, Revision, 0, 4) IDREG_END(MIDR_EL1) IDREG_START(MPIDR_EL1) IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8) - IDREG_FIELD(MPIDR_EL1, U, 30, 1) - IDREG_FIELD(MPIDR_EL1, MT, 24, 1) + IDREG_FIELD_START(MPIDR_EL1, U, 30, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MPIDR_EL1, U) + IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MPIDR_EL1, MT) IDREG_FIELD(MPIDR_EL1, Aff2, 16, 8) IDREG_FIELD(MPIDR_EL1, Aff1, 8, 8) IDREG_FIELD(MPIDR_EL1, Aff0, 0, 8) IDREG_END(MPIDR_EL1) IDREG_START(MVFR0_EL1) - IDREG_FIELD(MVFR0_EL1, FPRound, 28, 4) - IDREG_FIELD(MVFR0_EL1, FPShVec, 24, 4) - IDREG_FIELD(MVFR0_EL1, FPSqrt, 20, 4) - IDREG_FIELD(MVFR0_EL1, FPDivide, 16, 4) - IDREG_FIELD(MVFR0_EL1, FPTrap, 12, 4) - IDREG_FIELD(MVFR0_EL1, FPDP, 8, 4) - IDREG_FIELD(MVFR0_EL1, FPSP, 4, 4) - IDREG_FIELD(MVFR0_EL1, SIMDReg, 0, 4) + IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR0_EL1, FPRound) + IDREG_FIELD_START(MVFR0_EL1, FPShVec, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR0_EL1, FPShVec) + IDREG_FIELD_START(MVFR0_EL1, FPSqrt, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR0_EL1, FPSqrt) + IDREG_FIELD_START(MVFR0_EL1, FPDivide, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR0_EL1, FPDivide) + IDREG_FIELD_START(MVFR0_EL1, FPTrap, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR0_EL1, FPTrap) + IDREG_FIELD_START(MVFR0_EL1, FPDP, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(MVFR0_EL1, FPDP) + IDREG_FIELD_START(MVFR0_EL1, FPSP, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(MVFR0_EL1, FPSP) + IDREG_FIELD_START(MVFR0_EL1, SIMDReg, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(MVFR0_EL1, SIMDReg) IDREG_END(MVFR0_EL1) IDREG_START(MVFR1_EL1) - IDREG_FIELD(MVFR1_EL1, SIMDFMAC, 28, 4) - IDREG_FIELD(MVFR1_EL1, FPHP, 24, 4) - IDREG_FIELD(MVFR1_EL1, SIMDHP, 20, 4) - IDREG_FIELD(MVFR1_EL1, SIMDSP, 16, 4) - IDREG_FIELD(MVFR1_EL1, SIMDInt, 12, 4) - IDREG_FIELD(MVFR1_EL1, SIMDLS, 8, 4) - IDREG_FIELD(MVFR1_EL1, FPDNaN, 4, 4) - IDREG_FIELD(MVFR1_EL1, FPFtZ, 0, 4) + IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, SIMDFMAC) + IDREG_FIELD_START(MVFR1_EL1, FPHP, 24, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(MVFR1_EL1, FPHP) + IDREG_FIELD_START(MVFR1_EL1, SIMDHP, 20, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_END(MVFR1_EL1, SIMDHP) + IDREG_FIELD_START(MVFR1_EL1, SIMDSP, 16, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, SIMDSP) + IDREG_FIELD_START(MVFR1_EL1, SIMDInt, 12, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, SIMDInt) + IDREG_FIELD_START(MVFR1_EL1, SIMDLS, 8, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, SIMDLS) + IDREG_FIELD_START(MVFR1_EL1, FPDNaN, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, FPDNaN) + IDREG_FIELD_START(MVFR1_EL1, FPFtZ, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(MVFR1_EL1, FPFtZ) IDREG_END(MVFR1_EL1) IDREG_START(MVFR2_EL1) - IDREG_FIELD(MVFR2_EL1, FPMisc, 4, 4) - IDREG_FIELD(MVFR2_EL1, SIMDMisc, 0, 4) + IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_ARCH_VAL(4) + IDREG_FIELD_END(MVFR2_EL1, FPMisc) + IDREG_FIELD_START(MVFR2_EL1, SIMDMisc, 0, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(MVFR2_EL1, SIMDMisc) IDREG_END(MVFR2_EL1) IDREG_START(REVIDR_EL1) IDREG_END(REVIDR_EL1) IDREG_START(SMIDR_EL1) - IDREG_FIELD(SMIDR_EL1, NSMC, 56, 4) - IDREG_FIELD(SMIDR_EL1, HIP, 52, 4) + IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(SMIDR_EL1, NSMC) + IDREG_FIELD_START(SMIDR_EL1, HIP, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(SMIDR_EL1, HIP) IDREG_FIELD(SMIDR_EL1, Affinity2, 32, 20) - IDREG_FIELD(SMIDR_EL1, Implementer, 24, 8) + IDREG_FIELD_START(SMIDR_EL1, Implementer, 24, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(65) + IDREG_FIELD_ARCH_VAL(66) + IDREG_FIELD_ARCH_VAL(67) + IDREG_FIELD_ARCH_VAL(68) + IDREG_FIELD_ARCH_VAL(70) + IDREG_FIELD_ARCH_VAL(73) + IDREG_FIELD_ARCH_VAL(77) + IDREG_FIELD_ARCH_VAL(78) + IDREG_FIELD_ARCH_VAL(80) + IDREG_FIELD_ARCH_VAL(81) + IDREG_FIELD_ARCH_VAL(86) + IDREG_FIELD_ARCH_VAL(105) + IDREG_FIELD_ARCH_VAL(192) + IDREG_FIELD_END(SMIDR_EL1, Implementer) IDREG_FIELD(SMIDR_EL1, Revision, 16, 8) - IDREG_FIELD(SMIDR_EL1, SMPS, 15, 1) - IDREG_FIELD(SMIDR_EL1, SH, 13, 2) + IDREG_FIELD_START(SMIDR_EL1, SMPS, 15, 1) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_END(SMIDR_EL1, SMPS) + IDREG_FIELD_START(SMIDR_EL1, SH, 13, 2) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(1) + IDREG_FIELD_ARCH_VAL(2) + IDREG_FIELD_ARCH_VAL(3) + IDREG_FIELD_END(SMIDR_EL1, SH) IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12) IDREG_END(SMIDR_EL1)
scripts/update-aarch64-cpu-sysreg-properties.py +73 -4
109 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH v6 08/17] target/arm/cpu-idregs.h.inc: Generate enum values
From f0e489cebdac1ba94b8082bc240f2d889555f7ea Mon Sep 17 00:00:00 2001
From: Khushit Shah <[email protected]>
Date: Fri, 19 Jun 2026 11:54:29 +0530
Subject: [PATCH] scripts: bug fixes in update-aarch64-cpu-sysreg-properties
---
While rebasing I found two bugs here:
- It outputs incorrect value for field that defined a ValueRange. For example, CTX_CMPs (and all similar fields).
- decimal 10 might be incorrectly parsed as to 2.
Sending inline patch that I have added.
--- .../update-aarch64-cpu-sysreg-properties.py | 56 ++++++++++++------- 1 file changed, 35 insertions(+), 21 deletions(-) mode change 100644 => 100755 scripts/update-aarch64-cpu-sysreg-properties.py
scripts/update-aarch64-cpu-sysreg-properties.py +35 -21
@@ -106,6 +106,29 @@ def collect_fields(item, bit_offset=0): return fields +def parse_value_int(raw_val): + if raw_val is None or isinstance(raw_val, bool): + return None + + # may already be real number + if isinstance(raw_val, int): + return raw_val + + raw_str = str(raw_val).strip() + + if "'" in raw_str: + # quoted bitstring like "'0100'" + bits = raw_str.replace("'", "") + try: + return int(bits, 2) + except ValueError: + return None + + # unquoted, try decimal + try: + return int(raw_str, 0) + except ValueError: + return None def extract_field_enums(field): enums = []
@@ -124,32 +147,23 @@ def extract_field_enums(field): if not isinstance(val_entries, list): return enums + # A Values.ValueRange field specifies start and end value for a range. + # Don't enumerate anything for them. + for val_entry in val_entries: + if isinstance(val_entry, dict) and \ + val_entry.get("_type") == "Values.ValueRange": + return [] + for val_entry in val_entries: if not isinstance(val_entry, dict): continue - + if val_entry.get("_type") == "Values.Value": - raw_val = val_entry.get("value") - if raw_val is None: + int_val = parse_value_int(val_entry.get("value")) + if int_val is None: continue - - # some of the values have ' like "'0100'" - raw_val_str = str(raw_val).strip().replace("'", "") - - try: - # convert into bin - int_val = int(raw_val_str, 2) - except ValueError: - try: - # Fallback to dec if not bin - int_val = int(raw_val_str, 0) - except ValueError: - continue - - enums.append({ - 'value': int_val - }) - + enums.append({'value': int_val}) + return enums def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path):
--
2.52.0
Re: [RFC PATCH v6 08/17] target/arm/cpu-idregs.h.inc: Generate enum values
Hi Khushit,
Quoted 11 lines · Khushit Shah
From
f0e489cebdac1ba94b8082bc240f2d889555f7eaMon Sep 17 00:00:00 2001
From: Khushit Shah <[email protected]>
Date: Fri, 19 Jun 2026 11:54:29 +0530
Subject: [PATCH] scripts: bug fixes in update-aarch64-cpu-sysreg-propertiesSigned-off-by Khushit Shah <[email protected]>---
While rebasing I found two bugs here:
- It outputs incorrect value for field that defined a ValueRange. For example,CTX_CMPs(and all similar fields).
- decimal 10 might be incorrectly parsed as to 2.
OK thanks, I will integrate this in next respin
Eric
Quoted 93 lines
Sending inline patch that I have added.
--- .../update-aarch64-cpu-sysreg-properties.py | 56 ++++++++++++------- 1 file changed, 35 insertions(+), 21 deletions(-) mode change 100644 => 100755 scripts/update-aarch64-cpu-sysreg-properties.pyscripts/update-aarch64-cpu-sysreg-properties.py +35
-22@@ -106,6 +106,29 @@ def collect_fields(item, bit_offset=0): return fields +def parse_value_int(raw_val): + if raw_val is None or isinstance(raw_val, bool): + return None + + # may already be real number + if isinstance(raw_val, int): + return raw_val + + raw_str = str(raw_val).strip() + + if "'" in raw_str: + # quoted bitstring like "'0100'" + bits = raw_str.replace("'", "") + try: + return int(bits, 2) + except ValueError: + return None + + # unquoted, try decimal + try: + return int(raw_str, 0) + except ValueError: + return None def extract_field_enums(field): enums = []@@ -124,32 +147,23 @@ def extract_field_enums(field): if not isinstance(val_entries, list): return enums + # A Values.ValueRange field specifies start and end value for a range. + # Don't enumerate anything for them. + for val_entry in val_entries: + if isinstance(val_entry, dict) and \ + val_entry.get("_type") == "Values.ValueRange": + return [] + for val_entry in val_entries: if not isinstance(val_entry, dict): continue - + if val_entry.get("_type") == "Values.Value": - raw_val = val_entry.get("value") - if raw_val is None: + int_val = parse_value_int(val_entry.get("value")) + if int_val is None: continue - - # some of the values have ' like "'0100'" - raw_val_str = str(raw_val).strip().replace("'", "") - - try: - # convert into bin - int_val = int(raw_val_str, 2) - except ValueError: - try: - # Fallback to dec if not bin - int_val = int(raw_val_str, 0) - except ValueError: - continue - - enums.append({ - 'value': int_val - }) - + enums.append({'value': int_val}) + return enums def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path): --2.52.0
Re: [RFC PATCH v6 08/17] target/arm/cpu-idregs.h.inc: Generate enum values
In reply to Khushit ShahHi Kushit,
Quoted 10 lines · Khushit Shah
From
f0e489cebdac1ba94b8082bc240f2d889555f7eaMon Sep 17 00:00:00 2001
From: Khushit Shah <[email protected]>
Date: Fri, 19 Jun 2026 11:54:29 +0530
Subject: [PATCH] scripts: bug fixes in update-aarch64-cpu-sysreg-propertiesSigned-off-by Khushit Shah <[email protected]>---
While rebasing I found two bugs here:
- It outputs incorrect value for field that defined a ValueRange. For example,CTX_CMPs(and all similar fields).
I attached the diff it generates. I am not sure this is exactly what we want.
for ValueRange such as SMIDR_EL1.HIP
"_type": "Values.ValueRange", "end": {
"_type": "Values.Value", "meaning": null, "value": "'1111'" },
"meaning": null, "start": {
"_type": "Values.Value", "meaning": null, "value": "'0001'"
I guess you want all values between 1 and 15 whereas the script currently generates a single value.
Also in the diff I don't see any wrong parsing of
"decimal 10 might be incorrectly parsed as to 2" fixed by the script. Nevertheless can be a proper issue
Thanks
Eric
Quoted 90 lines
- decimal 10 might be incorrectly parsed as to 2.
Sending inline patch that I have added.
--- .../update-aarch64-cpu-sysreg-properties.py | 56 ++++++++++++------- 1 file changed, 35 insertions(+), 21 deletions(-) mode change 100644 => 100755 scripts/update-aarch64-cpu-sysreg-properties.pyscripts/update-aarch64-cpu-sysreg-properties.py +35
-22@@ -106,6 +106,29 @@ def collect_fields(item, bit_offset=0): return fields +def parse_value_int(raw_val): + if raw_val is None or isinstance(raw_val, bool): + return None + + # may already be real number + if isinstance(raw_val, int): + return raw_val + + raw_str = str(raw_val).strip() + + if "'" in raw_str: + # quoted bitstring like "'0100'" + bits = raw_str.replace("'", "") + try: + return int(bits, 2) + except ValueError: + return None + + # unquoted, try decimal + try: + return int(raw_str, 0) + except ValueError: + return None def extract_field_enums(field): enums = []@@ -124,32 +147,23 @@ def extract_field_enums(field): if not isinstance(val_entries, list): return enums + # A Values.ValueRange field specifies start and end value for a range. + # Don't enumerate anything for them. + for val_entry in val_entries: + if isinstance(val_entry, dict) and \ + val_entry.get("_type") == "Values.ValueRange": + return [] + for val_entry in val_entries: if not isinstance(val_entry, dict): continue - + if val_entry.get("_type") == "Values.Value": - raw_val = val_entry.get("value") - if raw_val is None: + int_val = parse_value_int(val_entry.get("value")) + if int_val is None: continue - - # some of the values have ' like "'0100'" - raw_val_str = str(raw_val).strip().replace("'", "") - - try: - # convert into bin - int_val = int(raw_val_str, 2) - except ValueError: - try: - # Fallback to dec if not bin - int_val = int(raw_val_str, 0) - except ValueError: - continue - - enums.append({ - 'value': int_val - }) - + enums.append({'value': int_val}) + return enums def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path): --
Quoted 4 lines
2.52.0
arm/cpu-idregs.h.inc.red renamed from arm/cpu-idregs.h.inc +22 -7
@@ -133,13 +133,17 @@ IDREG_FIELD_ARCH_VAL(5) IDREG_FIELD_ARCH_VAL(6) IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSVer) - IDREG_FIELD(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) + IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs) IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64DFR0_EL1, PMSS) - IDREG_FIELD(ID_AA64DFR0_EL1, BRPs, 12, 4) + IDREG_FIELD_START(ID_AA64DFR0_EL1, BRPs, 12, 4) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(ID_AA64DFR0_EL1, BRPs) IDREG_FIELD_START(ID_AA64DFR0_EL1, PMUVer, 8, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -192,9 +196,15 @@ IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64DFR1_EL1, SPMU) - IDREG_FIELD(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8) - IDREG_FIELD(ID_AA64DFR1_EL1, WRPs, 16, 8) - IDREG_FIELD(ID_AA64DFR1_EL1, BRPs, 8, 8) + IDREG_FIELD_START(ID_AA64DFR1_EL1, CTX_CMPs, 24, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, CTX_CMPs) + IDREG_FIELD_START(ID_AA64DFR1_EL1, WRPs, 16, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, WRPs) + IDREG_FIELD_START(ID_AA64DFR1_EL1, BRPs, 8, 8) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(ID_AA64DFR1_EL1, BRPs) IDREG_FIELD(ID_AA64DFR1_EL1, SYSPMUID, 0, 8) IDREG_END(ID_AA64DFR1_EL1)
@@ -2049,8 +2059,13 @@ IDREG_END(REVIDR_EL1) IDREG_START(SMIDR_EL1) - IDREG_FIELD(SMIDR_EL1, NSMC, 56, 4) - IDREG_FIELD(SMIDR_EL1, HIP, 52, 4) + IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_ARCH_VAL(15) + IDREG_FIELD_END(SMIDR_EL1, NSMC) + IDREG_FIELD_START(SMIDR_EL1, HIP, 52, 4) + IDREG_FIELD_ARCH_VAL(0) + IDREG_FIELD_END(SMIDR_EL1, HIP) IDREG_FIELD(SMIDR_EL1, Affinity2, 32, 20) IDREG_FIELD_START(SMIDR_EL1, Implementer, 24, 8) IDREG_FIELD_ARCH_VAL(0)
RFC PATCH v6 9/17 target/arm/cpu_idregs: generate tables for Arm64 ID registers and fields
In reply to Eric AugerFrom: Shaju Abraham <[email protected]>
Include cpu-idregs.h.inc multiple times with different definitions for the X-macros. This will generate tables for all Arm64 ID registers and their fields. Additionally, initialize the tables with all architecturally defined values. These tables will be consumed by the property layer in future patches.
---
v5 -> v6
- restored support of enum values
--- target/arm/cpu-idregs.c | 96 +++++++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 1 + 2 files changed, 97 insertions(+) create mode 100644 target/arm/cpu-idregs.c
target/arm/cpu-idregs.c new file +96 -0
@@ -0,0 +1,96 @@ +/* +* ARM ID register field table. +* +* Builds the per-id-register field descriptor arrays and the global +* arm_idregs[] table. +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "cpu.h" +#include "cpu-idregs.h" + +/* +* Generate an array of architecturely defined values for each field +* associated with enum values +*/ + +#define IDREG_START (reg) +#define IDREG_END (reg) +#define IDREG_FIELD (reg, field, shift, length) +#define IDREG_FIELD_START (reg, field, shift, length) \ + static const ArmIdRegArchVal reg##_##field##_arch_vals[] = { +#define IDREG_FIELD_ARCH_VAL (v) { (v), "" }, +#define IDREG_FIELD_END (reg, field) \ + }; + +#include "cpu-idregs.h.inc" + +#undef IDREG_START +#undef IDREG_END +#undef IDREG_FIELD +#undef IDREG_FIELD_START +#undef IDREG_FIELD_END +#undef IDREG_FIELD_ARCH_VAL + +/* generate an array of per-register ArmIdRegField[] descriptors */ + +#define IDREG_START (reg) \ + static ARM64SysRegField reg##_fields[] = { + +#define IDREG_END (reg) \ + }; + +#define IDREG_FIELD_START (reg, field, _shift, _length) \ + { \ + .name = #field, \ + .index = reg##_IDX, \ + .shift = (_shift), \ + .length = (_length), \ + .arch_vals = (ArmIdRegArchVal *)reg##_##field##_arch_vals, \ + .arch_vals_count = ARRAY_SIZE(reg##_##field##_arch_vals), \ + }, + +#define IDREG_FIELD (reg, field, _shift, _length) \ + { \ + .name = #field, \ + .index = reg##_IDX, \ + .shift = (_shift), \ + .length = (_length), \ + }, + +#define IDREG_FIELD_ARCH_VAL (v) + +#define IDREG_FIELD_END (reg, field) + +#include "cpu-idregs.h.inc" + +#undef IDREG_START +#undef IDREG_END +#undef IDREG_FIELD +#undef IDREG_FIELD_START +#undef IDREG_FIELD_END +#undef IDREG_FIELD_ARCH_VAL + +/* generate an array of top level ID registers */ + +#define IDREG_END (reg) +#define IDREG_FIELD (reg, field, shift, length) +#define IDREG_FIELD_START (reg, field, shift, length) +#define IDREG_FIELD_ARCH_VAL (v) +#define IDREG_FIELD_END (reg, field) + +#define IDREG_START (reg) \ + [reg##_IDX] = { \ + .name = #reg, \ + .index = reg##_IDX, \ + .fields = reg##_fields, \ + .fields_count = ARRAY_SIZE(reg##_fields), \ + }, + +ARM64SysReg arm64_id_regs[NUM_ID_IDX ] = { +#include "cpu-idregs.h.inc" +}; +
target/arm/meson.build +1 -0
@@ -30,6 +30,7 @@ arm_common_user_system_ss.add(when: 'TARGET_AARCH64', if_true: files( arm_common_system_ss.add(files( 'arm-qmp-cmds.c', + 'cpu-idregs.c', )) arm_system_ss.add(when: 'CONFIG_KVM', if_true: files('hyp_gdbstub.c', 'kvm.c')) arm_system_ss.add(when: 'CONFIG_HVF', if_true: files('hyp_gdbstub.c'))
Signature · 1 line
2.53.0
RFC PATCH v6 10/17 target/arm/kvm: Retrieve writable ID reg map
In reply to Eric AugerFrom: Cornelia Huck <[email protected]>
Add an helper to retrieve the writable id reg bitmask.
then retrieve the writable_map array and dispatch it in the writable_map fields of arm64_id_regs[] elements.
---
v5 -> v6
- use arm64_id_regs[].writable_map
- squashed 2 commits (helper + user)
- removed stub
--- target/arm/kvm.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
target/arm/kvm.c +61 -0
@@ -28,6 +28,7 @@#include "kvm_arm.h" #include "cpu.h" #include "cpu-sysregs.h" +#include "cpu-idregs.h" #include "trace.h" #include "internals.h" #include "hw/pci/pci.h"
@@ -51,6 +52,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {static bool cap_has_mp_state;static bool cap_has_inject_serror_esr;static bool cap_has_inject_ext_dabt; +static bool writable_map_dispatched;/** * ARMHostCPUFeatures: information about the host CPU (identified
@@ -273,6 +275,21 @@ static uint32_t kvm_arm_sve_get_vls(int fd)return vls[0 ] &MAKE_64BIT_MASK (0 ,ARM_MAX_VQ ); } +static int kvm_feature_idx_to_idregs_idx (int kidx) +{ +int op1, crm, op2; +ARMSysRegs sysreg; + + op1 = kidx /64 ; +if (op1 ==2 ) { + op1 =3 ; + } + crm = (kidx %64 ) /8 ; + op2 = kidx %8 ; + sysreg =ENCODE_ID_REG (3 , op1,0 , crm, op2); +return get_sysreg_idx (sysreg); +} +static void kvm_arm_get_host_cpu_features (ARMHostCPUFeatures *ahcf) {/* Identify the feature bits corresponding to the host CPU, and
@@ -480,9 +497,53 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ahcf->features = features; } +static int kvm_arm_get_writable_id_regs (uint64_t *idregmap) +{ +int cap_writable_id_regs; +struct reg_mask_range range = { + .range =KVM_ARM_FEATURE_ID_RANGE , + .reserved = {0 }, + .addr = (uint64_t )idregmap, + }; + + cap_writable_id_regs = +kvm_check_extension (kvm_state,KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES ); + +if (!cap_writable_id_regs || + !(cap_writable_id_regs & (1 <<KVM_ARM_FEATURE_ID_RANGE ))) { +return -ENOSYS ; + } + +if (kvm_vm_ioctl (kvm_state,KVM_ARM_GET_REG_WRITABLE_MASKS , &range)) { +return -errno; + } +return 0 ; +} +void kvm_arm_set_cpu_features_from_host (ARMCPU *cpu) {CPUARMState *env = &cpu->env; +uint64_t *writable_map; + + writable_map =g_new (uint64_t,KVM_ARM_FEATURE_ID_RANGE_SIZE ); + +if (!writable_map_dispatched && + !kvm_arm_get_writable_id_regs (writable_map)) { +for (int i =0 ; i <KVM_ARM_FEATURE_ID_RANGE_SIZE ; i++) { +uint64_t mask = writable_map[i]; + +if (mask) { +int idx =kvm_feature_idx_to_idregs_idx (i); + +if (idx <0 || idx >ARRAY_SIZE (arm64_id_regs)) { +continue ; + } + arm64_id_regs[idx].writable_mask = mask; + } + } + writable_map_dispatched = true; + } +g_free (writable_map);if (!arm_host_cpu_features.dtb_compatible) {kvm_arm_get_host_cpu_features (&arm_host_cpu_features);
Signature · 1 line
2.53.0
RFC PATCH v6 11/17 arm/kvm: Initialize all writable ID registers from host
In reply to Eric AugerWe want to allow overwriting writable fields of some ID registers. However currently some of them are never touched, neither read nor w. Examples are CLIDR_EL1, CTR_EL0, REVIDR_EL1, MIDR_EL1.
We want to initialize them from the host value, allow overwrite and write back for kvm afterwards. This patch implements the initialization.
Introduce a new get_host_cpu_idregs() helper that gets the host values for all writable ID regs and store them in isar.idregs[].
---
v5 -> v6
- do not check writable_map anymore
--- target/arm/kvm.c | 98 +++++++++++++++++++++++++++++++++++++++-- target/arm/trace-events | 2 + 2 files changed, 97 insertions(+), 3 deletions(-)
target/arm/kvm.c +95 -3
@@ -43,6 +43,7 @@#include "hw/acpi/ghes.h" #include "target/arm/gtimer.h" #include "migration/blocker.h" +#include "cpu-idregs.h" const KVMCapabilityInfo kvm_arch_required_capabilities[] = {KVM_CAP_INFO (DEVICE_CTRL ),
@@ -290,7 +291,44 @@ static int kvm_feature_idx_to_idregs_idx(int kidx)return get_sysreg_idx (sysreg); } -static void kvm_arm_get_host_cpu_features (ARMHostCPUFeatures *ahcf) +/* +* get_host_cpu_idregs: Read all the writable ID reg host values +* +* Need to be called once the writable mask has been populated +* Note we may want to read all the known id regs but some of them are not +* writable and return an error, hence the choice of reading only those which +* are writable. Those are also readable! +*/ +static int get_host_cpu_idregs (ARMCPU *cpu,int fd,ARMHostCPUFeatures *ahcf) +{ +int err =0 ; +int i; + +for (i =0 ; i <NUM_ID_IDX ; i++) { +ARM64SysReg *sysregdesc = &arm64_id_regs[i]; +ARMSysRegs sysreg = id_register_sysreg[i]; +uint64_t *reg; +int ret; + +if (!sysregdesc->writable_mask) { +continue ; + } + + reg = &ahcf->isar.idregs[i]; + ret =read_sys_reg64 (fd, reg,idregs_sysreg_to_kvm_reg (sysreg)); +trace_get_host_cpu_idregs (sysregdesc->name, *reg); +if (ret) { +error_report ("%s error reading value of host %s register (%m)" , + __func__, sysregdesc->name); + + err = ret; + } + } +return err; +} + +static void +kvm_arm_get_host_cpu_features (ARMCPU *cpu,ARMHostCPUFeatures *ahcf) {/* Identify the feature bits corresponding to the host CPU, and * fill out the ARMHostCPUClass fields accordingly. To do this
@@ -376,6 +414,16 @@ static void kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)SET_IDREG (&ahcf->isar,ID_AA64PFR0 ,0x00000011 );/* EL1&0, AArch64 only */ err =0 ; }else { +/* Make sure all writable ID reg values are initialized */ + err |=get_host_cpu_idregs (cpu, fd, ahcf); + +/* +* temporarily override the CLIDR_EL1 value since some host values +* trigger "Unified type is not implemented at level n" error in +* fdt_add_cpu_nodes() +*/ +SET_IDREG (&ahcf->isar,CLIDR ,0x0 ); + err |=get_host_cpu_reg (fd, ahcf,ID_AA64PFR1_EL1_IDX ); err |=get_host_cpu_reg (fd, ahcf,ID_AA64PFR2_EL1_IDX ); err |=get_host_cpu_reg (fd, ahcf,ID_AA64SMFR0_EL1_IDX );
@@ -546,7 +594,7 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu)g_free (writable_map);if (!arm_host_cpu_features.dtb_compatible) { -kvm_arm_get_host_cpu_features (&arm_host_cpu_features); +kvm_arm_get_host_cpu_features (cpu, &arm_host_cpu_features); } cpu->kvm_target = arm_host_cpu_features.target;
@@ -1161,6 +1209,34 @@ bool kvm_arm_cpu_post_load(ARMCPU *cpu)return true; } +/* +* Copy writable ID regs from isar.idregs[] to cpreg_list +* in case their value differs from the original init cpreg value +*/ +static void kvm_arm_writable_idregs_to_cpreg_list (ARMCPU *cpu) +{ +for (int i =0 ; i <NUM_ID_IDX ; i++) { +ARM64SysReg *sysregdesc = &arm64_id_regs[i]; +ARMSysRegs sysreg = id_register_sysreg[i]; +uint64_t previous, new; +uint64_t *cpreg; + +if (!sysregdesc->writable_mask) { +continue ; + } + + cpreg =kvm_arm_get_cpreg_ptr (cpu,idregs_sysreg_to_kvm_reg (sysreg)); + previous = *cpreg; + new = cpu->isar.idregs[i]; + +if (previous != new) { + *cpreg = new; +trace_kvm_arm_writable_idregs_to_cpreg_list (sysregdesc->name, + previous, new); + } + } +} +void kvm_arm_reset_vcpu (ARMCPU *cpu) {int ret;
@@ -2113,7 +2189,23 @@ int kvm_arch_init_vcpu(CPUState *cs) } cpu->mp_affinity = mpidr &ARM64_AFFINITY_MASK ; -return kvm_arm_init_cpreg_list (cpu); + ret =kvm_arm_init_cpreg_list (cpu); +if (ret) { +return ret; + } +/* overwrite writable ID regs with their updated property values */ +kvm_arm_writable_idregs_to_cpreg_list (cpu); + ret =write_list_to_kvmstate (cpu,KVM_PUT_FULL_STATE ); +if (!ret) { +return -1 ; + } +/* +* modified values may have changed the visibility of some regs, +* reinitialize the cpreg_list accordingly +*/ + ret =kvm_arm_init_cpreg_list (cpu); + +return ret; }int kvm_arch_destroy_vcpu (CPUState *cs)
target/arm/trace-events +2 -0
@@ -13,6 +13,8 @@ arm_gt_update_irq(int timer, int irqstate) "gt_update_irq: timer %d irqstate %d" # kvm.c kvm_arm_fixup_msi_route(uint64_t iova, uint64_t gpa) "MSI iova = 0x%"PRIx64" is translated into 0x%"PRIx64 +get_host_cpu_idregs(const char *name, uint64_t value) "scratch vcpu host value for %s is 0x%"PRIx64 +kvm_arm_writable_idregs_to_cpreg_list(const char *name, uint64_t previous, uint64_t new) "%s overwrite default 0x%"PRIx64" with 0x%"PRIx64 # cpu.c arm_cpu_reset(uint64_t mp_aff) "cpu %" PRIu64
Signature · 1 line
2.53.0
RFC PATCH v6 12/17 target/arm/kvm: Introduce kvm_arm_expose_idreg_properties
In reply to Eric AugerThis helper decode the ID reg writable mask, matches it against ID reg fields defined in target/arm/cpu-idregs.h.inc and for each writable named field, generates a uint64 property.
REVIDR_EL1 and AIDR_EL1 are writable but they do not expose any field. They will be handled separately.
---
v5 -> v6
- for enum values, check against value value when setting the prop
- do not check writable_map flag anymore
v4 -> v5:
- free prop_name
- check cpu->writable_map as a preamble in kvm_arm_expose_idreg_properties
--- target/arm/kvm_arm.h | 10 +++ target/arm/kvm.c | 144 ++++++++++++++++++++++++++++++++++++++++ target/arm/trace-events | 4 ++ 3 files changed, 158 insertions(+)
target/arm/kvm_arm.h +10 -0
@@ -142,6 +142,16 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu);*/ void kvm_arm_add_vcpu_properties (ARMCPU *cpu); +typedef struct ARM64SysReg ARM64SysReg ; +/** +* kvm_arm_expose_idreg_properties: +* @cpu: The CPU object to generate the properties for +* @reg: registers from the host +* +* analyze the writable mask and generate properties for writable fields +*/ +void kvm_arm_expose_idreg_properties (ARMCPU *cpu,ARM64SysReg *regs); +/** * kvm_arm_steal_time_finalize: * @cpu: ARMCPU for which to finalize kvm-steal-time
target/arm/kvm.c +144 -0
150 lines not on this page · raw message
target/arm/trace-events +4 -0
@@ -15,6 +15,10 @@ arm_gt_update_irq(int timer, int irqstate) "gt_update_irq: timer %d irqstate %d" kvm_arm_fixup_msi_route(uint64_t iova, uint64_t gpa) "MSI iova = 0x%"PRIx64" is translated into 0x%"PRIx64 get_host_cpu_idregs(const char *name, uint64_t value) "scratch vcpu host value for %s is 0x%"PRIx64 kvm_arm_writable_idregs_to_cpreg_list(const char *name, uint64_t previous, uint64_t new) "%s overwrite default 0x%"PRIx64" with 0x%"PRIx64 +decode_idreg_writemap(const char* name, int lower, int upper, char *prop_name) "%s [%d:%d] is writable (prop %s)" +get_sysreg_prop(const char *name, uint64_t value) "%s 0x%"PRIx64 +set_sysreg_prop(const char *name, uint64_t old, uint64_t mask, uint64_t field_value, uint64_t new) "%s old reg value=0x%"PRIx64" mask=0x%"PRIx64" new field value=0x%"PRIx64" new reg value=0x%"PRIx64 +nb_sysreg_props(const char *name, int count) "%s: %d SYSREG properties" # cpu.c arm_cpu_reset(uint64_t mp_aff) "cpu %" PRIu64
Signature · 1 line
2.53.0
RFC PATCH v6 13/17 target/arm/cpu: Expose writable ID reg field properties on the kvm host vcpu model
In reply to Eric AugerIf the host supports KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGES and KVM_ARM_GET_REG_WRITABLE_MASKS ioctl successfully retrieved the mask of writable fields for all ID regs, expose uint64 SYSREG properties for all the writable ID reg fields exposed by the host kernel which can be matched in target/arm/cpu-idregs.h.inc.
Properties are named SYSREG_<REG>_<FIELD> with REG and FIELD being those used ARCHMRS Registers.json.
When such properties are set, they override the default field value retrieved from the host and reinjected into KVM. Then the actual value being applied at KVM depends on the register, ie. it can be sanitized. In case the field value is rejected by KVM, the vpcu init fails.
Anyway there is a first attempt to write back this value into KVM.
Then legacy CPU options (virtualization, secure, ...) can still override the previous value. So low level IDREG field properties apply before the legacy ones.
An example of invocation is:
-cpu host,SYSREG_ID_AA64MMFR0_EL1_ECV=0x0
which sets ECV field of ID_AA64MMFR0_EL1 to 0 (enhanced counter virtualization).
---
v5 -> v6:
- do not check writable_map anymore
v4 -> v5:
- get rid of ret local variable, dynamically allocate and free writable_map here
--- target/arm/cpu64.c | 5 +++++ 1 file changed, 5 insertions(+)
target/arm/cpu64.c +5 -0
@@ -37,6 +37,7 @@#include "hw/core/qdev-properties.h" #include "internals.h" #include "cpu-features.h" +#include "cpu-idregs.h" /* convert between <register>_IDX and SYS_<register> */ #define DEF (NAME ,OP0 ,OP1 ,CRN ,CRM ,OP2 ) \
@@ -806,6 +807,10 @@ void aarch64_host_initfn(Object *obj)kvm_arm_set_cpreg_mig_tolerances (cpu);kvm_arm_set_cpu_features_from_host (cpu);aarch64_add_sve_properties (obj); + +/* generate SYSREG properties according to writable masks */ +kvm_arm_expose_idreg_properties (cpu, arm64_id_regs); +#elif defined(CONFIG_HVF )hvf_arm_set_cpu_features_from_host (cpu);#elif defined(CONFIG_WHPX )
Signature · 1 line
2.53.0
RFC PATCH v6 14/17 arm-qmp-cmds: introspection for ID register props
In reply to Eric AugerFrom: Cornelia Huck <[email protected]>
Implement the capability to query available ID register values by adding SYSREG_* options and values to the cpu model expansion for the host model, if available.
Excerpt:
(QEMU) query-cpu-model-expansion type=full model={"name":"host"} {"return": {"model": {"name": "host", "props": {"SYSREG_ID_AA64PFR0_EL1_EL3": 1, "SYSREG_ID_AA64ISAR2_EL1_CLRBHB": 0, "SYSREG_CTR_EL0_L1Ip": 3, "SYSREG_MIDR_EL1_PartNum": 3407, "SYSREG_CTR_EL0_DminLine": 4, "SYSREG_ID_AA64MMFR0_EL1_PARange": 5, "SYSREG_ID_AA64MMFR1_EL1_ECBHB": 0 ../..
So this allows the upper stack to detect available writable ID regs and the "host passthrough model" values.
It also allows to test some ID reg field values:
(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x13}} {"error": {"class": "GenericError", "desc": "idreg SYSREG_ID_AA64ISAR0_EL1_DP set value (0x13) exceeds length of field (4)!"}}
(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x2}} {"error": {"class": "GenericError", "desc": "idreg SYSREG_ID_AA64ISAR0_EL1_DP set value (0x2) does not match any arch valid enum value!"}}
---
v5 -> v6:
- add the write capability
--- target/arm/arm-qmp-cmds.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
target/arm/arm-qmp-cmds.c +29 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/target-info.h" #include "hw/core/boards.h" #include "kvm_arm.h"
@@ -84,6 +85,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, Error **errp) {CpuModelExpansionInfo *expansion_info; +ObjectPropertyIterator iter; +ObjectProperty *idregprop;const QDict *qdict_in;QDict *qdict_out;ObjectClass *oc;
@@ -145,6 +148,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } qdict_in =qobject_to (QDict, model->props); + +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } +if (qdict_get (qdict_in, idregprop->name)) { +if (!object_property_set (obj, idregprop->name, visitor, &err)) { +break ; + } + } + } + i =0 ;while ((name = cpu_model_advertised_features[i++]) !=NULL ) {if (qdict_get (qdict_in, name)) {
@@ -190,6 +207,18 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } } +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +QObject *value; + +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } + value =object_property_get_qobject (obj, idregprop->name, &error_abort); +qdict_put_obj (qdict_out, idregprop->name, value); + } +if (!qdict_size (qdict_out)) {qobject_unref (qdict_out); }else {
Signature · 1 line
2.53.0
Re: [RFC PATCH v6 14/17] arm-qmp-cmds: introspection for ID register props
Hi Khushit,
Quoted 17 lines · Eric Auger
From: Cornelia Huck <[email protected]>
Implement the capability to query available ID register values by adding SYSREG_* options and values to the cpu model expansion for the host model, if available.
Excerpt:
(QEMU) query-cpu-model-expansion type=full model={"name":"host"} {"return": {"model": {"name": "host", "props": {"SYSREG_ID_AA64PFR0_EL1_EL3": 1, "SYSREG_ID_AA64ISAR2_EL1_CLRBHB": 0, "SYSREG_CTR_EL0_L1Ip": 3, "SYSREG_MIDR_EL1_PartNum": 3407, "SYSREG_CTR_EL0_DminLine": 4, "SYSREG_ID_AA64MMFR0_EL1_PARange": 5, "SYSREG_ID_AA64MMFR1_EL1_ECBHB": 0 ../..So this allows the upper stack to detect available writable ID regs and the "host passthrough model" values.
Quoted 6 lines
It also allows to test some ID reg field values:
(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x13}} {"error": {"class": "GenericError", "desc": "idregSYSREG_ID_AA64ISAR0_EL1_DPset value (0x13) exceeds length of field (4)!"}}(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x2}} {"error": {"class": "GenericError", "desc": "idreg
SYSREG_ID_AA64ISAR0_EL1_DPset value (0x2) does not match any arch valid enum value!"}}
for your info I am currently exploring ways to test set field values against KVM. Current check only test against field size and enum values if any.
I have a POC instantiating a scratch vcpu and it is totally feasible to set the id reg with the modified value. What is more tricky is to build an incremental scratch vcpu with all the set values accumulating But I guess it should be feasible too.
If we manage to do that, I don't think you need safe rules/values anymore because using query-cpu-model-expansion you could directly check the enhanced cpu model can safely apply on host. I will share as soon as I get something clean enough. Thanks Eric
Quoted 73 lines
Signed-off-by Eric Auger <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
v5 -> v6:
- add the write capability--- target/arm/arm-qmp-cmds.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)target/arm/arm-qmp-cmds.c +29
-0@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/target-info.h" #include "hw/core/boards.h" #include "kvm_arm.h" @@ -84,6 +85,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, Error **errp) {CpuModelExpansionInfo *expansion_info; +ObjectPropertyIterator iter; +ObjectProperty *idregprop;const QDict *qdict_in;QDict *qdict_out;ObjectClass *oc;@@ -145,6 +148,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } qdict_in =qobject_to (QDict, model->props); + +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } +if (qdict_get (qdict_in, idregprop->name)) { +if (!object_property_set (obj, idregprop->name, visitor, &err)) { +break ; + } + } + } + i =0 ;while ((name = cpu_model_advertised_features[i++]) !=NULL ) {if (qdict_get (qdict_in, name)) {@@ -190,6 +207,18 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } } +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +QObject *value; + +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } + value =object_property_get_qobject (obj, idregprop->name, &error_abort); +qdict_put_obj (qdict_out, idregprop->name, value); + } +if (!qdict_size (qdict_out)) {qobject_unref (qdict_out); }else {
Re: [RFC PATCH v6 14/17] arm-qmp-cmds: introspection for ID register props
Quoted 45 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email|-------------------------------------------------------------------!
Hi Khushit,
Quoted 17 lines · Eric Auger
From: Cornelia Huck <[email protected]>
Implement the capability to query available ID register values by adding SYSREG_* options and values to the cpu model expansion for the host model, if available.
Excerpt:
(QEMU) query-cpu-model-expansion type=full model={"name":"host"} {"return": {"model": {"name": "host", "props": {"SYSREG_ID_AA64PFR0_EL1_EL3": 1, "SYSREG_ID_AA64ISAR2_EL1_CLRBHB": 0, "SYSREG_CTR_EL0_L1Ip": 3, "SYSREG_MIDR_EL1_PartNum": 3407, "SYSREG_CTR_EL0_DminLine": 4, "SYSREG_ID_AA64MMFR0_EL1_PARange": 5, "SYSREG_ID_AA64MMFR1_EL1_ECBHB": 0 ../..So this allows the upper stack to detect available writable ID regs and the "host passthrough model" values.
Quoted 6 lines
It also allows to test some ID reg field values:
(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x13}} {"error": {"class": "GenericError", "desc": "idregSYSREG_ID_AA64ISAR0_EL1_DPset value (0x13) exceeds length of field (4)!"}}(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x2}} {"error": {"class": "GenericError", "desc": "idreg
SYSREG_ID_AA64ISAR0_EL1_DPset value (0x2) does not match any arch valid enum value!"}}for your info I am currently exploring ways to test set field values against KVM. Current check only test against field size and enum values if any.
I have a POC instantiating a scratch vcpu and it is totally feasible to set the id reg with the modified value. What is more tricky is to build an incremental scratch vcpu with all the set values accumulating But I guess it should be feasible too.
Quoted 4 lines
If we manage to do that, I don't think you need safe rules/values anymore because using query-cpu-model-expansion you could directly check the enhanced cpu model can safely apply on host. I will share as soon as I get something clean enough. Thanks Eric
This seems like it is definitely doable. But, I think it is inefficient and does not scale with the number of cpu models.
It will essentially require 1 (vcpu create) + x (number of id register) ioctl calls per Named CPU model or a configuration that management software wants to test.
In v3, I will change how we handle safe_rules. As the analysis in mail to Marc almost all of the writeable ID register fields supports writing a lower value.
There are only few exceptions.
Another point I want to raise is without safe_rules, we will not have QMP feature parity with x86 where cpu-definitions reports model blocker properties. This in-parity means some management software can not be easily ported to work with arm64 named cpu models.
Warm Regards,
Khushit
Quoted 74 lines
Quoted 74 lines
Signed-off-by Eric Auger <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
v5 -> v6:
- add the write capability
---target/arm/arm-qmp-cmds.c| 29 +++++++++++++++++++++++++++++1 file changed, 29 insertions(+)target/arm/arm-qmp-cmds.c +29
-0@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/target-info.h" #include "hw/core/boards.h" #include "kvm_arm.h" @@ -84,6 +85,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, Error **errp) {CpuModelExpansionInfo *expansion_info; +ObjectPropertyIterator iter; +ObjectProperty *idregprop;const QDict *qdict_in;QDict *qdict_out;ObjectClass *oc;@@ -145,6 +148,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } qdict_in =qobject_to (QDict, model->props); + +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } +if (qdict_get (qdict_in, idregprop->name)) { +if (!object_property_set (obj, idregprop->name, visitor, &err)) { +break ; + } + } + } + i =0 ;while ((name = cpu_model_advertised_features[i++]) !=NULL ) {if (qdict_get (qdict_in, name)) {@@ -190,6 +207,18 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } } +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +QObject *value; + +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } + value =object_property_get_qobject (obj, idregprop->name, &error_abort); +qdict_put_obj (qdict_out, idregprop->name, value); + } +if (!qdict_size (qdict_out)) {qobject_unref (qdict_out); }else {
Re: [RFC PATCH v6 14/17] arm-qmp-cmds: introspection for ID register props
Quoted 47 lines · Khushit Shah
Quoted 43 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email|-------------------------------------------------------------------!
Hi Khushit,
Quoted 17 lines · Eric Auger
From: Cornelia Huck <[email protected]>
Implement the capability to query available ID register values by adding SYSREG_* options and values to the cpu model expansion for the host model, if available.
Excerpt:
(QEMU) query-cpu-model-expansion type=full model={"name":"host"} {"return": {"model": {"name": "host", "props": {"SYSREG_ID_AA64PFR0_EL1_EL3": 1, "SYSREG_ID_AA64ISAR2_EL1_CLRBHB": 0, "SYSREG_CTR_EL0_L1Ip": 3, "SYSREG_MIDR_EL1_PartNum": 3407, "SYSREG_CTR_EL0_DminLine": 4, "SYSREG_ID_AA64MMFR0_EL1_PARange": 5, "SYSREG_ID_AA64MMFR1_EL1_ECBHB": 0 ../..So this allows the upper stack to detect available writable ID regs and the "host passthrough model" values.
Quoted 6 lines
It also allows to test some ID reg field values:
(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x13}} {"error": {"class": "GenericError", "desc": "idregSYSREG_ID_AA64ISAR0_EL1_DPset value (0x13) exceeds length of field (4)!"}}(QEMU) query-cpu-model-expansion type=full model={"name":"host","props":{"SYSREG_ID_AA64ISAR0_EL1_DP":0x2}} {"error": {"class": "GenericError", "desc": "idreg
SYSREG_ID_AA64ISAR0_EL1_DPset value (0x2) does not match any arch valid enum value!"}}for your info I am currently exploring ways to test set field values against KVM. Current check only test against field size and enum values if any.
I have a POC instantiating a scratch vcpu and it is totally feasible to set the id reg with the modified value. What is more tricky is to build an incremental scratch vcpu with all the set values accumulating But I guess it should be feasible too.
Quoted 4 lines
If we manage to do that, I don't think you need safe rules/values anymore because using query-cpu-model-expansion you could directly check the enhanced cpu model can safely apply on host. I will share as soon as I get something clean enough. Thanks Eric
Quoted 6 lines
This seems like it is definitely doable. But, I think it is inefficient and does not scale with the number of cpu models.
It will essentially require 1 (vcpu create) + x (number of id register) ioctl calls per Named CPU model or a configuration that management software wants to test.
yes. But that's also the only way to test incremental stacked settings. If an IDREG setting depends on a formerly applied one and is incompatible, you will know. With only safe_rules/values you won't have that precision I am afraid.
Quoted 5 lines
In v3, I will change how we handle
safe_rules. As the analysis in mail to Marc almost all of the writeable ID register fields supports writing a lower value.There are only few exceptions.
OK
Quoted 4 lines
Another point I want to raise is without
safe_rules, we will not have QMP feature parity with x86 where cpu-definitions reports model blocker properties. This in-parity means some management
Interesting. I need to further look at cpu-definitions I acknowledge
Thanks
Eric
Quoted 78 lines
software can not be easily ported to work with arm64 named cpu models.
Warm Regards,
KhushitQuoted 72 lines
Quoted 72 lines
Signed-off-by Eric Auger <[email protected]>Signed-off-by Cornelia Huck <[email protected]>---
v5 -> v6:
- add the write capability
---target/arm/arm-qmp-cmds.c| 29 +++++++++++++++++++++++++++++1 file changed, 29 insertions(+)target/arm/arm-qmp-cmds.c +29
-0@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/target-info.h" #include "hw/core/boards.h" #include "kvm_arm.h" @@ -84,6 +85,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, Error **errp) {CpuModelExpansionInfo *expansion_info; +ObjectPropertyIterator iter; +ObjectProperty *idregprop;const QDict *qdict_in;QDict *qdict_out;ObjectClass *oc;@@ -145,6 +148,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } qdict_in =qobject_to (QDict, model->props); + +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } +if (qdict_get (qdict_in, idregprop->name)) { +if (!object_property_set (obj, idregprop->name, visitor, &err)) { +break ; + } + } + } + i =0 ;while ((name = cpu_model_advertised_features[i++]) !=NULL ) {if (qdict_get (qdict_in, name)) {@@ -190,6 +207,18 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, } } +object_property_iter_init (&iter, obj); + +while ((idregprop =object_property_iter_next (&iter))) { +QObject *value; + +if (!g_str_has_prefix (idregprop->name,"SYSREG_" )) { +continue ; + } + value =object_property_get_qobject (obj, idregprop->name, &error_abort); +qdict_put_obj (qdict_out, idregprop->name, value); + } +if (!qdict_size (qdict_out)) {qobject_unref (qdict_out); }else {
RFC PATCH v6 15/17 target/arm/cpu-idregs.h.inc: Generate reserved fields
In reply to Eric AugerExtract reserved fields: RES0, RES1, RAZ, ...
--- target/arm/cpu-idregs.h.inc | 69 ++++++++++++++- .../update-aarch64-cpu-sysreg-properties.py | 83 +++++++++++++++---- 2 files changed, 136 insertions(+), 16 deletions(-)
target/arm/cpu-idregs.h.inc +67 -2
@@ -15,16 +15,20 @@ IDREG_START(AIDR_EL1) IDREG_END(AIDR_EL1) IDREG_START(CCSIDR2_EL1) + IDREG_FIELD(CCSIDR2_EL1, RES0, 24, 40) IDREG_FIELD(CCSIDR2_EL1, NumSets, 0, 24) IDREG_END(CCSIDR2_EL1) IDREG_START(CCSIDR_EL1) + IDREG_FIELD(CCSIDR_EL1, RES0, 56, 8) IDREG_FIELD(CCSIDR_EL1, NumSets, 32, 24) + IDREG_FIELD(CCSIDR_EL1, RES0, 24, 8) IDREG_FIELD(CCSIDR_EL1, Associativity, 3, 21) IDREG_FIELD(CCSIDR_EL1, LineSize, 0, 3) IDREG_END(CCSIDR_EL1) IDREG_START(CLIDR_EL1) + IDREG_FIELD(CLIDR_EL1, RES0, 47, 17) IDREG_FIELD(CLIDR_EL1, Ttype7, 45, 2) IDREG_FIELD(CLIDR_EL1, Ttype6, 43, 2) IDREG_FIELD(CLIDR_EL1, Ttype5, 41, 2)
@@ -55,7 +59,10 @@ IDREG_START(CLIDR_EL1) IDREG_END(CLIDR_EL1) IDREG_START(CTR_EL0) + IDREG_FIELD(CTR_EL0, RES0, 38, 26) IDREG_FIELD(CTR_EL0, TminLine, 32, 6) + IDREG_FIELD(CTR_EL0, RES1, 31, 1) + IDREG_FIELD(CTR_EL0, RES0, 30, 1) IDREG_FIELD_START(CTR_EL0, DIC, 29, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -73,23 +80,28 @@ IDREG_START(CTR_EL0) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(CTR_EL0, L1Ip) + IDREG_FIELD(CTR_EL0, RES0, 4, 10) IDREG_FIELD(CTR_EL0, IminLine, 0, 4) IDREG_END(CTR_EL0) IDREG_START(DCZID_EL0) + IDREG_FIELD(DCZID_EL0, RES0, 9, 55) IDREG_FIELD(DCZID_EL0, TBS, 5, 4) IDREG_FIELD(DCZID_EL0, DZP, 4, 1) IDREG_FIELD(DCZID_EL0, BS, 0, 4) IDREG_END(DCZID_EL0) IDREG_START(GMID_EL1) + IDREG_FIELD(GMID_EL1, RES0, 4, 60) IDREG_FIELD(GMID_EL1, BS, 0, 4) IDREG_END(GMID_EL1) IDREG_START(ID_AA64AFR0_EL1) + IDREG_FIELD(ID_AA64AFR0_EL1, RES0, 32, 32) IDREG_END(ID_AA64AFR0_EL1) IDREG_START(ID_AA64AFR1_EL1) + IDREG_FIELD(ID_AA64AFR1_EL1, RES0, 0, 64) IDREG_END(ID_AA64AFR1_EL1) IDREG_START(ID_AA64DFR0_EL1)
@@ -136,6 +148,7 @@ IDREG_START(ID_AA64DFR0_EL1) IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs) + IDREG_FIELD(ID_AA64DFR0_EL1, RES0, 24, 4) IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4) IDREG_FIELD_ARCH_VAL(0)
@@ -209,6 +222,7 @@ IDREG_START(ID_AA64DFR1_EL1) IDREG_END(ID_AA64DFR1_EL1) IDREG_START(ID_AA64DFR2_EL1) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -221,6 +235,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 8, 8) IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -233,6 +248,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_END(ID_AA64DFR2_EL1) IDREG_START(ID_AA64FPFR0_EL1) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -257,10 +273,13 @@ IDREG_START(ID_AA64FPFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 16, 10) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F16MM2, 15, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F16MM2) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 8, 7) + IDREG_FIELD(ID_AA64FPFR0_EL1, RAZ, 2, 6) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -312,6 +331,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 24, 4) IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(2)
@@ -335,6 +355,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 0, 4) IDREG_END(ID_AA64ISAR0_EL1) IDREG_START(ID_AA64ISAR1_EL1)
@@ -498,6 +519,7 @@ IDREG_START(ID_AA64ISAR2_EL1) IDREG_END(ID_AA64ISAR2_EL1) IDREG_START(ID_AA64ISAR3_EL1) + IDREG_FIELD(ID_AA64ISAR3_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -561,6 +583,7 @@ IDREG_START(ID_AA64MMFR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT) + IDREG_FIELD(ID_AA64MMFR0_EL1, RES0, 48, 8) IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -713,6 +736,7 @@ IDREG_START(ID_AA64MMFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL) + IDREG_FIELD(ID_AA64MMFR2_EL1, RES0, 44, 4) IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -778,6 +802,7 @@ IDREG_START(ID_AA64MMFR3_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR) + IDREG_FIELD(ID_AA64MMFR3_EL1, RES0, 48, 4) IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1031,6 +1056,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64PFR1_EL1, SME) + IDREG_FIELD(ID_AA64PFR1_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1058,6 +1084,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_END(ID_AA64PFR1_EL1) IDREG_START(ID_AA64PFR2_EL1) + IDREG_FIELD(ID_AA64PFR2_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1117,6 +1144,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 62, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1136,6 +1164,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 49, 3) IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1180,6 +1209,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 31, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1192,6 +1222,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 26, 2) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1204,10 +1235,12 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 17, 6) IDREG_FIELD_START(ID_AA64SMFR0_EL1, STMOP, 16, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, STMOP) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 1, 15) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1215,6 +1248,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_END(ID_AA64SMFR0_EL1) IDREG_START(ID_AA64ZFR0_EL1) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 60, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1235,10 +1269,12 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 36, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, SHA3, 32, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SHA3) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 28, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1258,6 +1294,7 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 8, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1274,9 +1311,11 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_END(ID_AA64ZFR0_EL1) IDREG_START(ID_AFR0_EL1) + IDREG_FIELD(ID_AFR0_EL1, RES0, 0, 64) IDREG_END(ID_AFR0_EL1) IDREG_START(ID_DFR0_EL1) + IDREG_FIELD(ID_DFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1328,6 +1367,7 @@ IDREG_START(ID_DFR0_EL1) IDREG_END(ID_DFR0_EL1) IDREG_START(ID_DFR1_EL1) + IDREG_FIELD(ID_DFR1_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1340,6 +1380,7 @@ IDREG_START(ID_DFR1_EL1) IDREG_END(ID_DFR1_EL1) IDREG_START(ID_ISAR0_EL1) + IDREG_FIELD(ID_ISAR0_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1375,6 +1416,7 @@ IDREG_START(ID_ISAR0_EL1) IDREG_END(ID_ISAR0_EL1) IDREG_START(ID_ISAR1_EL1) + IDREG_FIELD(ID_ISAR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1413,6 +1455,7 @@ IDREG_START(ID_ISAR1_EL1) IDREG_END(ID_ISAR1_EL1) IDREG_START(ID_ISAR2_EL1) + IDREG_FIELD(ID_ISAR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1458,6 +1501,7 @@ IDREG_START(ID_ISAR2_EL1) IDREG_END(ID_ISAR2_EL1) IDREG_START(ID_ISAR3_EL1) + IDREG_FIELD(ID_ISAR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1495,6 +1539,7 @@ IDREG_START(ID_ISAR3_EL1) IDREG_END(ID_ISAR3_EL1) IDREG_START(ID_ISAR4_EL1) + IDREG_FIELD(ID_ISAR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1519,12 +1564,12 @@ IDREG_START(ID_ISAR4_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR4_EL1, Writeback) - IDREG_FIELD_START(ID_ISAR4_EL1, WithShifts, 4, 4) + IDREG_FIELD_START(ID_ISAR4_EL1, WI, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_ARCH_VAL(4) - IDREG_FIELD_END(ID_ISAR4_EL1, WithShifts) + IDREG_FIELD_END(ID_ISAR4_EL1, WI) IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1533,6 +1578,7 @@ IDREG_START(ID_ISAR4_EL1) IDREG_END(ID_ISAR4_EL1) IDREG_START(ID_ISAR5_EL1) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1541,6 +1587,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR5_EL1, RDM) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1565,6 +1612,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_END(ID_ISAR5_EL1) IDREG_START(ID_ISAR6_EL1) + IDREG_FIELD(ID_ISAR6_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1601,6 +1649,7 @@ IDREG_START(ID_ISAR6_EL1) IDREG_END(ID_ISAR6_EL1) IDREG_START(ID_MMFR0_EL1) + IDREG_FIELD(ID_MMFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1647,6 +1696,7 @@ IDREG_START(ID_MMFR0_EL1) IDREG_END(ID_MMFR0_EL1) IDREG_START(ID_MMFR1_EL1) + IDREG_FIELD(ID_MMFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1695,6 +1745,7 @@ IDREG_START(ID_MMFR1_EL1) IDREG_END(ID_MMFR1_EL1) IDREG_START(ID_MMFR2_EL1) + IDREG_FIELD(ID_MMFR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1733,6 +1784,7 @@ IDREG_START(ID_MMFR2_EL1) IDREG_END(ID_MMFR2_EL1) IDREG_START(ID_MMFR3_EL1) + IDREG_FIELD(ID_MMFR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)
@@ -1772,6 +1824,7 @@ IDREG_START(ID_MMFR3_EL1) IDREG_END(ID_MMFR3_EL1) IDREG_START(ID_MMFR4_EL1) + IDREG_FIELD(ID_MMFR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1809,6 +1862,7 @@ IDREG_START(ID_MMFR4_EL1) IDREG_END(ID_MMFR4_EL1) IDREG_START(ID_MMFR5_EL1) + IDREG_FIELD(ID_MMFR5_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1822,6 +1876,7 @@ IDREG_START(ID_MMFR5_EL1) IDREG_END(ID_MMFR5_EL1) IDREG_START(ID_PFR0_EL1) + IDREG_FIELD(ID_PFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1863,6 +1918,7 @@ IDREG_START(ID_PFR0_EL1) IDREG_END(ID_PFR0_EL1) IDREG_START(ID_PFR1_EL1) + IDREG_FIELD(ID_PFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1902,6 +1958,7 @@ IDREG_START(ID_PFR1_EL1) IDREG_END(ID_PFR1_EL1) IDREG_START(ID_PFR2_EL1) + IDREG_FIELD(ID_PFR2_EL1, RES0, 12, 52) IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1949,11 +2006,14 @@ IDREG_START(MIDR_EL1) IDREG_END(MIDR_EL1) IDREG_START(MPIDR_EL1) + IDREG_FIELD(MPIDR_EL1, RES0, 40, 24) IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8) + IDREG_FIELD(MPIDR_EL1, RES1, 31, 1) IDREG_FIELD_START(MPIDR_EL1, U, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(MPIDR_EL1, U) + IDREG_FIELD(MPIDR_EL1, RES0, 25, 5) IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -1964,6 +2024,7 @@ IDREG_START(MPIDR_EL1) IDREG_END(MPIDR_EL1) IDREG_START(MVFR0_EL1) + IDREG_FIELD(MVFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -2002,6 +2063,7 @@ IDREG_START(MVFR0_EL1) IDREG_END(MVFR0_EL1) IDREG_START(MVFR1_EL1) + IDREG_FIELD(MVFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -2040,6 +2102,7 @@ IDREG_START(MVFR1_EL1) IDREG_END(MVFR1_EL1) IDREG_START(MVFR2_EL1) + IDREG_FIELD(MVFR2_EL1, RES0, 8, 56) IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)
@@ -2059,6 +2122,7 @@ IDREG_START(REVIDR_EL1) IDREG_END(REVIDR_EL1) IDREG_START(SMIDR_EL1) + IDREG_FIELD(SMIDR_EL1, RES0, 60, 4) IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)
@@ -2094,6 +2158,7 @@ IDREG_START(SMIDR_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(SMIDR_EL1, SH) + IDREG_FIELD(SMIDR_EL1, RES0, 12, 1) IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12) IDREG_END(SMIDR_EL1)
scripts/update-aarch64-cpu-sysreg-properties.py +69 -14
129 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [RFC PATCH v6 15/17] target/arm/cpu-idregs.h.inc: Generate reserved fields
Quoted 12 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email|-------------------------------------------------------------------!
Extract reserved fields: RES0, RES1, RAZ, ...
Signed-off-by Eric Auger <[email protected]>
Quoted 619 lines
---
target/arm/cpu-idregs.h.inc | 69 ++++++++++++++-.../update-aarch64-cpu-sysreg-properties.py| 83 +++++++++++++++----2 files changed, 136 insertions(+), 16 deletions(-)target/arm/cpu-idregs.h.inc +67
-2@@ -15,16 +15,20 @@ IDREG_START(AIDR_EL1) IDREG_END(AIDR_EL1) IDREG_START(CCSIDR2_EL1) + IDREG_FIELD(CCSIDR2_EL1, RES0, 24, 40) IDREG_FIELD(CCSIDR2_EL1, NumSets, 0, 24) IDREG_END(CCSIDR2_EL1) IDREG_START(CCSIDR_EL1) + IDREG_FIELD(CCSIDR_EL1, RES0, 56, 8) IDREG_FIELD(CCSIDR_EL1, NumSets, 32, 24) + IDREG_FIELD(CCSIDR_EL1, RES0, 24, 8) IDREG_FIELD(CCSIDR_EL1, Associativity, 3, 21) IDREG_FIELD(CCSIDR_EL1, LineSize, 0, 3) IDREG_END(CCSIDR_EL1) IDREG_START(CLIDR_EL1) + IDREG_FIELD(CLIDR_EL1, RES0, 47, 17) IDREG_FIELD(CLIDR_EL1, Ttype7, 45, 2) IDREG_FIELD(CLIDR_EL1, Ttype6, 43, 2) IDREG_FIELD(CLIDR_EL1, Ttype5, 41, 2)@@ -55,7 +59,10 @@ IDREG_START(CLIDR_EL1) IDREG_END(CLIDR_EL1) IDREG_START(CTR_EL0) + IDREG_FIELD(CTR_EL0, RES0, 38, 26) IDREG_FIELD(CTR_EL0, TminLine, 32, 6) + IDREG_FIELD(CTR_EL0, RES1, 31, 1) + IDREG_FIELD(CTR_EL0, RES0, 30, 1) IDREG_FIELD_START(CTR_EL0, DIC, 29, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -73,23 +80,28 @@ IDREG_START(CTR_EL0) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(CTR_EL0, L1Ip) + IDREG_FIELD(CTR_EL0, RES0, 4, 10) IDREG_FIELD(CTR_EL0, IminLine, 0, 4) IDREG_END(CTR_EL0) IDREG_START(DCZID_EL0) + IDREG_FIELD(DCZID_EL0, RES0, 9, 55) IDREG_FIELD(DCZID_EL0, TBS, 5, 4) IDREG_FIELD(DCZID_EL0, DZP, 4, 1) IDREG_FIELD(DCZID_EL0, BS, 0, 4) IDREG_END(DCZID_EL0) IDREG_START(GMID_EL1) + IDREG_FIELD(GMID_EL1, RES0, 4, 60) IDREG_FIELD(GMID_EL1, BS, 0, 4) IDREG_END(GMID_EL1) IDREG_START(ID_AA64AFR0_EL1) + IDREG_FIELD(ID_AA64AFR0_EL1, RES0, 32, 32) IDREG_END(ID_AA64AFR0_EL1) IDREG_START(ID_AA64AFR1_EL1) + IDREG_FIELD(ID_AA64AFR1_EL1, RES0, 0, 64) IDREG_END(ID_AA64AFR1_EL1) IDREG_START(ID_AA64DFR0_EL1)@@ -136,6 +148,7 @@ IDREG_START(ID_AA64DFR0_EL1) IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs) + IDREG_FIELD(ID_AA64DFR0_EL1, RES0, 24, 4) IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4) IDREG_FIELD_ARCH_VAL(0)@@ -209,6 +222,7 @@ IDREG_START(ID_AA64DFR1_EL1) IDREG_END(ID_AA64DFR1_EL1) IDREG_START(ID_AA64DFR2_EL1) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -221,6 +235,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 8, 8) IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -233,6 +248,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_END(ID_AA64DFR2_EL1) IDREG_START(ID_AA64FPFR0_EL1) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -257,10 +273,13 @@ IDREG_START(ID_AA64FPFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 16, 10) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F16MM2, 15, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F16MM2) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 8, 7) + IDREG_FIELD(ID_AA64FPFR0_EL1, RAZ, 2, 6) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -312,6 +331,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 24, 4) IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(2)@@ -335,6 +355,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 0, 4) IDREG_END(ID_AA64ISAR0_EL1) IDREG_START(ID_AA64ISAR1_EL1)@@ -498,6 +519,7 @@ IDREG_START(ID_AA64ISAR2_EL1) IDREG_END(ID_AA64ISAR2_EL1) IDREG_START(ID_AA64ISAR3_EL1) + IDREG_FIELD(ID_AA64ISAR3_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -561,6 +583,7 @@ IDREG_START(ID_AA64MMFR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT) + IDREG_FIELD(ID_AA64MMFR0_EL1, RES0, 48, 8) IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -713,6 +736,7 @@ IDREG_START(ID_AA64MMFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL) + IDREG_FIELD(ID_AA64MMFR2_EL1, RES0, 44, 4) IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -778,6 +802,7 @@ IDREG_START(ID_AA64MMFR3_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR) + IDREG_FIELD(ID_AA64MMFR3_EL1, RES0, 48, 4) IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1031,6 +1056,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64PFR1_EL1, SME) + IDREG_FIELD(ID_AA64PFR1_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1058,6 +1084,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_END(ID_AA64PFR1_EL1) IDREG_START(ID_AA64PFR2_EL1) + IDREG_FIELD(ID_AA64PFR2_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1117,6 +1144,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 62, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1136,6 +1164,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 49, 3) IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1180,6 +1209,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 31, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1192,6 +1222,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 26, 2) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1204,10 +1235,12 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 17, 6) IDREG_FIELD_START(ID_AA64SMFR0_EL1, STMOP, 16, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, STMOP) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 1, 15) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1215,6 +1248,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_END(ID_AA64SMFR0_EL1) IDREG_START(ID_AA64ZFR0_EL1) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 60, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1235,10 +1269,12 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 36, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, SHA3, 32, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SHA3) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 28, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1258,6 +1294,7 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 8, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1274,9 +1311,11 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_END(ID_AA64ZFR0_EL1) IDREG_START(ID_AFR0_EL1) + IDREG_FIELD(ID_AFR0_EL1, RES0, 0, 64) IDREG_END(ID_AFR0_EL1) IDREG_START(ID_DFR0_EL1) + IDREG_FIELD(ID_DFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1328,6 +1367,7 @@ IDREG_START(ID_DFR0_EL1) IDREG_END(ID_DFR0_EL1) IDREG_START(ID_DFR1_EL1) + IDREG_FIELD(ID_DFR1_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1340,6 +1380,7 @@ IDREG_START(ID_DFR1_EL1) IDREG_END(ID_DFR1_EL1) IDREG_START(ID_ISAR0_EL1) + IDREG_FIELD(ID_ISAR0_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1375,6 +1416,7 @@ IDREG_START(ID_ISAR0_EL1) IDREG_END(ID_ISAR0_EL1) IDREG_START(ID_ISAR1_EL1) + IDREG_FIELD(ID_ISAR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1413,6 +1455,7 @@ IDREG_START(ID_ISAR1_EL1) IDREG_END(ID_ISAR1_EL1) IDREG_START(ID_ISAR2_EL1) + IDREG_FIELD(ID_ISAR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1458,6 +1501,7 @@ IDREG_START(ID_ISAR2_EL1) IDREG_END(ID_ISAR2_EL1) IDREG_START(ID_ISAR3_EL1) + IDREG_FIELD(ID_ISAR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1495,6 +1539,7 @@ IDREG_START(ID_ISAR3_EL1) IDREG_END(ID_ISAR3_EL1) IDREG_START(ID_ISAR4_EL1) + IDREG_FIELD(ID_ISAR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1519,12 +1564,12 @@ IDREG_START(ID_ISAR4_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR4_EL1, Writeback) - IDREG_FIELD_START(ID_ISAR4_EL1, WithShifts, 4, 4) + IDREG_FIELD_START(ID_ISAR4_EL1, WI, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_ARCH_VAL(4) - IDREG_FIELD_END(ID_ISAR4_EL1, WithShifts) + IDREG_FIELD_END(ID_ISAR4_EL1, WI) IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1533,6 +1578,7 @@ IDREG_START(ID_ISAR4_EL1) IDREG_END(ID_ISAR4_EL1) IDREG_START(ID_ISAR5_EL1) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1541,6 +1587,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR5_EL1, RDM) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1565,6 +1612,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_END(ID_ISAR5_EL1) IDREG_START(ID_ISAR6_EL1) + IDREG_FIELD(ID_ISAR6_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1601,6 +1649,7 @@ IDREG_START(ID_ISAR6_EL1) IDREG_END(ID_ISAR6_EL1) IDREG_START(ID_MMFR0_EL1) + IDREG_FIELD(ID_MMFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1647,6 +1696,7 @@ IDREG_START(ID_MMFR0_EL1) IDREG_END(ID_MMFR0_EL1) IDREG_START(ID_MMFR1_EL1) + IDREG_FIELD(ID_MMFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1695,6 +1745,7 @@ IDREG_START(ID_MMFR1_EL1) IDREG_END(ID_MMFR1_EL1) IDREG_START(ID_MMFR2_EL1) + IDREG_FIELD(ID_MMFR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1733,6 +1784,7 @@ IDREG_START(ID_MMFR2_EL1) IDREG_END(ID_MMFR2_EL1) IDREG_START(ID_MMFR3_EL1) + IDREG_FIELD(ID_MMFR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)@@ -1772,6 +1824,7 @@ IDREG_START(ID_MMFR3_EL1) IDREG_END(ID_MMFR3_EL1) IDREG_START(ID_MMFR4_EL1) + IDREG_FIELD(ID_MMFR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1809,6 +1862,7 @@ IDREG_START(ID_MMFR4_EL1) IDREG_END(ID_MMFR4_EL1) IDREG_START(ID_MMFR5_EL1) + IDREG_FIELD(ID_MMFR5_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1822,6 +1876,7 @@ IDREG_START(ID_MMFR5_EL1) IDREG_END(ID_MMFR5_EL1) IDREG_START(ID_PFR0_EL1) + IDREG_FIELD(ID_PFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1863,6 +1918,7 @@ IDREG_START(ID_PFR0_EL1) IDREG_END(ID_PFR0_EL1) IDREG_START(ID_PFR1_EL1) + IDREG_FIELD(ID_PFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1902,6 +1958,7 @@ IDREG_START(ID_PFR1_EL1) IDREG_END(ID_PFR1_EL1) IDREG_START(ID_PFR2_EL1) + IDREG_FIELD(ID_PFR2_EL1, RES0, 12, 52) IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1949,11 +2006,14 @@ IDREG_START(MIDR_EL1) IDREG_END(MIDR_EL1) IDREG_START(MPIDR_EL1) + IDREG_FIELD(MPIDR_EL1, RES0, 40, 24) IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8) + IDREG_FIELD(MPIDR_EL1, RES1, 31, 1) IDREG_FIELD_START(MPIDR_EL1, U, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(MPIDR_EL1, U) + IDREG_FIELD(MPIDR_EL1, RES0, 25, 5) IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1964,6 +2024,7 @@ IDREG_START(MPIDR_EL1) IDREG_END(MPIDR_EL1) IDREG_START(MVFR0_EL1) + IDREG_FIELD(MVFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2002,6 +2063,7 @@ IDREG_START(MVFR0_EL1) IDREG_END(MVFR0_EL1) IDREG_START(MVFR1_EL1) + IDREG_FIELD(MVFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2040,6 +2102,7 @@ IDREG_START(MVFR1_EL1) IDREG_END(MVFR1_EL1) IDREG_START(MVFR2_EL1) + IDREG_FIELD(MVFR2_EL1, RES0, 8, 56) IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2059,6 +2122,7 @@ IDREG_START(REVIDR_EL1) IDREG_END(REVIDR_EL1) IDREG_START(SMIDR_EL1) + IDREG_FIELD(SMIDR_EL1, RES0, 60, 4) IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)@@ -2094,6 +2158,7 @@ IDREG_START(SMIDR_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(SMIDR_EL1, SH) + IDREG_FIELD(SMIDR_EL1, RES0, 12, 1) IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12) IDREG_END(SMIDR_EL1)scripts/update-aarch64-cpu-sysreg-properties.py +69
-14@@ -81,9 +81,13 @@ def collect_fields(item, bit_offset=0): # Normal Field Types leaf_types = ['Fields.Field', 'Fields.ConstantField', - 'Fields.EnumeratedField', 'Fields.Bitfield'] + 'Fields.EnumeratedField', 'Fields.Bitfield', 'Fields.Reserved'] if _type in leaf_types: field_copy = item.copy() + + if _type == 'Fields.Reserved' and not field_copy.get('name'): + field_copy['name'] = item.get('value', 'RES0') + if field_copy.get('rangeset'): new_ranges = [] for r in field_copy['rangeset']:@@ -96,7 +100,7 @@ def collect_fields(item, bit_offset=0): return fields # Traverse the hierarchy for other cases - for key in ['fields', 'values', 'fieldsets']: + for key in ['fields', 'values', 'fieldsets', 'constants']: for nested in item.get(key, []): fields.extend(collect_fields(nested, bit_offset))@@ -163,44 +167,95 @@ def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path): final_output += f"IDREG_START({reg_name})\n" - unique_fields = {} + fieldset_variants = [] + for fieldset in register.get('fieldsets', []): + current_fieldset_fields = {} candidates = collect_fields(fieldset) + for val in candidates: - name = (val.get('name') or val.get('label', '')).strip() - if not name or "RESERVED" in name.upper(): + raw_name = val.get('name') or val.get('label') or val.get('value') or '' + name = raw_name.strip() + if not name: continue + + name_upper = name.upper() + + # Check for architectural target states, including UNKNOWN remapping + base_reserved = None + for r_type in ["RES0", "RES1", "RAZ", "RAO", "WI", "UNKNOWN"]: + if r_type in name_upper: + base_reserved = "RES0" if r_type == "UNKNOWN" else r_type + break + + is_valid_reserved = base_reserved is not None + if "RESERVED" in name_upper and not is_valid_reserved: + continue + + # Force naming uniformity across padding blocks + if is_valid_reserved: + name = base_reserved + for r in val.get('rangeset', []): lsb = int(r.get('start')) width = r.get('width') msb = lsb + int(width) - 1 - # Only keep the fields with the highest MSB - # needed fir CCSIDR_EL1 - if name not in unique_fields or msb > unique_fields[name]['msb']: - # extract enum values if any + if is_valid_reserved: + unique_key = f"{name}_{lsb}" + else: + unique_key = name + + if unique_key not in current_fieldset_fields or \ + msb > current_fieldset_fields[unique_key]['msb']: enums = extract_field_enums(val) - unique_fields[name] = {'lsb': lsb, 'msb': msb, 'width': width, 'enums': enums} + current_fieldset_fields[unique_key] = { + 'raw_name': name, + 'lsb': lsb, + 'msb': msb, + 'width': width, + 'enums': enums + } + + if current_fieldset_fields: + fieldset_variants.append(current_fieldset_fields) + + best_fieldset = {} + max_total_width = -1 + + for variant in fieldset_variants: + total_width = sum(f['width'] for f in variant.values()) + # prioritize layout variants with the highest MSB coverage + max_msb = max(f['msb'] for f in variant.values()) if variant else 0 + + # Combine width and max_msb into a fitness score tuple + if (total_width, max_msb) > (max_total_width, max_total_width): + max_total_width = total_width + best_fieldset = variant + + unique_fields = best_fieldset # Sort decreasing lsbs sorted_fields = sorted(unique_fields.items(), key=lambda x: x[1]['lsb'], reverse=True) - for name, bits in sorted_fields: + for unique_key, bits in sorted_fields: enums_list = bits.get('enums', []) + clean_name = bits.get('raw_name', unique_key) + if enums_list: line = (f" IDREG_FIELD_START({reg_name}, " - f"{name}, {bits['lsb']}, {bits['width']})\n") + f"{clean_name}, {bits['lsb']}, {bits['width']})\n") else: line = (f" IDREG_FIELD({reg_name}, " - f"{name}, {bits['lsb']}, {bits['width']})\n") + f"{clean_name}, {bits['lsb']}, {bits['width']})\n") final_output += line # add the enum value definition if any for enum_item in enums_list: final_output += (f" IDREG_FIELD_ARCH_VAL({enum_item['value']})\n") if enums_list: - line = (f" IDREG_FIELD_END({reg_name}, {name})\n") + line = (f" IDREG_FIELD_END({reg_name}, {clean_name})\n") final_output += line final_output += f"IDREG_END({reg_name})\n"Signature · 1 line
2.53.0
Re: [RFC PATCH v6 15/17] target/arm/cpu-idregs.h.inc: Generate reserved fields
Quoted 6 lines · Khushit Shah
Quoted 6 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email
Quoted 6 lines
Quoted 5 lines
|-------------------------------------------------------------------!
Extract reserved fields: RES0, RES1, RAZ, ...
Signed-off-by Eric Auger <[email protected]>Suggested-by Khushit Shah <[email protected]>
sure
Eric
Quoted 620 lines
Quoted 620 lines
---
target/arm/cpu-idregs.h.inc | 69 ++++++++++++++-.../update-aarch64-cpu-sysreg-properties.py| 83 +++++++++++++++----2 files changed, 136 insertions(+), 16 deletions(-)target/arm/cpu-idregs.h.inc +67
-2@@ -15,16 +15,20 @@ IDREG_START(AIDR_EL1) IDREG_END(AIDR_EL1) IDREG_START(CCSIDR2_EL1) + IDREG_FIELD(CCSIDR2_EL1, RES0, 24, 40) IDREG_FIELD(CCSIDR2_EL1, NumSets, 0, 24) IDREG_END(CCSIDR2_EL1) IDREG_START(CCSIDR_EL1) + IDREG_FIELD(CCSIDR_EL1, RES0, 56, 8) IDREG_FIELD(CCSIDR_EL1, NumSets, 32, 24) + IDREG_FIELD(CCSIDR_EL1, RES0, 24, 8) IDREG_FIELD(CCSIDR_EL1, Associativity, 3, 21) IDREG_FIELD(CCSIDR_EL1, LineSize, 0, 3) IDREG_END(CCSIDR_EL1) IDREG_START(CLIDR_EL1) + IDREG_FIELD(CLIDR_EL1, RES0, 47, 17) IDREG_FIELD(CLIDR_EL1, Ttype7, 45, 2) IDREG_FIELD(CLIDR_EL1, Ttype6, 43, 2) IDREG_FIELD(CLIDR_EL1, Ttype5, 41, 2)@@ -55,7 +59,10 @@ IDREG_START(CLIDR_EL1) IDREG_END(CLIDR_EL1) IDREG_START(CTR_EL0) + IDREG_FIELD(CTR_EL0, RES0, 38, 26) IDREG_FIELD(CTR_EL0, TminLine, 32, 6) + IDREG_FIELD(CTR_EL0, RES1, 31, 1) + IDREG_FIELD(CTR_EL0, RES0, 30, 1) IDREG_FIELD_START(CTR_EL0, DIC, 29, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -73,23 +80,28 @@ IDREG_START(CTR_EL0) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(CTR_EL0, L1Ip) + IDREG_FIELD(CTR_EL0, RES0, 4, 10) IDREG_FIELD(CTR_EL0, IminLine, 0, 4) IDREG_END(CTR_EL0) IDREG_START(DCZID_EL0) + IDREG_FIELD(DCZID_EL0, RES0, 9, 55) IDREG_FIELD(DCZID_EL0, TBS, 5, 4) IDREG_FIELD(DCZID_EL0, DZP, 4, 1) IDREG_FIELD(DCZID_EL0, BS, 0, 4) IDREG_END(DCZID_EL0) IDREG_START(GMID_EL1) + IDREG_FIELD(GMID_EL1, RES0, 4, 60) IDREG_FIELD(GMID_EL1, BS, 0, 4) IDREG_END(GMID_EL1) IDREG_START(ID_AA64AFR0_EL1) + IDREG_FIELD(ID_AA64AFR0_EL1, RES0, 32, 32) IDREG_END(ID_AA64AFR0_EL1) IDREG_START(ID_AA64AFR1_EL1) + IDREG_FIELD(ID_AA64AFR1_EL1, RES0, 0, 64) IDREG_END(ID_AA64AFR1_EL1) IDREG_START(ID_AA64DFR0_EL1)@@ -136,6 +148,7 @@ IDREG_START(ID_AA64DFR0_EL1) IDREG_FIELD_START(ID_AA64DFR0_EL1, CTX_CMPs, 28, 4) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64DFR0_EL1, CTX_CMPs) + IDREG_FIELD(ID_AA64DFR0_EL1, RES0, 24, 4) IDREG_FIELD(ID_AA64DFR0_EL1, WRPs, 20, 4) IDREG_FIELD_START(ID_AA64DFR0_EL1, PMSS, 16, 4) IDREG_FIELD_ARCH_VAL(0)@@ -209,6 +222,7 @@ IDREG_START(ID_AA64DFR1_EL1) IDREG_END(ID_AA64DFR1_EL1) IDREG_START(ID_AA64DFR2_EL1) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_AA64DFR2_EL1, TRBE_EXC, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -221,6 +235,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64DFR2_EL1, SPE_EXC) + IDREG_FIELD(ID_AA64DFR2_EL1, RES0, 8, 8) IDREG_FIELD_START(ID_AA64DFR2_EL1, BWE, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -233,6 +248,7 @@ IDREG_START(ID_AA64DFR2_EL1) IDREG_END(ID_AA64DFR2_EL1) IDREG_START(ID_AA64FPFR0_EL1) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8CVT, 31, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -257,10 +273,13 @@ IDREG_START(ID_AA64FPFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F8MM4) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 16, 10) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F16MM2, 15, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64FPFR0_EL1, F16MM2) + IDREG_FIELD(ID_AA64FPFR0_EL1, RES0, 8, 7) + IDREG_FIELD(ID_AA64FPFR0_EL1, RAZ, 2, 6) IDREG_FIELD_START(ID_AA64FPFR0_EL1, F8E4M3, 1, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -312,6 +331,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ISAR0_EL1, RDM) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 24, 4) IDREG_FIELD_START(ID_AA64ISAR0_EL1, Atomic, 20, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(2)@@ -335,6 +355,7 @@ IDREG_START(ID_AA64ISAR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64ISAR0_EL1, AES) + IDREG_FIELD(ID_AA64ISAR0_EL1, RES0, 0, 4) IDREG_END(ID_AA64ISAR0_EL1) IDREG_START(ID_AA64ISAR1_EL1)@@ -498,6 +519,7 @@ IDREG_START(ID_AA64ISAR2_EL1) IDREG_END(ID_AA64ISAR2_EL1) IDREG_START(ID_AA64ISAR3_EL1) + IDREG_FIELD(ID_AA64ISAR3_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64ISAR3_EL1, LSCP, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -561,6 +583,7 @@ IDREG_START(ID_AA64MMFR0_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64MMFR0_EL1, FGT) + IDREG_FIELD(ID_AA64MMFR0_EL1, RES0, 48, 8) IDREG_FIELD_START(ID_AA64MMFR0_EL1, ExS, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -713,6 +736,7 @@ IDREG_START(ID_AA64MMFR2_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64MMFR2_EL1, TTL) + IDREG_FIELD(ID_AA64MMFR2_EL1, RES0, 44, 4) IDREG_FIELD_START(ID_AA64MMFR2_EL1, FWB, 40, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -778,6 +802,7 @@ IDREG_START(ID_AA64MMFR3_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(ID_AA64MMFR3_EL1, SDERR) + IDREG_FIELD(ID_AA64MMFR3_EL1, RES0, 48, 4) IDREG_FIELD_START(ID_AA64MMFR3_EL1, ANERR, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1031,6 +1056,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_END(ID_AA64PFR1_EL1, SME) + IDREG_FIELD(ID_AA64PFR1_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_AA64PFR1_EL1, MPAM_frac, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1058,6 +1084,7 @@ IDREG_START(ID_AA64PFR1_EL1) IDREG_END(ID_AA64PFR1_EL1) IDREG_START(ID_AA64PFR2_EL1) + IDREG_FIELD(ID_AA64PFR2_EL1, RES0, 48, 16) IDREG_FIELD_START(ID_AA64PFR2_EL1, VMTETCL, 44, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1117,6 +1144,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, FA64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 62, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, LUT6, 61, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1136,6 +1164,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15) IDREG_FIELD_END(ID_AA64SMFR0_EL1, I16I64) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 49, 3) IDREG_FIELD_START(ID_AA64SMFR0_EL1, F64F64, 48, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1180,6 +1209,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, F32F32) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 31, 1) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SF8FMA, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1192,6 +1222,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SF8DP2) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 26, 2) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SBitPerm, 25, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1204,10 +1235,12 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, SFEXPA) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 17, 6) IDREG_FIELD_START(ID_AA64SMFR0_EL1, STMOP, 16, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64SMFR0_EL1, STMOP) + IDREG_FIELD(ID_AA64SMFR0_EL1, RES0, 1, 15) IDREG_FIELD_START(ID_AA64SMFR0_EL1, SMOP4, 0, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1215,6 +1248,7 @@ IDREG_START(ID_AA64SMFR0_EL1) IDREG_END(ID_AA64SMFR0_EL1) IDREG_START(ID_AA64ZFR0_EL1) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 60, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, F64MM, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1235,10 +1269,12 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SM4) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 36, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, SHA3, 32, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, SHA3) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 28, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, B16B16, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1258,6 +1294,7 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_AA64ZFR0_EL1, EltPerm) + IDREG_FIELD(ID_AA64ZFR0_EL1, RES0, 8, 4) IDREG_FIELD_START(ID_AA64ZFR0_EL1, AES, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1274,9 +1311,11 @@ IDREG_START(ID_AA64ZFR0_EL1) IDREG_END(ID_AA64ZFR0_EL1) IDREG_START(ID_AFR0_EL1) + IDREG_FIELD(ID_AFR0_EL1, RES0, 0, 64) IDREG_END(ID_AFR0_EL1) IDREG_START(ID_DFR0_EL1) + IDREG_FIELD(ID_DFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_DFR0_EL1, TraceFilt, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1328,6 +1367,7 @@ IDREG_START(ID_DFR0_EL1) IDREG_END(ID_DFR0_EL1) IDREG_START(ID_DFR1_EL1) + IDREG_FIELD(ID_DFR1_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_DFR1_EL1, HPMN0, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1340,6 +1380,7 @@ IDREG_START(ID_DFR1_EL1) IDREG_END(ID_DFR1_EL1) IDREG_START(ID_ISAR0_EL1) + IDREG_FIELD(ID_ISAR0_EL1, RES0, 28, 36) IDREG_FIELD_START(ID_ISAR0_EL1, Divide, 24, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1375,6 +1416,7 @@ IDREG_START(ID_ISAR0_EL1) IDREG_END(ID_ISAR0_EL1) IDREG_START(ID_ISAR1_EL1) + IDREG_FIELD(ID_ISAR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR1_EL1, Jazelle, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1413,6 +1455,7 @@ IDREG_START(ID_ISAR1_EL1) IDREG_END(ID_ISAR1_EL1) IDREG_START(ID_ISAR2_EL1) + IDREG_FIELD(ID_ISAR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR2_EL1, Reversal, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1458,6 +1501,7 @@ IDREG_START(ID_ISAR2_EL1) IDREG_END(ID_ISAR2_EL1) IDREG_START(ID_ISAR3_EL1) + IDREG_FIELD(ID_ISAR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR3_EL1, T32EE, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1495,6 +1539,7 @@ IDREG_START(ID_ISAR3_EL1) IDREG_END(ID_ISAR3_EL1) IDREG_START(ID_ISAR4_EL1) + IDREG_FIELD(ID_ISAR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR4_EL1, SWP_frac, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1519,12 +1564,12 @@ IDREG_START(ID_ISAR4_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR4_EL1, Writeback) - IDREG_FIELD_START(ID_ISAR4_EL1, WithShifts, 4, 4) + IDREG_FIELD_START(ID_ISAR4_EL1, WI, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_ARCH_VAL(4) - IDREG_FIELD_END(ID_ISAR4_EL1, WithShifts) + IDREG_FIELD_END(ID_ISAR4_EL1, WI) IDREG_FIELD_START(ID_ISAR4_EL1, Unpriv, 0, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1533,6 +1578,7 @@ IDREG_START(ID_ISAR4_EL1) IDREG_END(ID_ISAR4_EL1) IDREG_START(ID_ISAR5_EL1) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR5_EL1, VCMA, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1541,6 +1587,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(ID_ISAR5_EL1, RDM) + IDREG_FIELD(ID_ISAR5_EL1, RES0, 20, 4) IDREG_FIELD_START(ID_ISAR5_EL1, CRC32, 16, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1565,6 +1612,7 @@ IDREG_START(ID_ISAR5_EL1) IDREG_END(ID_ISAR5_EL1) IDREG_START(ID_ISAR6_EL1) + IDREG_FIELD(ID_ISAR6_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_ISAR6_EL1, CLRBHB, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1601,6 +1649,7 @@ IDREG_START(ID_ISAR6_EL1) IDREG_END(ID_ISAR6_EL1) IDREG_START(ID_MMFR0_EL1) + IDREG_FIELD(ID_MMFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR0_EL1, InnerShr, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1647,6 +1696,7 @@ IDREG_START(ID_MMFR0_EL1) IDREG_END(ID_MMFR0_EL1) IDREG_START(ID_MMFR1_EL1) + IDREG_FIELD(ID_MMFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR1_EL1, BPred, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1695,6 +1745,7 @@ IDREG_START(ID_MMFR1_EL1) IDREG_END(ID_MMFR1_EL1) IDREG_START(ID_MMFR2_EL1) + IDREG_FIELD(ID_MMFR2_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR2_EL1, HWAccFlg, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1733,6 +1784,7 @@ IDREG_START(ID_MMFR2_EL1) IDREG_END(ID_MMFR2_EL1) IDREG_START(ID_MMFR3_EL1) + IDREG_FIELD(ID_MMFR3_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR3_EL1, Supersec, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)@@ -1772,6 +1824,7 @@ IDREG_START(ID_MMFR3_EL1) IDREG_END(ID_MMFR3_EL1) IDREG_START(ID_MMFR4_EL1) + IDREG_FIELD(ID_MMFR4_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_MMFR4_EL1, EVT, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1809,6 +1862,7 @@ IDREG_START(ID_MMFR4_EL1) IDREG_END(ID_MMFR4_EL1) IDREG_START(ID_MMFR5_EL1) + IDREG_FIELD(ID_MMFR5_EL1, RES0, 8, 56) IDREG_FIELD_START(ID_MMFR5_EL1, nTLBPA, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1822,6 +1876,7 @@ IDREG_START(ID_MMFR5_EL1) IDREG_END(ID_MMFR5_EL1) IDREG_START(ID_PFR0_EL1) + IDREG_FIELD(ID_PFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR0_EL1, RAS, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1863,6 +1918,7 @@ IDREG_START(ID_PFR0_EL1) IDREG_END(ID_PFR0_EL1) IDREG_START(ID_PFR1_EL1) + IDREG_FIELD(ID_PFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(ID_PFR1_EL1, GIC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1902,6 +1958,7 @@ IDREG_START(ID_PFR1_EL1) IDREG_END(ID_PFR1_EL1) IDREG_START(ID_PFR2_EL1) + IDREG_FIELD(ID_PFR2_EL1, RES0, 12, 52) IDREG_FIELD_START(ID_PFR2_EL1, RAS_frac, 8, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1949,11 +2006,14 @@ IDREG_START(MIDR_EL1) IDREG_END(MIDR_EL1) IDREG_START(MPIDR_EL1) + IDREG_FIELD(MPIDR_EL1, RES0, 40, 24) IDREG_FIELD(MPIDR_EL1, Aff3, 32, 8) + IDREG_FIELD(MPIDR_EL1, RES1, 31, 1) IDREG_FIELD_START(MPIDR_EL1, U, 30, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1) IDREG_FIELD_END(MPIDR_EL1, U) + IDREG_FIELD(MPIDR_EL1, RES0, 25, 5) IDREG_FIELD_START(MPIDR_EL1, MT, 24, 1) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -1964,6 +2024,7 @@ IDREG_START(MPIDR_EL1) IDREG_END(MPIDR_EL1) IDREG_START(MVFR0_EL1) + IDREG_FIELD(MVFR0_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR0_EL1, FPRound, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2002,6 +2063,7 @@ IDREG_START(MVFR0_EL1) IDREG_END(MVFR0_EL1) IDREG_START(MVFR1_EL1) + IDREG_FIELD(MVFR1_EL1, RES0, 32, 32) IDREG_FIELD_START(MVFR1_EL1, SIMDFMAC, 28, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2040,6 +2102,7 @@ IDREG_START(MVFR1_EL1) IDREG_END(MVFR1_EL1) IDREG_START(MVFR2_EL1) + IDREG_FIELD(MVFR2_EL1, RES0, 8, 56) IDREG_FIELD_START(MVFR2_EL1, FPMisc, 4, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(1)@@ -2059,6 +2122,7 @@ IDREG_START(REVIDR_EL1) IDREG_END(REVIDR_EL1) IDREG_START(SMIDR_EL1) + IDREG_FIELD(SMIDR_EL1, RES0, 60, 4) IDREG_FIELD_START(SMIDR_EL1, NSMC, 56, 4) IDREG_FIELD_ARCH_VAL(0) IDREG_FIELD_ARCH_VAL(15)@@ -2094,6 +2158,7 @@ IDREG_START(SMIDR_EL1) IDREG_FIELD_ARCH_VAL(2) IDREG_FIELD_ARCH_VAL(3) IDREG_FIELD_END(SMIDR_EL1, SH) + IDREG_FIELD(SMIDR_EL1, RES0, 12, 1) IDREG_FIELD(SMIDR_EL1, Affinity, 0, 12) IDREG_END(SMIDR_EL1)scripts/update-aarch64-cpu-sysreg-properties.py +69
-14@@ -81,9 +81,13 @@ def collect_fields(item, bit_offset=0): # Normal Field Types leaf_types = ['Fields.Field', 'Fields.ConstantField', - 'Fields.EnumeratedField', 'Fields.Bitfield'] + 'Fields.EnumeratedField', 'Fields.Bitfield', 'Fields.Reserved'] if _type in leaf_types: field_copy = item.copy() + + if _type == 'Fields.Reserved' and not field_copy.get('name'): + field_copy['name'] = item.get('value', 'RES0') + if field_copy.get('rangeset'): new_ranges = [] for r in field_copy['rangeset']:@@ -96,7 +100,7 @@ def collect_fields(item, bit_offset=0): return fields # Traverse the hierarchy for other cases - for key in ['fields', 'values', 'fieldsets']: + for key in ['fields', 'values', 'fieldsets', 'constants']: for nested in item.get(key, []): fields.extend(collect_fields(nested, bit_offset))@@ -163,44 +167,95 @@ def generate_sysreg_properties_from_registers_json(id_reg_names, raw_json_path): final_output += f"IDREG_START({reg_name})\n" - unique_fields = {} + fieldset_variants = [] + for fieldset in register.get('fieldsets', []): + current_fieldset_fields = {} candidates = collect_fields(fieldset) + for val in candidates: - name = (val.get('name') or val.get('label', '')).strip() - if not name or "RESERVED" in name.upper(): + raw_name = val.get('name') or val.get('label') or val.get('value') or '' + name = raw_name.strip() + if not name: continue + + name_upper = name.upper() + + # Check for architectural target states, including UNKNOWN remapping + base_reserved = None + for r_type in ["RES0", "RES1", "RAZ", "RAO", "WI", "UNKNOWN"]: + if r_type in name_upper: + base_reserved = "RES0" if r_type == "UNKNOWN" else r_type + break + + is_valid_reserved = base_reserved is not None + if "RESERVED" in name_upper and not is_valid_reserved: + continue + + # Force naming uniformity across padding blocks + if is_valid_reserved: + name = base_reserved + for r in val.get('rangeset', []): lsb = int(r.get('start')) width = r.get('width') msb = lsb + int(width) - 1 - # Only keep the fields with the highest MSB - # needed fir CCSIDR_EL1 - if name not in unique_fields or msb > unique_fields[name]['msb']: - # extract enum values if any + if is_valid_reserved: + unique_key = f"{name}_{lsb}" + else: + unique_key = name + + if unique_key not in current_fieldset_fields or \ + msb > current_fieldset_fields[unique_key]['msb']: enums = extract_field_enums(val) - unique_fields[name] = {'lsb': lsb, 'msb': msb, 'width': width, 'enums': enums} + current_fieldset_fields[unique_key] = { + 'raw_name': name, + 'lsb': lsb, + 'msb': msb, + 'width': width, + 'enums': enums + } + + if current_fieldset_fields: + fieldset_variants.append(current_fieldset_fields) + + best_fieldset = {} + max_total_width = -1 + + for variant in fieldset_variants: + total_width = sum(f['width'] for f in variant.values()) + # prioritize layout variants with the highest MSB coverage + max_msb = max(f['msb'] for f in variant.values()) if variant else 0 + + # Combine width and max_msb into a fitness score tuple + if (total_width, max_msb) > (max_total_width, max_total_width): + max_total_width = total_width + best_fieldset = variant + + unique_fields = best_fieldset # Sort decreasing lsbs sorted_fields = sorted(unique_fields.items(), key=lambda x: x[1]['lsb'], reverse=True) - for name, bits in sorted_fields: + for unique_key, bits in sorted_fields: enums_list = bits.get('enums', []) + clean_name = bits.get('raw_name', unique_key) + if enums_list: line = (f" IDREG_FIELD_START({reg_name}, " - f"{name}, {bits['lsb']}, {bits['width']})\n") + f"{clean_name}, {bits['lsb']}, {bits['width']})\n") else: line = (f" IDREG_FIELD({reg_name}, " - f"{name}, {bits['lsb']}, {bits['width']})\n") + f"{clean_name}, {bits['lsb']}, {bits['width']})\n") final_output += line # add the enum value definition if any for enum_item in enums_list: final_output += (f" IDREG_FIELD_ARCH_VAL({enum_item['value']})\n") if enums_list: - line = (f" IDREG_FIELD_END({reg_name}, {name})\n") + line = (f" IDREG_FIELD_END({reg_name}, {clean_name})\n") final_output += line final_output += f"IDREG_END({reg_name})\n"Signature · 1 line
2.53.0
RFC PATCH v6 16/17 target/arm/kvm: Ignore and trace unexpected writable reserved fields
In reply to Eric AugerKVM currently reports some bits as writable whereas they are RES0 or RAZ. The code easily allows to do some sanity checking for such inconsistencies. Let's add a trace event when this is encountered and skip the field
--- target/arm/kvm.c | 8 ++++++++ target/arm/trace-events | 1 + 2 files changed, 9 insertions(+)
target/arm/kvm.c +8 -0
@@ -434,6 +434,14 @@ decode_idreg_writemap(Object *obj, ARM64SysReg *reg) } lower = field->shift; upper = field->shift + field->length -1 ; + +/* Sanity check the field is not a reserved field */ +if (strstr (field->name,"RES0" ) ||strstr (field->name,"RES1" ) || +strstr (field->name,"RAZ" )) { +trace_unexpected_writable_reserved_field (reg->name, field->name, + lower, upper); +continue ; + } prop_name =g_strdup_printf ("SYSREG_%s_%s" , reg->name, field->name);trace_decode_idreg_writemap (field->name, lower, upper, prop_name); object_property_add(obj, prop_name, "uint64",
target/arm/trace-events +1 -0
@@ -19,6 +19,7 @@ decode_idreg_writemap(const char* name, int lower, int upper, char *prop_name) " get_sysreg_prop(const char *name, uint64_t value) "%s 0x%"PRIx64 set_sysreg_prop(const char *name, uint64_t old, uint64_t mask, uint64_t field_value, uint64_t new) "%s old reg value=0x%"PRIx64" mask=0x%"PRIx64" new field value=0x%"PRIx64" new reg value=0x%"PRIx64 nb_sysreg_props(const char *name, int count) "%s: %d SYSREG properties" +unexpected_writable_reserved_field(const char *reg_name, const char *field_name, int lower, int upper) "Unexpected writable reserved field: %s.%s [%d,%d], skip it ..." # cpu.c arm_cpu_reset(uint64_t mp_aff) "cpu %" PRIu64
Signature · 1 line
2.53.0
RFC PATCH v6 17/17 arm/cpu-features: document ID reg properties
In reply to Eric AugerFrom: Cornelia Huck <[email protected]>
Add some documentation for how individual ID registers can be configured with the host cpu model.
--- docs/system/arm/cpu-features.rst | 106 ++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 8 deletions(-)
docs/system/arm/cpu-features.rst +98 -8
@@ -2,7 +2,10 @@ Arm CPU Features ================ CPU features are optional features that a CPU of supporting type may -choose to implement or not. In QEMU, optional CPU features have +choose to implement or not. QEMU provides two different mechanisms +to configure those features: + +1. For most CPU models, optional CPU features may have corresponding boolean CPU proprieties that, when enabled, indicate that the feature is implemented, and, conversely, when disabled, indicate that it is not implemented. An example of an Arm CPU feature
@@ -31,6 +34,18 @@ running guests in AArch32. CPU features that are inherently specific to KVM are prefixed with "kvm-" and are described in "KVM VCPU Features". +2. Additionally, the ``host`` CPU model on KVM allows to configure optional +CPU features via the corresponding ID registers. The host kernel allows +to write a subset of ID register fields. The host model exposes +properties for each writable ID register field. Those options are named +SYSREG_<IDREG>_<FIELD>. IDREG and FIELD names are those used in the +ARM Architecture Reference Manual. Their availability depend on the host +capability to let the userspace write those fields. Values set with those +properties override the initial values retrieved from the host. They are +written back to KVM and the eventual value applied by KVM depends on whether +the value is sanitized or not by the host kernel. Then those field values +are likely to be overriden again by legacy CPU options which apply at the end. + CPU Feature Probing ===================
@@ -126,13 +141,20 @@ A note about CPU models and KVM Named CPU models generally do not work with KVM. There are a few cases that do work, e.g. using the named CPU model ``cortex-a57`` with KVM on a -seattle host, but mostly if KVM is enabled the ``host`` CPU type must be -used. This means the guest is provided all the same CPU features as the -host CPU type has. And, for this reason, the ``host`` CPU type should -enable all CPU features that the host has by default. Indeed it's even -a bit strange to allow disabling CPU features that the host has when using -the ``host`` CPU type, but in the absence of CPU models it's the best we can -do if we want to launch guests without all the host's CPU features enabled. +seattle host, but mostly if KVM is enabled, the ``host`` CPU model must be +used. + +Using the ``host`` type means the guest is provided all the same CPU +features as the host CPU type has. And, for this reason, the ``host`` +CPU type should enable all CPU features that the host has by default. + +In case some features need to be hidden from the guest, and the host kernel +supports it, the ``host`` model can be instructed to disable individual +ID register values. This is especially useful for migration purposes. +However, this interface will not allow configuring an arbitrary set of +features; the ID registers must describe a subset of the host's features, +and all differences to the host's configuration must actually be supported +by the kernel to be deconfigured. Enabling KVM also affects the ``query-cpu-model-expansion`` QMP command. The affect is not only limited to specific features, as pointed out in example
@@ -169,6 +191,13 @@ disabling many SVE vector lengths would be quite verbose, the ``sve<N>`` CPU properties have special semantics (see "SVE CPU Property Parsing Semantics"). +Additionally, if supported by KVM on the host kernel, the ``host`` CPU model +may be configured via individual ID register field properties, for example:: + + $ qemu-system-aarch64 -M virt -cpu host,SYSREG_ID_AA64ISAR0_EL1_DP=0x0 + +This forces ID_AA64ISAR0_EL1 DP field to 0. + KVM VCPU Features =================
@@ -495,3 +524,64 @@ Legal values for ``S`` are 30, 34, 36, and 39; the default is 30. As with ``x-rme``, the ``x-l0gptsz`` property may be renamed or removed in some future QEMU release. + +Configuring CPU features via ID register fields +=============================================== + +Note that this is currently only supported under KVM, and with the +``host`` CPU model. + +Querying available ID register fields +------------------------------------- + +QEMU will create properties for all ID register fields that are +reported as being writable by the kernel, and that are known to the +QEMU instance. Therefore, the same QEMU binary may expose different +properties when run under a different kernel. + +To find out all available writable ID register fields, use the +``query-cpu-model-expansion`` QMP command:: + + (QEMU) query-cpu-model-expansion type=full model={"name":"host"} + {"return": { + "model": {"name": "host", "props": { + "SYSREG_ID_AA64PFR0_EL1_EL3": 1, "SYSREG_ID_AA64ISAR2_EL1_CLRBHB": 0, + "SYSREG_CTR_EL0_L1Ip": 3, "SYSREG_CTR_EL0_DminLine": 4, + "SYSREG_ID_AA64MMFR0_EL1_BIGEND": 1, "SYSREG_ID_AA64MMFR1_EL1_ECBHB": 0, + "SYSREG_ID_AA64MMFR2_EL1_CnP": 1, "SYSREG_ID_DFR0_EL1_PerfMon": 4, + "SYSREG_ID_AA64PFR0_EL1_DIT": 0, "SYSREG_ID_AA64MMFR1_EL1_HAFDBS": 2, + "SYSREG_ID_AA64ISAR0_EL1_FHM": 0, "SYSREG_ID_AA64ISAR2_EL1_CSSC": 0, + "SYSREG_ID_AA64ISAR0_EL1_DP": 1, (...) + }}}} + +If a certain field in an ID register does not show up in this list, it +is not writable with the specific host kernel. + +A note on compatibility +----------------------- + +A common use case for providing a defined set of ID register values is +to be able to present a fixed set of features to a guest, often referred +to as "stable guest ABI". This may take the form of ironing out differences +between two similar CPUs with the intention of being able to migrate +between machines with those CPUs, or providing the same CPU across Linux +kernel updates on the host. + +Over the course of time, the Linux kernel is changing the set of ID register +fields that are writable by userspace. Newly introduced writable ID +registers should be initialized to 0 to ensure compatibility. However, ID +registers that have already been introduced that undergo a change as to +which fields are writable may introduce incompatibilities that need to be +addressed on a case-by-case basis for the systems that you wish to migrate +inbetween. + +A note on Arm CPU features (FEAT_xxx) +------------------------------------- + +Configuring CPUs is done on a feature level on other architectures, and this +would imply configuring FEAT_xxx values on Arm. However, differences between +CPUs may not map to FEAT_xxx, but to differences in other registers in the +ID register range; for example, differences in the cache architecture exposed +via ``CTR_EL0``. We therefore cannot rely on configuration via FEAT_xxx. A +feature-based interface more similar to other architectures may be implemented +on top of the ID register interface in the future.
Signature · 1 line
2.53.0
Quoted 9 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email|-------------------------------------------------------------------!
Hi Eric,
Thanks for the v6.
Quoted 85 lines
This series enhances the current host KVM model with capability to set writable ID reg fields.
Since v6.7 kernel, KVM/arm allows the userspace to overwrite the values of a subset of ID regs. The list of writable fields continues to grow. The feature ID range is defined as the AArch64 System register space with op0==3, op1=={0, 1, 3}, CRn==0, CRm=={0-7}, op2=={0-7}.
The end goal is to get more flexibility when migrating guests between different host hardware.
QEMU retrieves the writable ID fields from KVM UAPI [1] and match them against a generated description of ID regs and their named fields that stem from AARCHMRS Registers.json file. Current description is based on latest 2026-03 edition. The content of the generated files was compared against kernel linux/arch/arm64/tools/sysreg file. It is not straightforward to have unit tests for python scripts as there are many cases for field extraction.
For each writable named field a uint64 property is created following the "SYSREG_<REG>_<FIELD>" naming convention. REG and FIELD names are those described in ARM ARM Reference manual.
The list of
SYSREG_IDproperties can be retrieved through the qmp monitor using query-cpu-model-expansion [2].For the record, Jinqian was able to migrate between Hisilicon KunPeng HIP09 and HIP12 chips with this series using this kind of command:
-cpu host,pauth=off,pmu=off,sve=off,\
SYSREG_ID_AA64PFR1_EL1_NMI=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LS64=0x0,\
SYSREG_ID_AA64ISAR1_EL1_XS=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LRCPC=0x2,\
SYSREG_ID_AA64ISAR2_EL1_RPRFM=0x0,\
SYSREG_ID_AA64ISAR2_EL1_CLRBHB=0x0,\
SYSREG_ID_AA64ISAR2_EL1_PAC_frac=0x0,\
SYSREG_ID_AA64ISAR2_EL1_BC=0x0,\
SYSREG_ID_AA64ISAR2_EL1_RPRES=0x0,\
SYSREG_ID_AA64ISAR2_EL1_WFxT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_FGT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_BigEnd=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ECBHB=0x0,\
SYSREG_ID_AA64MMFR1_EL1_CMOW=0x0,\
SYSREG_ID_AA64MMFR1_EL1_TIDCP1=0x0,\
SYSREG_ID_AA64MMFR1_EL1_nTLBPA=0x0,\
SYSREG_ID_AA64MMFR1_EL1_AFP=0x0,\
SYSREG_ID_AA64MMFR1_EL1_HCX=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ETS=0x0,\
SYSREG_ID_AA64MMFR1_EL1_PAN=0x2,\
SYSREG_ID_AA64MMFR1_EL1_HAFDBS=0x2,\
SYSREG_ID_AA64MMFR2_EL1_CnP=0x0,\
SYSREG_ID_AA64MMFR3_EL1_TCRX=0x0,\
SYSREG_ID_AA64DFR0_EL1_PMUVer=0x6,\
SYSREG_ID_AA64DFR0_EL1_DebugVer=0x9,\
SYSREG_ID_AA64DFR0_EL1_DoubleLock=0xf,\
SYSREG_ID_AA64ZFR0_EL1_F64MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_F32MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SM4=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SHA3=0x0,\
SYSREG_ID_AA64ZFR0_EL1_BitPerm=0x0,\
SYSREG_ID_AA64ZFR0_EL1_AES=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SVEver=0x0,\
SYSREG_CTR_EL0_L1Ip=0x2 \Connie & Eric
History:
--------
v5 -> v6:
v6 is mostly for Khushit to see how he may work on top of this series. It fulfills some of his requirements:
- Upon Khushit request I added description for enum values and reserved fields
-set_sysreg_propchecks the input value against enum values if any
-writable_bitmapis now dispatched into the sysreg descripton and not stored in vcpu state anymore (besides it is VM wide)
- implemented write for qmp inspection. However this is not yet checked against KVM. That's the next step I think, ie. instantiate a scratch vcpu to test if the field value can be
Quoted 8 lines
applied?
- if some inconsistencies between writable mask and idreg field, reserved fields only produce traces
- simplify checks related to availability of writable map
- this version does not yet fix some reported issues about host supporting nested virt. I will further sync with Khushit. so this is definitively not candidate to be applied, hence the RFC tag.
Thanks!, Will use this series as the base for our v3.
Warm Regards,
Khushit
Quoted 87 lines
v4 -> v5:
- generate target/arm/cpu-idregs.h.inc that look similar to the format used in [RFC PATCH v1 02/13] target/arm:
named_cpu_model: Add ID Register Fields without the description of the value values nor safe policy/value. I guess valid values could be generated from the Registers.json file too. Safe policy/values cannot.
I reused one patch from the above series.
Let's see how both series can progress/coexist without any anticipated bias.
- Addressed all comments from Shameer on v4
- Addressed 2 comments from v4 that were missed including the issue of IDreg visibility affected by some other settings. Unfortunately I was not able to test it.
- Further look at overrides between low level id reg field properties versus legacy CPU options. I have the feeling they can coexist as long as we document the hierarchy between them:
host kvm default -> ID reg field props -> legacy CPU options
- Noticed more writable fields that are RES0/RAZ
- Improved commit messages in generalReferences:
-----------[1]
KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGESKVM_ARM_GET_REG_WRITABLE_MASKSDocumentation/virt/kvm/api.rst[2]
qemu-system-aarch64 -qmp unix:/home/augere/TEST/QEMU/qmp-sock,server,nowait -M virt --enable-kvm -cpu host sudo build/run qmp-shell/home/augere/TEST/QEMU/qmp-sock
Welcome to the QMP low-level shell!
Connected to QEMU 11.0.50
(QEMU) query-cpu-model-expansion type=full model={"name":"host"}Cornelia Huck (3):
target/arm/kvm: Retrieve writable ID reg map
arm-qmp-cmds: introspection for ID register props arm/cpu-features: document ID reg propertiesEric Auger (13):
scripts: introducescripts/update-aarch64-cpu-sysregs-header.pytarget/arm/cpu-sysregs.h.inc: Sort by name alphabetical order target/arm/cpu-sysregs.h.inc: Update with automatic generation arm/cpu: Add infra to handle generated ID register definitions
scripts: Introducescripts/aarch64_sysreg_helpersmodule
scripts: Introducescripts/update-aarch64-cpu-sysreg-properties.pytarget/arm/cpu-idregs.h.inc: generate with script target/arm/cpu-idregs.h.inc: Generate enum values arm/kvm: Initialize all writable ID registers from host target/arm/kvm: Introducekvm_arm_expose_idreg_propertiestarget/arm/cpu: Expose writable ID reg field properties on the kvm
host vcpu model
target/arm/cpu-idregs.h.inc: Generate reserved fields target/arm/kvm: Ignore and trace unexpected writable reserved fieldsShaju Abraham (1):
target/arm/cpu_idregs: generate tables for Arm64 ID registers and
fieldsdocs/system/arm/cpu-features.rst | 106 +- target/arm/cpu-idregs.h | 41 + target/arm/kvm_arm.h | 10 + target/arm/cpu-idregs.h.inc | 2164 +++++++++++++++++ target/arm/cpu-sysregs.h.inc | 57 +- target/arm/arm-qmp-cmds.c | 29 + target/arm/cpu-idregs.c | 96 + target/arm/cpu64.c | 5 + target/arm/kvm.c | 311 ++- scripts/aarch64_sysreg_helpers.py | 109 + .../update-aarch64-cpu-sysreg-properties.py | 290 +++ scripts/update-aarch64-cpu-sysregs-header.py | 51 + target/arm/meson.build | 1 + target/arm/trace-events | 7 + 14 files changed, 3244 insertions(+), 33 deletions(-)create mode 100644
target/arm/cpu-idregs.h
create mode 100644 target/arm/cpu-idregs.h.inc
create mode 100644target/arm/cpu-idregs.c
create mode 100644scripts/aarch64_sysreg_helpers.pycreate mode 100644scripts/update-aarch64-cpu-sysreg-properties.pycreate mode 100755scripts/update-aarch64-cpu-sysregs-header.pySignature · 1 line
2.53.0
Quoted 105 lines · Khushit Shah
Quoted 8 lines · Eric Auger
!-------------------------------------------------------------------|
CAUTION: External Email|-------------------------------------------------------------------!
Hi Eric,
Thanks for the v6.
Quoted 85 lines
This series enhances the current host KVM model with capability to set writable ID reg fields.
Since v6.7 kernel, KVM/arm allows the userspace to overwrite the values of a subset of ID regs. The list of writable fields continues to grow. The feature ID range is defined as the AArch64 System register space with op0==3, op1=={0, 1, 3}, CRn==0, CRm=={0-7}, op2=={0-7}.
The end goal is to get more flexibility when migrating guests between different host hardware.
QEMU retrieves the writable ID fields from KVM UAPI [1] and match them against a generated description of ID regs and their named fields that stem from AARCHMRS Registers.json file. Current description is based on latest 2026-03 edition. The content of the generated files was compared against kernel linux/arch/arm64/tools/sysreg file. It is not straightforward to have unit tests for python scripts as there are many cases for field extraction.
For each writable named field a uint64 property is created following the "SYSREG_<REG>_<FIELD>" naming convention. REG and FIELD names are those described in ARM ARM Reference manual.
The list of
SYSREG_IDproperties can be retrieved through the qmp monitor using query-cpu-model-expansion [2].For the record, Jinqian was able to migrate between Hisilicon KunPeng HIP09 and HIP12 chips with this series using this kind of command:
-cpu host,pauth=off,pmu=off,sve=off,\
SYSREG_ID_AA64PFR1_EL1_NMI=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LS64=0x0,\
SYSREG_ID_AA64ISAR1_EL1_XS=0x0,\
SYSREG_ID_AA64ISAR1_EL1_LRCPC=0x2,\
SYSREG_ID_AA64ISAR2_EL1_RPRFM=0x0,\
SYSREG_ID_AA64ISAR2_EL1_CLRBHB=0x0,\
SYSREG_ID_AA64ISAR2_EL1_PAC_frac=0x0,\
SYSREG_ID_AA64ISAR2_EL1_BC=0x0,\
SYSREG_ID_AA64ISAR2_EL1_RPRES=0x0,\
SYSREG_ID_AA64ISAR2_EL1_WFxT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_FGT=0x0,\
SYSREG_ID_AA64MMFR0_EL1_BigEnd=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ECBHB=0x0,\
SYSREG_ID_AA64MMFR1_EL1_CMOW=0x0,\
SYSREG_ID_AA64MMFR1_EL1_TIDCP1=0x0,\
SYSREG_ID_AA64MMFR1_EL1_nTLBPA=0x0,\
SYSREG_ID_AA64MMFR1_EL1_AFP=0x0,\
SYSREG_ID_AA64MMFR1_EL1_HCX=0x0,\
SYSREG_ID_AA64MMFR1_EL1_ETS=0x0,\
SYSREG_ID_AA64MMFR1_EL1_PAN=0x2,\
SYSREG_ID_AA64MMFR1_EL1_HAFDBS=0x2,\
SYSREG_ID_AA64MMFR2_EL1_CnP=0x0,\
SYSREG_ID_AA64MMFR3_EL1_TCRX=0x0,\
SYSREG_ID_AA64DFR0_EL1_PMUVer=0x6,\
SYSREG_ID_AA64DFR0_EL1_DebugVer=0x9,\
SYSREG_ID_AA64DFR0_EL1_DoubleLock=0xf,\
SYSREG_ID_AA64ZFR0_EL1_F64MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_F32MM=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SM4=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SHA3=0x0,\
SYSREG_ID_AA64ZFR0_EL1_BitPerm=0x0,\
SYSREG_ID_AA64ZFR0_EL1_AES=0x0,\
SYSREG_ID_AA64ZFR0_EL1_SVEver=0x0,\
SYSREG_CTR_EL0_L1Ip=0x2 \Connie & Eric
History:
--------
v5 -> v6:
v6 is mostly for Khushit to see how he may work on top of this series. It fulfills some of his requirements:
- Upon Khushit request I added description for enum values and reserved fields
-set_sysreg_propchecks the input value against enum values if any
-writable_bitmapis now dispatched into the sysreg descripton and not stored in vcpu state anymore (besides it is VM wide)
- implemented write for qmp inspection. However this is not yet checked against KVM. That's the next step I think, ie. instantiate a scratch vcpu to test if the field value can beQuoted 8 lines
applied?
- if some inconsistencies between writable mask and idreg field, reserved fields only produce traces
- simplify checks related to availability of writable map
- this version does not yet fix some reported issues about host supporting nested virt. I will further sync with Khushit. so this is definitively not candidate to be applied, hence the RFC tag.
Quoted 1 line
Thanks!, Will use this series as the base for our v3.
OK.
Few notes:
- I saw there are capabilities to define property aliases (source and destination types must match though). So there could be way to associate a FEAT_ property to SYSREG property for those who strictly match.
- In case people would like to have labelled strings, we could turn the SYSREG props, which are currently uint64 into string props. on set we would convert the string into the isar uint64.
You could maintain a separate description file that associate enum values to string values. If an association exists we would do an intermediate translation.
Thanks
Eric
Quoted 90 lines
Warm Regards,
KhushitQuoted 87 lines
v4 -> v5:
- generate target/arm/cpu-idregs.h.inc that look similar to the format used in [RFC PATCH v1 02/13] target/arm:
named_cpu_model: Add ID Register Fields without the description of the value values nor safe policy/value. I guess valid values could be generated from the Registers.json file too. Safe policy/values cannot.
I reused one patch from the above series.
Let's see how both series can progress/coexist without any anticipated bias.
- Addressed all comments from Shameer on v4
- Addressed 2 comments from v4 that were missed including the issue of IDreg visibility affected by some other settings. Unfortunately I was not able to test it.
- Further look at overrides between low level id reg field properties versus legacy CPU options. I have the feeling they can coexist as long as we document the hierarchy between them:
host kvm default -> ID reg field props -> legacy CPU options
- Noticed more writable fields that are RES0/RAZ
- Improved commit messages in generalReferences:
-----------[1]
KVM_CAP_ARM_SUPPORTED_REG_MASK_RANGESKVM_ARM_GET_REG_WRITABLE_MASKSDocumentation/virt/kvm/api.rst[2]
qemu-system-aarch64 -qmp unix:/home/augere/TEST/QEMU/qmp-sock,server,nowait -M virt --enable-kvm -cpu host sudo build/run qmp-shell/home/augere/TEST/QEMU/qmp-sock
Welcome to the QMP low-level shell!
Connected to QEMU 11.0.50
(QEMU) query-cpu-model-expansion type=full model={"name":"host"}Cornelia Huck (3):
target/arm/kvm: Retrieve writable ID reg map
arm-qmp-cmds: introspection for ID register props arm/cpu-features: document ID reg propertiesEric Auger (13):
scripts: introducescripts/update-aarch64-cpu-sysregs-header.pytarget/arm/cpu-sysregs.h.inc: Sort by name alphabetical order target/arm/cpu-sysregs.h.inc: Update with automatic generation arm/cpu: Add infra to handle generated ID register definitions
scripts: Introducescripts/aarch64_sysreg_helpersmodule
scripts: Introducescripts/update-aarch64-cpu-sysreg-properties.pytarget/arm/cpu-idregs.h.inc: generate with script target/arm/cpu-idregs.h.inc: Generate enum values arm/kvm: Initialize all writable ID registers from host target/arm/kvm: Introducekvm_arm_expose_idreg_propertiestarget/arm/cpu: Expose writable ID reg field properties on the kvm
host vcpu model
target/arm/cpu-idregs.h.inc: Generate reserved fields target/arm/kvm: Ignore and trace unexpected writable reserved fieldsShaju Abraham (1):
target/arm/cpu_idregs: generate tables for Arm64 ID registers and
fieldsdocs/system/arm/cpu-features.rst | 106 +- target/arm/cpu-idregs.h | 41 + target/arm/kvm_arm.h | 10 + target/arm/cpu-idregs.h.inc | 2164 +++++++++++++++++ target/arm/cpu-sysregs.h.inc | 57 +- target/arm/arm-qmp-cmds.c | 29 + target/arm/cpu-idregs.c | 96 + target/arm/cpu64.c | 5 + target/arm/kvm.c | 311 ++- scripts/aarch64_sysreg_helpers.py | 109 + .../update-aarch64-cpu-sysreg-properties.py | 290 +++ scripts/update-aarch64-cpu-sysregs-header.py | 51 + target/arm/meson.build | 1 + target/arm/trace-events | 7 + 14 files changed, 3244 insertions(+), 33 deletions(-)create mode 100644
target/arm/cpu-idregs.h
create mode 100644 target/arm/cpu-idregs.h.inc
create mode 100644target/arm/cpu-idregs.c
create mode 100644scripts/aarch64_sysreg_helpers.pycreate mode 100644scripts/update-aarch64-cpu-sysreg-properties.pycreate mode 100755scripts/update-aarch64-cpu-sysregs-header.pySignature · 1 line
2.53.0
Quoted 9 lines · Eric Auger
Few notes:
- I saw there are capabilities to define property aliases (source and destination types must match though). So there could be way to associate aFEAT_property to SYSREG property for those who strictly match.
Quoted 7 lines
- In case people would like to have labelled strings, we could turn the SYSREG props, which are currently uint64 into string props. on set we would convert the string into the isar uint64.
You could maintain a separate description file that associate enum values to string values. If an association exists we would do an intermediate translation.
This is my plan, but for v3 I am not focusing on property types/names.
Let’s get infra/models without that first.
User friendly properties will be a separate effort.
Warm Regards,
Khushit