Skip to content

arm: rework id register storage

Cornelia Huck kvmarm qemu-arm qemu-devel 8 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest14 patches 15 repliesIn review
  2. v714 patches 13 repliesSuperseded
  3. v614 patches 9 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v513 patches15 repliesSuperseded
v413 patches1 replySuperseded
v314 patches21 repliesSuperseded
v214 patches4 repliesSuperseded
v115 patches13 repliesSuperseded

Changed from v3 from the cover letter

- added R-bs (thanks!)
- added missing SPDX header
- merged patch introducing accessors for kvm to the first user
- skip over sysregs outside of the id register range when generating register definitions again

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/14arm/cpu: Add sysreg definitions in cpu-sysregs.htarget/arm/cpu-sysregs.h target/arm/cpu-sysregs.h.inc target/arm/cpu.h +1 more+149 -00 replies
2/14arm/cpu: Store aa64isar0/aa64zfr0 into the idregs arraystarget/arm/cpu-features.h target/arm/cpu.c target/arm/cpu.h +5 more+97 -620 replies
3/14arm/cpu: Store aa64isar1/2 into the idregs arraytarget/arm/cpu-features.h target/arm/cpu.c target/arm/cpu.h +5 more+48 -560 replies
4/14arm/cpu: Store aa64pfr0/1 into the idregs arraytarget/arm/cpu-features.h target/arm/cpu.c target/arm/cpu.h +5 more+68 -910 replies
5/14arm/cpu: Store aa64mmfr0-3 into the idregs arraytarget/arm/cpu-features.h target/arm/cpu.h target/arm/cpu64.c +5 more+95 -1020 replies
6/14arm/cpu: Store aa64dfr0/1 into the idregs arraytarget/arm/cpu-features.h target/arm/cpu.c target/arm/cpu.h +6 more+43 -520 replies
7/14arm/cpu: Store aa64smfr0 into the idregs arraytarget/arm/cpu-features.h target/arm/cpu.h target/arm/cpu64.c +3 more+9 -140 replies
8/14arm/cpu: Store id_isar0-7 into the idregs arrayhw/intc/armv7m_nvic.c target/arm/cpu-features.h target/arm/cpu.c +7 more+243 -2410 replies
9/14arm/cpu: Store id_pfr0/1/2 into the idregs arrayhw/intc/armv7m_nvic.c target/arm/cpu-features.h target/arm/cpu.c +7 more+82 -890 replies
10/14arm/cpu: Store id_dfr0/1 into the idregs arrayhw/intc/armv7m_nvic.c target/arm/cpu-features.h target/arm/cpu.c +7 more+48 -570 replies
11/14arm/cpu: Store id_mmfr0-5 into the idregs arrayhw/intc/armv7m_nvic.c target/arm/cpu-features.h target/arm/cpu.h +6 more+140 -1560 replies
12/14arm/cpu: Add sysreg generation scriptsMAINTAINERS scripts/arm-gen-cpu-sysregs-header.awk scripts/update-aarch64-sysreg-code.sh+70 -05 replies
13/14arm/cpu: switch to a generated cpu-sysregs.h.inctarget/arm/cpu-sysregs.h.inc+30 -134 replies
14/14arm/kvm: use fd instead of fdarray[2]target/arm/kvm.c+4 -40 replies

Reviews trailers per patch

All 14 patches have a Reviewed-by or Acked-by.

PatchRichard HendersonSebastian OttEric Auger
1/14R-b R-b
2/14R-b R-b
3/14R-b R-b
4/14R-b R-b
5/14R-b R-b
6/14R-b R-b
7/14R-b R-b
8/14R-b R-b
9/14R-b R-b
10/14R-b R-b
11/14R-b R-b
12/14R-b
13/14R-b R-b
14/14R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v8 thread

Cover letter [PATCH v8 00/14] arm: rework id register storage

Mostly addressed Peter's feedback:
- make sure every inbetween stage compiles (also fixed some bonus issues)
- try to make the scripts more robust, add a note the generated file, and make sure to grab only registers we actually want
- I did a half-hearted attempt to use python instead of awk, but I'm out of my depth, especially with the script that will be used for the register fields in the cpu models series

Also available at
https://gitlab.com/cohuck/qemu/-/commits/arm-rework-idreg-storage-v8

<v7 cover letter>
Some small fixes, including fixing up/adding SPDX identifiers, keeping the series bisectable, and updating MAINTAINERS (please check if that's ok.)

<v6 cover letter>
Just some small changes:
- fixed up some botched conversions noted by Eric (thanks!)
- rebased to current master
- new patch with a small cleanup suggested by Eric

<v5 cover letter>
Just a quick respin to fix a missed conversion in hvf.c.

<v4 cover letter>
Next iteration of the id register patches; only small changes.

Changed from v3:
- added R-bs (thanks!)
- added missing SPDX header
- merged patch introducing accessors for kvm to the first user
- skip over sysregs outside of the id register range when generating register definitions again

Also available at
https://gitlab.com/cohuck/qemu/-/commits/arm-rework-idreg-storage-v4

<v3 cover letter>
Yet another update of the id register series, less changes this time around.

Changed from v2:
- changed generation of the various register defines via the "DEF" magic suggested by Richard
- some kvm-only code moved to kvm.c; some code potentially useful to non-kvm code stayed out of there (the cpu model code will make use of it, and that one should be extendable outside of kvm -- a revised version of those patches is still in the works, but I'll be off for a few days and rather wanted to get this one out first)

Also available at
https://gitlab.com/cohuck/qemu/-/commits/arm-rework-idreg-storage-v3

<v2 cover letter>

Changed from v1:
- Noticed that we missed the hvf code. Converted, compiled, but not tested as I'm lacking an environment for testing.
- Hopefully incorporated most of the suggested changes -- if I missed something, it was unintentional unless mentioned below.
- fixed repeated inclusion of definitions
- hopefully made macros more robust
- removed distinction between reading 32/64 values, which was mostly adding churn for little value
- postponed generating property definitions to the cpu model patches, where they are actually used
- juggled hunks and moved them to the right patches
- fixed some typos
- rebased to a more recent code base

NOT changed from v1:
- definitions are still generated from the Linux sysregs file
- I still think updating the generated files on demand (so that we can double check the result) is the right thing to do
- I'm open to changing the source of the definitions from the sysregs file to the JSON definitions published by Arm; however, I first wanted to get the code using it right -- we can switch out the code generating the file to use a different source easily later on, and I'd also like to steal parts of the script from Linux once integrated (which I think hasn't happened yet?)

<v1 cover letter>

[Note: I've kept the cc list from the last round of cpu model patches; so if you're confused as to why you're cc:ed here, take it as a heads-up that a new cpu model series will come along soon]

This patch series contains patches extracted from the larger cpu model series (RFC v2 last posted at
https://lore.kernel.org/qemu-devel/[email protected]/)
and aims at providing a base upon which we can continue with building support for cpu models, but which is hopefully already an improvement on its own.

Main changes from the patches in that series include:
- post-pone the changes to handle KVM writable ID registers for cpu models (I have a series including that on top of this one)
- change how we store the list of ID registers, and access them basically, use an enum for indexing, and an enum doing encodings in a pattern similar to cpregs
- move some hunks to different patches
- update the scripts to generate the register descriptions, and run them against a recent Linux sysregs file

What I've kept:
- generating the register descriptions from the Linux sysregs file I think that file is still our best bet to generate the descriptions easily, and updating the definitions is a manual step that can be checked for unintended changes
- most of the hard work that Eric had been doing; all new bugs in there are my own :)

</v1 cover letter>
</v2 cover letter>
</v3 cover letter>
</v4 cover letter>
</v5 cover letter>
</v6 cover letter>
</v7 cover letter>

Cornelia Huck (2):
arm/cpu: switch to a generated cpu-sysregs.h.inc arm/kvm: use fd instead of fdarray[2]

Eric Auger (12):
arm/cpu: Add sysreg definitions in cpu-sysregs.h arm/cpu: Store aa64isar0/aa64zfr0 into the idregs arrays arm/cpu: Store aa64isar1/2 into the idregs array arm/cpu: Store aa64pfr0/1 into the idregs array arm/cpu: Store aa64mmfr0-3 into the idregs array arm/cpu: Store aa64dfr0/1 into the idregs array arm/cpu: Store aa64smfr0 into the idregs array arm/cpu: Store id_isar0-7 into the idregs array arm/cpu: Store id_pfr0/1/2 into the idregs array arm/cpu: Store id_dfr0/1 into the idregs array arm/cpu: Store id_mmfr0-5 into the idregs array arm/cpu: Add sysreg generation scripts

 MAINTAINERS                            |   1 +
 hw/intc/armv7m_nvic.c                  |  27 +-
 scripts/arm-gen-cpu-sysregs-header.awk |  37 ++
 scripts/update-aarch64-sysreg-code.sh  |  32 ++
 target/arm/cpu-features.h              | 317 ++++++++---------
 target/arm/cpu-sysregs.h               |  42 +++
 target/arm/cpu-sysregs.h.inc           |  53 +++
 target/arm/cpu.c                       | 111 +++---
 target/arm/cpu.h                       |  80 +++--
 target/arm/cpu64.c                     | 128 ++++---
 target/arm/helper.c                    |  68 ++--
 target/arm/hvf/hvf.c                   |  39 ++-
 target/arm/internals.h                 |   6 +-
 target/arm/kvm.c                       | 139 ++++----
 target/arm/ptw.c                       |   6 +-
 target/arm/tcg/cpu-v7m.c               | 174 +++++-----
 target/arm/tcg/cpu32.c                 | 320 ++++++++---------
 target/arm/tcg/cpu64.c                 | 459 +++++++++++++------------
 18 files changed, 1114 insertions(+), 925 deletions(-)
 create mode 100755 scripts/arm-gen-cpu-sysregs-header.awk
 create mode 100755 scripts/update-aarch64-sysreg-code.sh
 create mode 100644 target/arm/cpu-sysregs.h
 create mode 100644 target/arm/cpu-sysregs.h.inc
Signature · 1 line
2.49.0