Series comparison

-[PULL 00/22] target-arm queue
+[PULL 0/5] target-arm queue
-target-arm queue: mostly patches from me this time round.
+This pullreq has:
-Nothing too exciting.
+ * two arm bug fixes which fix some "Linux fails to boot" bugs
  * a docs typo-fixing patch
  * a couple of compile failure/warning issues
+I think they're all pretty safe and worth having in rc3.
+thanks
 -- PMM
-The following changes since commit 78ac2eebbab9150edf5d0d00e3648f5ebb599001:
+The following changes since commit a6b1c53e79d08a99a28cc3e67a3e1a7c34102d6b:
-  Merge tag 'artist-cursor-fix-final-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2022-05-18 09:32:15 -0700)
+  Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-10 10:26:57 -0700)
 are available in the Git repository at:
-  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220519
+  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220812
-for you to fetch changes up to fab8ad39fb75a0d9f097db67b2a334444754e88e:
+for you to fetch changes up to 4311682ea8293f720730f260e8a7601117d79e65:
-  target/arm: Use FIELD definitions for CPACR, CPTR_ELx (2022-05-19 18:34:10 +0100)
+  cutils: Add missing dyld(3) include on macOS (2022-08-12 11:33:52 +0100)
 ----------------------------------------------------------------
 target-arm queue:
- * Implement FEAT_S2FWB
+ * Don't report Statistical Profiling Extension in ID registers
- * Implement FEAT_IDST
+ * virt ACPI tables: Present the GICR structure properly for GICv4
- * Drop unsupported_encoding() macro
+ * Fix some typos in documentation
- * hw/intc/arm_gicv3: Use correct number of priority bits for the CPU
+ * tests/unit: fix a -Wformat-truncation warning
- * Fix aarch64 debug register names
+ * cutils: Add missing dyld(3) include on macOS
  * hw/adc/zynq-xadc: Use qemu_irq typedef
  * target/arm/helper.c: Delete stray obsolete comment
  * Make number of counters in PMCR follow the CPU
  * hw/arm/virt: Fix dtb nits
  * ptimer: Rename PTIMER_POLICY_DEFAULT to PTIMER_POLICY_LEGACY
  * target/arm: Fix PAuth keys access checks for disabled SEL2
  * Enable FEAT_HCX for -cpu max
  * Use FIELD definitions for CPACR, CPTR_ELx
 ----------------------------------------------------------------
-Chris Howard (1):
+Marc-André Lureau (1):
-      Fix aarch64 debug register names.
+      tests/unit: fix a -Wformat-truncation warning
-Florian Lugou (1):
+Peter Maydell (1):
-      target/arm: Fix PAuth keys access checks for disabled SEL2
+      target/arm: Don't report Statistical Profiling Extension in ID registers
 Peter Maydell (17):
       target/arm: Postpone interpretation of stage 2 descriptor attribute bits
       target/arm: Factor out FWB=0 specific part of combine_cacheattrs()
       target/arm: Implement FEAT_S2FWB
       target/arm: Enable FEAT_S2FWB for -cpu max
       target/arm: Implement FEAT_IDST
       target/arm: Drop unsupported_encoding() macro
       hw/intc/arm_gicv3_cpuif: Handle CPUs that don't specify GICv3 parameters
       hw/intc/arm_gicv3: report correct PRIbits field in ICV_CTLR_EL1
       hw/intc/arm_gicv3_kvm.c: Stop using GIC_MIN_BPR constant
       hw/intc/arm_gicv3: Support configurable number of physical priority bits
       hw/intc/arm_gicv3: Use correct number of priority bits for the CPU
       hw/intc/arm_gicv3: Provide ich_num_aprs()
       target/arm/helper.c: Delete stray obsolete comment
       target/arm: Make number of counters in PMCR follow the CPU
       hw/arm/virt: Fix incorrect non-secure flash dtb node name
       hw/arm/virt: Drop #size-cells and #address-cells from gpio-keys dtb node
       ptimer: Rename PTIMER_POLICY_DEFAULT to PTIMER_POLICY_LEGACY
 Philippe Mathieu-Daudé (1):
-      hw/adc/zynq-xadc: Use qemu_irq typedef
+      cutils: Add missing dyld(3) include on macOS
-Richard Henderson (2):
+Stefan Weil (1):
-      target/arm: Enable FEAT_HCX for -cpu max
+      Fix some typos in documentation (most of them found by codespell)
       target/arm: Use FIELD definitions for CPACR, CPTR_ELx
- docs/system/arm/emulation.rst      |   2 +
+Zenghui Yu (1):
- include/hw/adc/zynq-xadc.h         |   3 +-
+      hw/arm/virt-acpi-build: Present the GICR structure properly for GICv4
  include/hw/intc/arm_gicv3_common.h |   8 +-
  include/hw/ptimer.h                |  16 +-
  target/arm/cpregs.h                |  24 +++
  target/arm/cpu.h                   |  76 +++++++-
  target/arm/internals.h             |  11 +-
  target/arm/translate-a64.h         |   9 -
  hw/adc/zynq-xadc.c                 |   4 +-
  hw/arm/boot.c                      |   2 +-
  hw/arm/musicpal.c                  |   2 +-
  hw/arm/virt.c                      |   4 +-
  hw/core/machine.c                  |   4 +-
  hw/dma/xilinx_axidma.c             |   2 +-
  hw/dma/xlnx_csu_dma.c              |   2 +-
  hw/intc/arm_gicv3_common.c         |   5 +
  hw/intc/arm_gicv3_cpuif.c          | 225 +++++++++++++++++-------
  hw/intc/arm_gicv3_kvm.c            |  16 +-
  hw/m68k/mcf5206.c                  |   2 +-
  hw/m68k/mcf5208.c                  |   2 +-
  hw/net/can/xlnx-zynqmp-can.c       |   2 +-
  hw/net/fsl_etsec/etsec.c           |   2 +-
  hw/net/lan9118.c                   |   2 +-
  hw/rtc/exynos4210_rtc.c            |   4 +-
  hw/timer/allwinner-a10-pit.c       |   2 +-
  hw/timer/altera_timer.c            |   2 +-
  hw/timer/arm_timer.c               |   2 +-
  hw/timer/digic-timer.c             |   2 +-
  hw/timer/etraxfs_timer.c           |   6 +-
  hw/timer/exynos4210_mct.c          |   6 +-
  hw/timer/exynos4210_pwm.c          |   2 +-
  hw/timer/grlib_gptimer.c           |   2 +-
  hw/timer/imx_epit.c                |   4 +-
  hw/timer/imx_gpt.c                 |   2 +-
  hw/timer/mss-timer.c               |   2 +-
  hw/timer/sh_timer.c                |   2 +-
  hw/timer/slavio_timer.c            |   2 +-
  hw/timer/xilinx_timer.c            |   2 +-
  target/arm/cpu.c                   |  11 +-
  target/arm/cpu64.c                 |  30 ++++
  target/arm/cpu_tcg.c               |   6 +
  target/arm/helper.c                | 348 ++++++++++++++++++++++++++++---------
  target/arm/kvm64.c                 |  12 ++
  target/arm/op_helper.c             |   9 +
  target/arm/translate-a64.c         |  36 +++-
  tests/unit/ptimer-test.c           |   6 +-
 files changed, 697 insertions(+), 228 deletions(-)
+ docs/about/deprecated.rst               |  2 +-
+ docs/specs/acpi_erst.rst                |  4 ++--
+ docs/system/devices/canokey.rst         |  8 ++++----
+ docs/system/devices/cxl.rst             | 12 ++++++------
+ hw/arm/virt-acpi-build.c                |  4 ++--
+ target/arm/cpu.c                        | 11 +++++++++++
+ tests/unit/test-qobject-input-visitor.c |  3 +--
+ util/cutils.c                           |  4 ++++
+ util/oslib-posix.c                      |  4 ----
+files changed, 31 insertions(+), 21 deletions(-)

-[PULL 01/22] target/arm: Postpone interpretation of stage 2 descriptor attribute bits
+Deleted patch
-In the original Arm v8 two-stage translation, both stage 1 and stage
-specify memory attributes (memory type, cacheability,
-shareability); these are then combined to produce the overall memory
-attributes for the whole stage 1+2 access.  In QEMU we implement this
-by having get_phys_addr() fill in an ARMCacheAttrs struct, and we
-convert both the stage 1 and stage 2 attribute bit formats to the
-same encoding (an 8-bit attribute value matching the MAIR_EL1 fields,
-plus a 2-bit shareability value).
-The new FEAT_S2FWB feature allows the guest to enable a different
-interpretation of the attribute bits in the stage 2 descriptors.
-These bits can now be used to control details of how the stage 1 and
-attributes should be combined (for instance they can say "always
-use the stage 1 attributes" or "ignore the stage 1 attributes and
-always be Device memory").  This means we need to pass the raw bit
-information for stage 2 down to the function which combines the stage
-and stage 2 information.
-Add a field to ARMCacheAttrs that indicates whether the attrs field
-should be interpreted as MAIR format, or as the raw stage 2 attribute
-bits from the descriptor, and store the appropriate values when
-filling in cacheattrs.
-We only need to interpret the attrs field in a few places:
- * in do_ats_write(), where we know to expect a MAIR value
-   (there is no ATS instruction to do a stage-2-only walk)
- * in S1_ptw_translate(), where we want to know whether the
-   combined S1 + S2 attributes indicate Device memory that
-   should provoke a fault
- * in combine_cacheattrs(), which does the S1 + S2 combining
-Update those places accordingly.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220505183950.2781801-2-peter.maydell@linaro.org
----
- target/arm/internals.h |  7 ++++++-
- target/arm/helper.c    | 42 ++++++++++++++++++++++++++++++++++++------
-files changed, 42 insertions(+), 7 deletions(-)
-diff --git a/target/arm/internals.h b/target/arm/internals.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/internals.h
-+++ b/target/arm/internals.h
-@@ -XXX,XX +XXX,XX @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
- /* Cacheability and shareability attributes for a memory access */
- typedef struct ARMCacheAttrs {
--    unsigned int attrs:8; /* as in the MAIR register encoding */
-+    /*
-+     * If is_s2_format is true, attrs is the S2 descriptor bits [5:2]
-+     * Otherwise, attrs is the same as the MAIR_EL1 8-bit format
-+     */
-+    unsigned int attrs:8;
-     unsigned int shareability:2; /* as in the SH field of the VMSAv8-64 PTEs */
-+    bool is_s2_format:1;
- } ARMCacheAttrs;
- bool get_phys_addr(CPUARMState *env, target_ulong address,
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
-     ret = get_phys_addr(env, value, access_type, mmu_idx, &phys_addr, &attrs,
-                         &prot, &page_size, &fi, &cacheattrs);
-+    /*
-+     * ATS operations only do S1 or S1+S2 translations, so we never
-+     * have to deal with the ARMCacheAttrs format for S2 only.
-+     */
-+    assert(!cacheattrs.is_s2_format);
-+
-     if (ret) {
-         /*
-          * Some kinds of translation fault must cause exceptions rather
-@@ -XXX,XX +XXX,XX @@ static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,
-     return true;
- }
-+static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs)
-+{
-+    /*
-+     * For an S1 page table walk, the stage 1 attributes are always
-+     * some form of "this is Normal memory". The combined S1+S2
-+     * attributes are therefore only Device if stage 2 specifies Device.
-+     * With HCR_EL2.FWB == 0 this is when descriptor bits [5:4] are 0b00,
-+     * ie when cacheattrs.attrs bits [3:2] are 0b00.
-+     */
-+    assert(cacheattrs.is_s2_format);
-+    return (cacheattrs.attrs & 0xc) == 0;
-+}
-+
- /* Translate a S1 pagetable walk through S2 if needed.  */
- static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
-                                hwaddr addr, bool *is_secure,
-@@ -XXX,XX +XXX,XX @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
-             return ~0;
-         }
-         if ((arm_hcr_el2_eff(env) & HCR_PTW) &&
--            (cacheattrs.attrs & 0xf0) == 0) {
-+            ptw_attrs_are_device(env, cacheattrs)) {
-             /*
-              * PTW set and S1 walk touched S2 Device memory:
-              * generate Permission fault.
-@@ -XXX,XX +XXX,XX @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address,
-     }
-     if (mmu_idx == ARMMMUIdx_Stage2 || mmu_idx == ARMMMUIdx_Stage2_S) {
--        cacheattrs->attrs = convert_stage2_attrs(env, extract32(attrs, 0, 4));
-+        cacheattrs->is_s2_format = true;
-+        cacheattrs->attrs = extract32(attrs, 0, 4);
-     } else {
-         /* Index into MAIR registers for cache attributes */
-         uint8_t attrindx = extract32(attrs, 0, 3);
-         uint64_t mair = env->cp15.mair_el[regime_el(env, mmu_idx)];
-         assert(attrindx <= 7);
-+        cacheattrs->is_s2_format = false;
-         cacheattrs->attrs = extract64(mair, attrindx * 8, 8);
-     }
-@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
- /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
-  * and CombineS1S2Desc()
-  *
-+ * @env:     CPUARMState
-  * @s1:      Attributes from stage 1 walk
-  * @s2:      Attributes from stage 2 walk
-  */
--static ARMCacheAttrs combine_cacheattrs(ARMCacheAttrs s1, ARMCacheAttrs s2)
-+static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
-+                                        ARMCacheAttrs s1, ARMCacheAttrs s2)
- {
-     uint8_t s1lo, s2lo, s1hi, s2hi;
-     ARMCacheAttrs ret;
-     bool tagged = false;
-+    uint8_t s2_mair_attrs;
-+
-+    assert(s2.is_s2_format && !s1.is_s2_format);
-+    ret.is_s2_format = false;
-+
-+    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
-     if (s1.attrs == 0xf0) {
-         tagged = true;
-@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(ARMCacheAttrs s1, ARMCacheAttrs s2)
-     }
-     s1lo = extract32(s1.attrs, 0, 4);
--    s2lo = extract32(s2.attrs, 0, 4);
-+    s2lo = extract32(s2_mair_attrs, 0, 4);
-     s1hi = extract32(s1.attrs, 4, 4);
--    s2hi = extract32(s2.attrs, 4, 4);
-+    s2hi = extract32(s2_mair_attrs, 4, 4);
-     /* Combine shareability attributes (table D4-43) */
-     if (s1.shareability == 2 || s2.shareability == 2) {
-@@ -XXX,XX +XXX,XX @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
-                 }
-                 cacheattrs->shareability = 0;
-             }
--            *cacheattrs = combine_cacheattrs(*cacheattrs, cacheattrs2);
-+            *cacheattrs = combine_cacheattrs(env, *cacheattrs, cacheattrs2);
-             /* Check if IPA translates to secure or non-secure PA space. */
-             if (arm_is_secure_below_el3(env)) {
-@@ -XXX,XX +XXX,XX @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
-         /* Fill in cacheattr a-la AArch64.TranslateAddressS1Off. */
-         hcr = arm_hcr_el2_eff(env);
-         cacheattrs->shareability = 0;
-+        cacheattrs->is_s2_format = false;
-         if (hcr & HCR_DC) {
-             if (hcr & HCR_DCT) {
-                 memattr = 0xf0;  /* Tagged, Normal, WB, RWA */
---
-.25.1

-[PULL 02/22] target/arm: Factor out FWB=0 specific part of combine_cacheattrs()
+Deleted patch
-Factor out the part of combine_cacheattrs() that is specific to
-handling HCR_EL2.FWB == 0.  This is the part where we combine the
-memory type and cacheability attributes.
-The "force Outer Shareable for Device or Normal Inner-NC Outer-NC"
-logic remains in combine_cacheattrs() because it holds regardless
-(this is the equivalent of the pseudocode EffectiveShareability()
-function).
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220505183950.2781801-3-peter.maydell@linaro.org
----
- target/arm/helper.c | 88 +++++++++++++++++++++++++--------------------
-file changed, 50 insertions(+), 38 deletions(-)
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
-     }
- }
-+/*
-+ * Combine the memory type and cacheability attributes of
-+ * s1 and s2 for the HCR_EL2.FWB == 0 case, returning the
-+ * combined attributes in MAIR_EL1 format.
-+ */
-+static uint8_t combined_attrs_nofwb(CPUARMState *env,
-+                                    ARMCacheAttrs s1, ARMCacheAttrs s2)
-+{
-+    uint8_t s1lo, s2lo, s1hi, s2hi, s2_mair_attrs, ret_attrs;
-+
-+    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
-+
-+    s1lo = extract32(s1.attrs, 0, 4);
-+    s2lo = extract32(s2_mair_attrs, 0, 4);
-+    s1hi = extract32(s1.attrs, 4, 4);
-+    s2hi = extract32(s2_mair_attrs, 4, 4);
-+
-+    /* Combine memory type and cacheability attributes */
-+    if (s1hi == 0 || s2hi == 0) {
-+        /* Device has precedence over normal */
-+        if (s1lo == 0 || s2lo == 0) {
-+            /* nGnRnE has precedence over anything */
-+            ret_attrs = 0;
-+        } else if (s1lo == 4 || s2lo == 4) {
-+            /* non-Reordering has precedence over Reordering */
-+            ret_attrs = 4;  /* nGnRE */
-+        } else if (s1lo == 8 || s2lo == 8) {
-+            /* non-Gathering has precedence over Gathering */
-+            ret_attrs = 8;  /* nGRE */
-+        } else {
-+            ret_attrs = 0xc; /* GRE */
-+        }
-+    } else { /* Normal memory */
-+        /* Outer/inner cacheability combine independently */
-+        ret_attrs = combine_cacheattr_nibble(s1hi, s2hi) << 4
-+                  | combine_cacheattr_nibble(s1lo, s2lo);
-+    }
-+    return ret_attrs;
-+}
-+
- /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
-  * and CombineS1S2Desc()
-  *
-@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
- static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
-                                         ARMCacheAttrs s1, ARMCacheAttrs s2)
- {
--    uint8_t s1lo, s2lo, s1hi, s2hi;
-     ARMCacheAttrs ret;
-     bool tagged = false;
--    uint8_t s2_mair_attrs;
-     assert(s2.is_s2_format && !s1.is_s2_format);
-     ret.is_s2_format = false;
--    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
--
-     if (s1.attrs == 0xf0) {
-         tagged = true;
-         s1.attrs = 0xff;
-     }
--    s1lo = extract32(s1.attrs, 0, 4);
--    s2lo = extract32(s2_mair_attrs, 0, 4);
--    s1hi = extract32(s1.attrs, 4, 4);
--    s2hi = extract32(s2_mair_attrs, 4, 4);
--
-     /* Combine shareability attributes (table D4-43) */
-     if (s1.shareability == 2 || s2.shareability == 2) {
-         /* if either are outer-shareable, the result is outer-shareable */
-@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
-     }
-     /* Combine memory type and cacheability attributes */
--    if (s1hi == 0 || s2hi == 0) {
--        /* Device has precedence over normal */
--        if (s1lo == 0 || s2lo == 0) {
--            /* nGnRnE has precedence over anything */
--            ret.attrs = 0;
--        } else if (s1lo == 4 || s2lo == 4) {
--            /* non-Reordering has precedence over Reordering */
--            ret.attrs = 4;  /* nGnRE */
--        } else if (s1lo == 8 || s2lo == 8) {
--            /* non-Gathering has precedence over Gathering */
--            ret.attrs = 8;  /* nGRE */
--        } else {
--            ret.attrs = 0xc; /* GRE */
--        }
-+    ret.attrs = combined_attrs_nofwb(env, s1, s2);
--        /* Any location for which the resultant memory type is any
--         * type of Device memory is always treated as Outer Shareable.
--         */
-+    /*
-+     * Any location for which the resultant memory type is any
-+     * type of Device memory is always treated as Outer Shareable.
-+     * Any location for which the resultant memory type is Normal
-+     * Inner Non-cacheable, Outer Non-cacheable is always treated
-+     * as Outer Shareable.
-+     * TODO: FEAT_XS adds another value (0x40) also meaning iNCoNC
-+     */
-+    if ((ret.attrs & 0xf0) == 0 || ret.attrs == 0x44) {
-         ret.shareability = 2;
--    } else { /* Normal memory */
--        /* Outer/inner cacheability combine independently */
--        ret.attrs = combine_cacheattr_nibble(s1hi, s2hi) << 4
--                  | combine_cacheattr_nibble(s1lo, s2lo);
--
--        if (ret.attrs == 0x44) {
--            /* Any location for which the resultant memory type is Normal
--             * Inner Non-cacheable, Outer Non-cacheable is always treated
--             * as Outer Shareable.
--             */
--            ret.shareability = 2;
--        }
-     }
-     /* TODO: CombineS1S2Desc does not consider transient, only WB, RWA. */
---
-.25.1

-[PULL 03/22] target/arm: Implement FEAT_S2FWB
+Deleted patch
-Implement the handling of FEAT_S2FWB; the meat of this is in the new
-combined_attrs_fwb() function which combines S1 and S2 attributes
-when HCR_EL2.FWB is set.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220505183950.2781801-4-peter.maydell@linaro.org
----
- target/arm/cpu.h    |  5 +++
- target/arm/helper.c | 84 +++++++++++++++++++++++++++++++++++++++++++--
-files changed, 86 insertions(+), 3 deletions(-)
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_st(const ARMISARegisters *id)
-     return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, ST) != 0;
- }
-+static inline bool isar_feature_aa64_fwb(const ARMISARegisters *id)
-+{
-+    return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, FWB) != 0;
-+}
-+
- static inline bool isar_feature_aa64_bti(const ARMISARegisters *id)
- {
-     return FIELD_EX64(id->id_aa64pfr1, ID_AA64PFR1, BT) != 0;
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask)
-         if (cpu_isar_feature(aa64_scxtnum, cpu)) {
-             valid_mask |= HCR_ENSCXT;
-         }
-+        if (cpu_isar_feature(aa64_fwb, cpu)) {
-+            valid_mask |= HCR_FWB;
-+        }
-     }
-     /* Clear RES0 bits.  */
-@@ -XXX,XX +XXX,XX @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask)
-      * HCR_PTW forbids certain page-table setups
-      * HCR_DC disables stage1 and enables stage2 translation
-      * HCR_DCT enables tagging on (disabled) stage1 translation
-+     * HCR_FWB changes the interpretation of stage2 descriptor bits
-      */
--    if ((env->cp15.hcr_el2 ^ value) & (HCR_VM | HCR_PTW | HCR_DC | HCR_DCT)) {
-+    if ((env->cp15.hcr_el2 ^ value) &
-+        (HCR_VM | HCR_PTW | HCR_DC | HCR_DCT | HCR_FWB)) {
-         tlb_flush(CPU(cpu));
-     }
-     env->cp15.hcr_el2 = value;
-@@ -XXX,XX +XXX,XX @@ static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs)
-      * attributes are therefore only Device if stage 2 specifies Device.
-      * With HCR_EL2.FWB == 0 this is when descriptor bits [5:4] are 0b00,
-      * ie when cacheattrs.attrs bits [3:2] are 0b00.
-+     * With HCR_EL2.FWB == 1 this is when descriptor bit [4] is 0, ie
-+     * when cacheattrs.attrs bit [2] is 0.
-      */
-     assert(cacheattrs.is_s2_format);
--    return (cacheattrs.attrs & 0xc) == 0;
-+    if (arm_hcr_el2_eff(env) & HCR_FWB) {
-+        return (cacheattrs.attrs & 0x4) == 0;
-+    } else {
-+        return (cacheattrs.attrs & 0xc) == 0;
-+    }
- }
- /* Translate a S1 pagetable walk through S2 if needed.  */
-@@ -XXX,XX +XXX,XX @@ static uint8_t combined_attrs_nofwb(CPUARMState *env,
-     return ret_attrs;
- }
-+static uint8_t force_cacheattr_nibble_wb(uint8_t attr)
-+{
-+    /*
-+     * Given the 4 bits specifying the outer or inner cacheability
-+     * in MAIR format, return a value specifying Normal Write-Back,
-+     * with the allocation and transient hints taken from the input
-+     * if the input specified some kind of cacheable attribute.
-+     */
-+    if (attr == 0 || attr == 4) {
-+        /*
-+         * 0 == an UNPREDICTABLE encoding
-+         * 4 == Non-cacheable
-+         * Either way, force Write-Back RW allocate non-transient
-+         */
-+        return 0xf;
-+    }
-+    /* Change WriteThrough to WriteBack, keep allocation and transient hints */
-+    return attr | 4;
-+}
-+
-+/*
-+ * Combine the memory type and cacheability attributes of
-+ * s1 and s2 for the HCR_EL2.FWB == 1 case, returning the
-+ * combined attributes in MAIR_EL1 format.
-+ */
-+static uint8_t combined_attrs_fwb(CPUARMState *env,
-+                                  ARMCacheAttrs s1, ARMCacheAttrs s2)
-+{
-+    switch (s2.attrs) {
-+    case 7:
-+        /* Use stage 1 attributes */
-+        return s1.attrs;
-+    case 6:
-+        /*
-+         * Force Normal Write-Back. Note that if S1 is Normal cacheable
-+         * then we take the allocation hints from it; otherwise it is
-+         * RW allocate, non-transient.
-+         */
-+        if ((s1.attrs & 0xf0) == 0) {
-+            /* S1 is Device */
-+            return 0xff;
-+        }
-+        /* Need to check the Inner and Outer nibbles separately */
-+        return force_cacheattr_nibble_wb(s1.attrs & 0xf) |
-+            force_cacheattr_nibble_wb(s1.attrs >> 4) << 4;
-+    case 5:
-+        /* If S1 attrs are Device, use them; otherwise Normal Non-cacheable */
-+        if ((s1.attrs & 0xf0) == 0) {
-+            return s1.attrs;
-+        }
-+        return 0x44;
-+    case 0 ... 3:
-+        /* Force Device, of subtype specified by S2 */
-+        return s2.attrs << 2;
-+    default:
-+        /*
-+         * RESERVED values (including RES0 descriptor bit [5] being nonzero);
-+         * arbitrarily force Device.
-+         */
-+        return 0;
-+    }
-+}
-+
- /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
-  * and CombineS1S2Desc()
-  *
-@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
-     }
-     /* Combine memory type and cacheability attributes */
--    ret.attrs = combined_attrs_nofwb(env, s1, s2);
-+    if (arm_hcr_el2_eff(env) & HCR_FWB) {
-+        ret.attrs = combined_attrs_fwb(env, s1, s2);
-+    } else {
-+        ret.attrs = combined_attrs_nofwb(env, s1, s2);
-+    }
-     /*
-      * Any location for which the resultant memory type is any
---
-.25.1

-[PULL 04/22] target/arm: Enable FEAT_S2FWB for -cpu max
+Deleted patch
-Enable the FEAT_S2FWB for -cpu max. Since FEAT_S2FWB requires that
-CLIDR_EL1.{LoUU,LoUIS} are zero, we explicitly squash these (the
-inherited CLIDR_EL1 value from the Cortex-A57 has them as 1).
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220505183950.2781801-5-peter.maydell@linaro.org
----
- docs/system/arm/emulation.rst |  1 +
- target/arm/cpu64.c            | 11 +++++++++++
-files changed, 12 insertions(+)
-diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst
-index XXXXXXX..XXXXXXX 100644
---- a/docs/system/arm/emulation.rst
-+++ b/docs/system/arm/emulation.rst
-@@ -XXX,XX +XXX,XX @@ the following architecture extensions:
- - FEAT_RAS (Reliability, availability, and serviceability)
- - FEAT_RDM (Advanced SIMD rounding double multiply accumulate instructions)
- - FEAT_RNG (Random number generator)
-+- FEAT_S2FWB (Stage 2 forced Write-Back)
- - FEAT_SB (Speculation Barrier)
- - FEAT_SEL2 (Secure EL2)
- - FEAT_SHA1 (SHA1 instructions)
-diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu64.c
-+++ b/target/arm/cpu64.c
-@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
- {
-     ARMCPU *cpu = ARM_CPU(obj);
-     uint64_t t;
-+    uint32_t u;
-     if (kvm_enabled() || hvf_enabled()) {
-         /* With KVM or HVF, '-cpu max' is identical to '-cpu host' */
-@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
-     t = FIELD_DP64(t, MIDR_EL1, REVISION, 0);
-     cpu->midr = t;
-+    /*
-+     * We're going to set FEAT_S2FWB, which mandates that CLIDR_EL1.{LoUU,LoUIS}
-+     * are zero.
-+     */
-+    u = cpu->clidr;
-+    u = FIELD_DP32(u, CLIDR_EL1, LOUIS, 0);
-+    u = FIELD_DP32(u, CLIDR_EL1, LOUU, 0);
-+    cpu->clidr = u;
-+
-     t = cpu->isar.id_aa64isar0;
-     t = FIELD_DP64(t, ID_AA64ISAR0, AES, 2);      /* FEAT_PMULL */
-     t = FIELD_DP64(t, ID_AA64ISAR0, SHA1, 1);     /* FEAT_SHA1 */
-@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
-     t = FIELD_DP64(t, ID_AA64MMFR2, IESB, 1);     /* FEAT_IESB */
-     t = FIELD_DP64(t, ID_AA64MMFR2, VARANGE, 1);  /* FEAT_LVA */
-     t = FIELD_DP64(t, ID_AA64MMFR2, ST, 1);       /* FEAT_TTST */
-+    t = FIELD_DP64(t, ID_AA64MMFR2, FWB, 1);      /* FEAT_S2FWB */
-     t = FIELD_DP64(t, ID_AA64MMFR2, TTL, 1);      /* FEAT_TTL */
-     t = FIELD_DP64(t, ID_AA64MMFR2, BBM, 2);      /* FEAT_BBM at level 2 */
-     cpu->isar.id_aa64mmfr2 = t;
---
-.25.1

-[PULL 05/22] target/arm: Implement FEAT_IDST
+Deleted patch
-The Armv8.4 feature FEAT_IDST specifies that exceptions generated by
-read accesses to the feature ID space should report a syndrome code
-of 0x18 (EC_SYSTEMREGISTERTRAP) rather than 0x00 (EC_UNCATEGORIZED).
-The feature ID space is defined to be:
- op0 == 3, op1 == {0,1,3}, CRn == 0, CRm == {0-7}, op2 == {0-7}
-In our implementation we might return the EC_UNCATEGORIZED syndrome
-value for a system register access in four cases:
- * no reginfo struct in the hashtable
- * cp_access_ok() fails (ie ri->access doesn't permit the access)
- * ri->accessfn returns CP_ACCESS_TRAP_UNCATEGORIZED at runtime
- * ri->type includes ARM_CP_RAISES_EXC, and the readfn raises
-   an UNDEF exception at runtime
-We have very few regdefs that set ARM_CP_RAISES_EXC, and none of
-them are in the feature ID space. (In the unlikely event that any
-are added in future they would need to take care of setting the
-correct syndrome themselves.) This patch deals with the other
-three cases, and enables FEAT_IDST for AArch64 -cpu max.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220509155457.3560724-1-peter.maydell@linaro.org
----
- docs/system/arm/emulation.rst |  1 +
- target/arm/cpregs.h           | 24 ++++++++++++++++++++++++
- target/arm/cpu.h              |  5 +++++
- target/arm/cpu64.c            |  1 +
- target/arm/op_helper.c        |  9 +++++++++
- target/arm/translate-a64.c    | 28 ++++++++++++++++++++++++++--
-files changed, 66 insertions(+), 2 deletions(-)
-diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst
-index XXXXXXX..XXXXXXX 100644
---- a/docs/system/arm/emulation.rst
-+++ b/docs/system/arm/emulation.rst
-@@ -XXX,XX +XXX,XX @@ the following architecture extensions:
- - FEAT_FlagM2 (Enhancements to flag manipulation instructions)
- - FEAT_HPDS (Hierarchical permission disables)
- - FEAT_I8MM (AArch64 Int8 matrix multiplication instructions)
-+- FEAT_IDST (ID space trap handling)
- - FEAT_IESB (Implicit error synchronization event)
- - FEAT_JSCVT (JavaScript conversion instructions)
- - FEAT_LOR (Limited ordering regions)
-diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpregs.h
-+++ b/target/arm/cpregs.h
-@@ -XXX,XX +XXX,XX @@ static inline bool cp_access_ok(int current_el,
- /* Raw read of a coprocessor register (as needed for migration, etc) */
- uint64_t read_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri);
-+/*
-+ * Return true if the cp register encoding is in the "feature ID space" as
-+ * defined by FEAT_IDST (and thus should be reported with ER_ELx.EC
-+ * as EC_SYSTEMREGISTERTRAP rather than EC_UNCATEGORIZED).
-+ */
-+static inline bool arm_cpreg_encoding_in_idspace(uint8_t opc0, uint8_t opc1,
-+                                                 uint8_t opc2,
-+                                                 uint8_t crn, uint8_t crm)
-+{
-+    return opc0 == 3 && (opc1 == 0 || opc1 == 1 || opc1 == 3) &&
-+        crn == 0 && crm < 8;
-+}
-+
-+/*
-+ * As arm_cpreg_encoding_in_idspace(), but take the encoding from an
-+ * ARMCPRegInfo.
-+ */
-+static inline bool arm_cpreg_in_idspace(const ARMCPRegInfo *ri)
-+{
-+    return ri->state == ARM_CP_STATE_AA64 &&
-+        arm_cpreg_encoding_in_idspace(ri->opc0, ri->opc1, ri->opc2,
-+                                      ri->crn, ri->crm);
-+}
-+
- #endif /* TARGET_ARM_CPREGS_H */
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_fwb(const ARMISARegisters *id)
-     return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, FWB) != 0;
- }
-+static inline bool isar_feature_aa64_ids(const ARMISARegisters *id)
-+{
-+    return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, IDS) != 0;
-+}
-+
- static inline bool isar_feature_aa64_bti(const ARMISARegisters *id)
- {
-     return FIELD_EX64(id->id_aa64pfr1, ID_AA64PFR1, BT) != 0;
-diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu64.c
-+++ b/target/arm/cpu64.c
-@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
-     t = FIELD_DP64(t, ID_AA64MMFR2, IESB, 1);     /* FEAT_IESB */
-     t = FIELD_DP64(t, ID_AA64MMFR2, VARANGE, 1);  /* FEAT_LVA */
-     t = FIELD_DP64(t, ID_AA64MMFR2, ST, 1);       /* FEAT_TTST */
-+    t = FIELD_DP64(t, ID_AA64MMFR2, IDS, 1);      /* FEAT_IDST */
-     t = FIELD_DP64(t, ID_AA64MMFR2, FWB, 1);      /* FEAT_S2FWB */
-     t = FIELD_DP64(t, ID_AA64MMFR2, TTL, 1);      /* FEAT_TTL */
-     t = FIELD_DP64(t, ID_AA64MMFR2, BBM, 2);      /* FEAT_BBM at level 2 */
-diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/op_helper.c
-+++ b/target/arm/op_helper.c
-@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(mrs_banked)(CPUARMState *env, uint32_t tgtmode, uint32_t regno)
- void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome,
-                                  uint32_t isread)
- {
-+    ARMCPU *cpu = env_archcpu(env);
-     const ARMCPRegInfo *ri = rip;
-     CPAccessResult res = CP_ACCESS_OK;
-     int target_el;
-@@ -XXX,XX +XXX,XX @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome,
-     case CP_ACCESS_TRAP:
-         break;
-     case CP_ACCESS_TRAP_UNCATEGORIZED:
-+        if (cpu_isar_feature(aa64_ids, cpu) && isread &&
-+            arm_cpreg_in_idspace(ri)) {
-+            /*
-+             * FEAT_IDST says this should be reported as EC_SYSTEMREGISTERTRAP,
-+             * not EC_UNCATEGORIZED
-+             */
-+            break;
-+        }
-         syndrome = syn_uncategorized();
-         break;
-     default:
-diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/translate-a64.c
-+++ b/target/arm/translate-a64.c
-@@ -XXX,XX +XXX,XX @@ static void gen_set_nzcv(TCGv_i64 tcg_rt)
-     tcg_temp_free_i32(nzcv);
- }
-+static void gen_sysreg_undef(DisasContext *s, bool isread,
-+                             uint8_t op0, uint8_t op1, uint8_t op2,
-+                             uint8_t crn, uint8_t crm, uint8_t rt)
-+{
-+    /*
-+     * Generate code to emit an UNDEF with correct syndrome
-+     * information for a failed system register access.
-+     * This is EC_UNCATEGORIZED (ie a standard UNDEF) in most cases,
-+     * but if FEAT_IDST is implemented then read accesses to registers
-+     * in the feature ID space are reported with the EC_SYSTEMREGISTERTRAP
-+     * syndrome.
-+     */
-+    uint32_t syndrome;
-+
-+    if (isread && dc_isar_feature(aa64_ids, s) &&
-+        arm_cpreg_encoding_in_idspace(op0, op1, op2, crn, crm)) {
-+        syndrome = syn_aa64_sysregtrap(op0, op1, op2, crn, crm, rt, isread);
-+    } else {
-+        syndrome = syn_uncategorized();
-+    }
-+    gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syndrome,
-+                       default_exception_el(s));
-+}
-+
- /* MRS - move from system register
-  * MSR (register) - move to system register
-  * SYS
-@@ -XXX,XX +XXX,XX @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread,
-         qemu_log_mask(LOG_UNIMP, "%s access to unsupported AArch64 "
-                       "system register op0:%d op1:%d crn:%d crm:%d op2:%d\n",
-                       isread ? "read" : "write", op0, op1, crn, crm, op2);
--        unallocated_encoding(s);
-+        gen_sysreg_undef(s, isread, op0, op1, op2, crn, crm, rt);
-         return;
-     }
-     /* Check access permissions */
-     if (!cp_access_ok(s->current_el, ri, isread)) {
--        unallocated_encoding(s);
-+        gen_sysreg_undef(s, isread, op0, op1, op2, crn, crm, rt);
-         return;
-     }
---
-.25.1

-[PULL 22/22] target/arm: Use FIELD definitions for CPACR, CPTR_ELx
+[PULL 1/5] target/arm: Don't report Statistical Profiling Extension in ID registers
-From: Richard Henderson <richard.henderson@linaro.org>
+The newly added neoverse-n1 CPU has ID register values which indicate
 the presence of the Statistical Profiling Extension, because the real
 hardware has this feature.  QEMU's TCG emulation does not yet
 implement SPE, though (not even as a minimal stub implementation), so
 guests will crash if they try to use it because the SPE system
 registers don't exist.
-We had a few CPTR_* bits defined, but missed quite a few.
+Force ID_AA64DFR0_EL1.PMSVer to 0 in CPU realize for TCG, so that
-Complete all of the fields up to ARMv9.2.
+we don't advertise to the guest a feature that doesn't exist.
 Use FIELD_EX64 instead of manual extract32.
-Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+(We could alternatively do this by editing the value that
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
+aarch64_neoverse_n1_initfn() sets for this ID register, but
-Message-id: 20220517054850.177016-3-richard.henderson@linaro.org
+suppressing the field in realize means we won't re-introduce this bug
 when we add other CPUs that have SPE in hardware, such as the
 Neoverse-V1.)
 An example of a non-booting guest is current mainline Linux (5.19),
 when booting in EL2 on the virt board (ie with -machine
 virtualization=on).
 Reported-by: Zenghui Yu <yuzenghui@huawei.com>
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
+Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
+Message-id: 20220811131127.947334-1-peter.maydell@linaro.org
 ---
- target/arm/cpu.h    | 44 +++++++++++++++++++++++++++++++-----
+ target/arm/cpu.c | 11 +++++++++++
- hw/arm/boot.c       |  2 +-
+file changed, 11 insertions(+)
  target/arm/cpu.c    | 11 ++++++---
  target/arm/helper.c | 54 ++++++++++++++++++++++-----------------------
 files changed, 75 insertions(+), 36 deletions(-)
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -XXX,XX +XXX,XX @@ void pmu_init(ARMCPU *cpu);
- #define SCTLR_SPINTMASK (1ULL << 62) /* FEAT_NMI */
- #define SCTLR_TIDCP   (1ULL << 63) /* FEAT_TIDCP1 */
--#define CPTR_TCPAC    (1U << 31)
--#define CPTR_TTA      (1U << 20)
--#define CPTR_TFP      (1U << 10)
--#define CPTR_TZ       (1U << 8)   /* CPTR_EL2 */
--#define CPTR_EZ       (1U << 8)   /* CPTR_EL3 */
-+/* Bit definitions for CPACR (AArch32 only) */
-+FIELD(CPACR, CP10, 20, 2)
-+FIELD(CPACR, CP11, 22, 2)
-+FIELD(CPACR, TRCDIS, 28, 1)    /* matches CPACR_EL1.TTA */
-+FIELD(CPACR, D32DIS, 30, 1)    /* up to v7; RAZ in v8 */
-+FIELD(CPACR, ASEDIS, 31, 1)
-+
-+/* Bit definitions for CPACR_EL1 (AArch64 only) */
-+FIELD(CPACR_EL1, ZEN, 16, 2)
-+FIELD(CPACR_EL1, FPEN, 20, 2)
-+FIELD(CPACR_EL1, SMEN, 24, 2)
-+FIELD(CPACR_EL1, TTA, 28, 1)   /* matches CPACR.TRCDIS */
-+
-+/* Bit definitions for HCPTR (AArch32 only) */
-+FIELD(HCPTR, TCP10, 10, 1)
-+FIELD(HCPTR, TCP11, 11, 1)
-+FIELD(HCPTR, TASE, 15, 1)
-+FIELD(HCPTR, TTA, 20, 1)
-+FIELD(HCPTR, TAM, 30, 1)       /* matches CPTR_EL2.TAM */
-+FIELD(HCPTR, TCPAC, 31, 1)     /* matches CPTR_EL2.TCPAC */
-+
-+/* Bit definitions for CPTR_EL2 (AArch64 only) */
-+FIELD(CPTR_EL2, TZ, 8, 1)      /* !E2H */
-+FIELD(CPTR_EL2, TFP, 10, 1)    /* !E2H, matches HCPTR.TCP10 */
-+FIELD(CPTR_EL2, TSM, 12, 1)    /* !E2H */
-+FIELD(CPTR_EL2, ZEN, 16, 2)    /* E2H */
-+FIELD(CPTR_EL2, FPEN, 20, 2)   /* E2H */
-+FIELD(CPTR_EL2, SMEN, 24, 2)   /* E2H */
-+FIELD(CPTR_EL2, TTA, 28, 1)
-+FIELD(CPTR_EL2, TAM, 30, 1)    /* matches HCPTR.TAM */
-+FIELD(CPTR_EL2, TCPAC, 31, 1)  /* matches HCPTR.TCPAC */
-+
-+/* Bit definitions for CPTR_EL3 (AArch64 only) */
-+FIELD(CPTR_EL3, EZ, 8, 1)
-+FIELD(CPTR_EL3, TFP, 10, 1)
-+FIELD(CPTR_EL3, ESM, 12, 1)
-+FIELD(CPTR_EL3, TTA, 20, 1)
-+FIELD(CPTR_EL3, TAM, 30, 1)
-+FIELD(CPTR_EL3, TCPAC, 31, 1)
- #define MDCR_EPMAD    (1U << 21)
- #define MDCR_EDAD     (1U << 20)
-diff --git a/hw/arm/boot.c b/hw/arm/boot.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/arm/boot.c
-+++ b/hw/arm/boot.c
-@@ -XXX,XX +XXX,XX @@ static void do_cpu_reset(void *opaque)
-                         env->cp15.scr_el3 |= SCR_ATA;
-                     }
-                     if (cpu_isar_feature(aa64_sve, cpu)) {
--                        env->cp15.cptr_el[3] |= CPTR_EZ;
-+                        env->cp15.cptr_el[3] |= R_CPTR_EL3_EZ_MASK;
-                     }
-                     /* AArch64 kernels never boot in secure mode */
-                     assert(!info->secure_boot);
 diff --git a/target/arm/cpu.c b/target/arm/cpu.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/cpu.c
 +++ b/target/arm/cpu.c
-@@ -XXX,XX +XXX,XX @@ static void arm_cpu_reset(DeviceState *dev)
+@@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
          /* Trap on btype=3 for PACIxSP. */
          env->cp15.sctlr_el[1] |= SCTLR_BT0;
          /* and to the FP/Neon instructions */
 -        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 2, 3);
 +        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
 +                                         CPACR_EL1, FPEN, 3);
          /* and to the SVE instructions */
 -        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 16, 2, 3);
 +        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
 +                                         CPACR_EL1, ZEN, 3);
          /* with reasonable vector length */
          if (cpu_isar_feature(aa64_sve, cpu)) {
              env->vfp.zcr_el[1] =
@@ -XXX,XX +XXX,XX @@ static void arm_cpu_reset(DeviceState *dev)
      } else {
  #if defined(CONFIG_USER_ONLY)
          /* Userspace expects access to cp10 and cp11 for FP/Neon */
 -        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 4, 0xf);
 +        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
 +                                         CPACR, CP10, 3);
 +        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
 +                                         CPACR, CP11, 3);
  #endif
      }
 diff --git a/target/arm/helper.c b/target/arm/helper.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/helper.c
 +++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
           */
          if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) {
              /* VFP coprocessor: cp10 & cp11 [23:20] */
 -            mask |= (1 << 31) | (1 << 30) | (0xf << 20);
 +            mask |= R_CPACR_ASEDIS_MASK |
 +                    R_CPACR_D32DIS_MASK |
 +                    R_CPACR_CP11_MASK |
 +                    R_CPACR_CP10_MASK;
              if (!arm_feature(env, ARM_FEATURE_NEON)) {
                  /* ASEDIS [31] bit is RAO/WI */
 -                value |= (1 << 31);
 +                value |= R_CPACR_ASEDIS_MASK;
              }
              /* VFPv3 and upwards with NEON implement 32 double precision
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
               */
              if (!cpu_isar_feature(aa32_simd_r32, env_archcpu(env))) {
                  /* D32DIS [30] is RAO/WI if D16-31 are not implemented. */
 -                value |= (1 << 30);
 +                value |= R_CPACR_D32DIS_MASK;
              }
          }
          value &= mask;
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
       */
      if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
          !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
 -        value &= ~(0xf << 20);
 -        value |= env->cp15.cpacr_el1 & (0xf << 20);
 +        mask = R_CPACR_CP11_MASK | R_CPACR_CP10_MASK;
 +        value = (value & ~mask) | (env->cp15.cpacr_el1 & mask);
      }
      env->cp15.cpacr_el1 = value;
@@ -XXX,XX +XXX,XX @@ static uint64_t cpacr_read(CPUARMState *env, const ARMCPRegInfo *ri)
      if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
          !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
 -        value &= ~(0xf << 20);
 +        value = ~(R_CPACR_CP11_MASK | R_CPACR_CP10_MASK);
      }
      return value;
  }
@@ -XXX,XX +XXX,XX @@ static CPAccessResult cpacr_access(CPUARMState *env, const ARMCPRegInfo *ri,
      if (arm_feature(env, ARM_FEATURE_V8)) {
          /* Check if CPACR accesses are to be trapped to EL2 */
          if (arm_current_el(env) == 1 && arm_is_el2_enabled(env) &&
 -            (env->cp15.cptr_el[2] & CPTR_TCPAC)) {
 +            FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TCPAC)) {
              return CP_ACCESS_TRAP_EL2;
          /* Check if CPACR accesses are to be trapped to EL3 */
          } else if (arm_current_el(env) < 3 &&
 -                   (env->cp15.cptr_el[3] & CPTR_TCPAC)) {
 +                   FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TCPAC)) {
              return CP_ACCESS_TRAP_EL3;
          }
      }
@@ -XXX,XX +XXX,XX @@ static CPAccessResult cptr_access(CPUARMState *env, const ARMCPRegInfo *ri,
                                    bool isread)
  {
      /* Check if CPTR accesses are set to trap to EL3 */
 -    if (arm_current_el(env) == 2 && (env->cp15.cptr_el[3] & CPTR_TCPAC)) {
 +    if (arm_current_el(env) == 2 &&
 +        FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TCPAC)) {
          return CP_ACCESS_TRAP_EL3;
      }
@@ -XXX,XX +XXX,XX @@ static void cptr_el2_write(CPUARMState *env, const ARMCPRegInfo *ri,
       */
      if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
          !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
 -        value &= ~(0x3 << 10);
 -        value |= env->cp15.cptr_el[2] & (0x3 << 10);
 +        uint64_t mask = R_HCPTR_TCP11_MASK | R_HCPTR_TCP10_MASK;
 +        value = (value & ~mask) | (env->cp15.cptr_el[2] & mask);
      }
      env->cp15.cptr_el[2] = value;
  }
@@ -XXX,XX +XXX,XX @@ static uint64_t cptr_el2_read(CPUARMState *env, const ARMCPRegInfo *ri)
      if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
          !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
 -        value |= 0x3 << 10;
 +        value |= R_HCPTR_TCP11_MASK | R_HCPTR_TCP10_MASK;
      }
      return value;
  }
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
      uint64_t hcr_el2 = arm_hcr_el2_eff(env);
      if (el <= 1 && (hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) {
 -        /* Check CPACR.ZEN.  */
 -        switch (extract32(env->cp15.cpacr_el1, 16, 2)) {
 +        switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, ZEN)) {
          case 1:
              if (el != 0) {
                  break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
          }
          /* Check CPACR.FPEN.  */
 -        switch (extract32(env->cp15.cpacr_el1, 20, 2)) {
 +        switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, FPEN)) {
          case 1:
              if (el != 0) {
                  break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
       */
      if (el <= 2) {
          if (hcr_el2 & HCR_E2H) {
 -            /* Check CPTR_EL2.ZEN.  */
 -            switch (extract32(env->cp15.cptr_el[2], 16, 2)) {
 +            switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, ZEN)) {
              case 1:
                  if (el != 0 || !(hcr_el2 & HCR_TGE)) {
                      break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
                  return 2;
              }
 -            /* Check CPTR_EL2.FPEN.  */
 -            switch (extract32(env->cp15.cptr_el[2], 20, 2)) {
 +            switch (FIELD_EX32(env->cp15.cptr_el[2], CPTR_EL2, FPEN)) {
              case 1:
                  if (el == 2 || !(hcr_el2 & HCR_TGE)) {
                      break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
                  return 0;
              }
          } else if (arm_is_el2_enabled(env)) {
 -            if (env->cp15.cptr_el[2] & CPTR_TZ) {
 +            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TZ)) {
                  return 2;
              }
 -            if (env->cp15.cptr_el[2] & CPTR_TFP) {
 +            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TFP)) {
                  return 0;
              }
          }
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
      /* CPTR_EL3.  Since EZ is negative we must check for EL3.  */
      if (arm_feature(env, ARM_FEATURE_EL3)
 -        && !(env->cp15.cptr_el[3] & CPTR_EZ)) {
 +        && !FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, EZ)) {
          return 3;
      }
  #endif
-@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
-      * This register is ignored if E2H+TGE are both set.
++    if (tcg_enabled()) {
 +        /*
 +         * Don't report the Statistical Profiling Extension in the ID
 +         * registers, because TCG doesn't implement it yet (not even a
 +         * minimal stub version) and guests will fall over when they
 +         * try to access the non-existent system registers for it.
 +         */
 +        cpu->isar.id_aa64dfr0 =
 +            FIELD_DP64(cpu->isar.id_aa64dfr0, ID_AA64DFR0, PMSVER, 0);
 +    }
 +
      /* MPU can be configured out of a PMSA CPU either by setting has-mpu
       * to false or by setting pmsav7-dregion to 0.
       */
-     if ((hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) {
--        int fpen = extract32(env->cp15.cpacr_el1, 20, 2);
-+        int fpen = FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, FPEN);
-         switch (fpen) {
-         case 0:
-@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
-      */
-     if (cur_el <= 2) {
-         if (hcr_el2 & HCR_E2H) {
--            /* Check CPTR_EL2.FPEN.  */
--            switch (extract32(env->cp15.cptr_el[2], 20, 2)) {
-+            switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, FPEN)) {
-             case 1:
-                 if (cur_el != 0 || !(hcr_el2 & HCR_TGE)) {
-                     break;
-@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
-                 return 2;
-             }
-         } else if (arm_is_el2_enabled(env)) {
--            if (env->cp15.cptr_el[2] & CPTR_TFP) {
-+            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TFP)) {
-                 return 2;
-             }
-         }
-     }
-     /* CPTR_EL3 : present in v8 */
--    if (env->cp15.cptr_el[3] & CPTR_TFP) {
-+    if (FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TFP)) {
-         /* Trap all FP ops to EL3 */
-         return 3;
-     }
 --
 .25.1

-[PULL 21/22] target/arm: Enable FEAT_HCX for -cpu max
+[PULL 2/5] Fix some typos in documentation (most of them found by codespell)
-From: Richard Henderson <richard.henderson@linaro.org>
+From: Stefan Weil <sw@weilnetz.de>
-This feature adds a new register, HCRX_EL2, which controls
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
-many of the newer AArch64 features.  So far the register is
+Reviewed-by: Hongren (Zenithal) Zheng <i@zenithal.me>
-effectively RES0, because none of the new features are done.
+Message-id: 20220812075642.1200578-1-sw@weilnetz.de
 Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220517054850.177016-2-richard.henderson@linaro.org
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 ---
- target/arm/cpu.h    | 20 ++++++++++++++++++
+ docs/about/deprecated.rst       |  2 +-
- target/arm/cpu64.c  |  1 +
+ docs/specs/acpi_erst.rst        |  4 ++--
- target/arm/helper.c | 50 +++++++++++++++++++++++++++++++++++++++++++++
+ docs/system/devices/canokey.rst |  8 ++++----
-files changed, 71 insertions(+)
+ docs/system/devices/cxl.rst     | 12 ++++++------
 files changed, 13 insertions(+), 13 deletions(-)
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
+diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
 index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
+--- a/docs/about/deprecated.rst
-+++ b/target/arm/cpu.h
++++ b/docs/about/deprecated.rst
-@@ -XXX,XX +XXX,XX @@ typedef struct CPUArchState {
+@@ -XXX,XX +XXX,XX @@ by using ``-machine graphics=off``.
-         uint32_t pmsav5_data_ap; /* PMSAv5 MPU data access permissions */
+ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-         uint32_t pmsav5_insn_ap; /* PMSAv5 MPU insn access permissions */
-         uint64_t hcr_el2; /* Hypervisor configuration register */
+ In QEMU versions 6.1, 6.2 and 7.0, the ``nvme-ns`` generates an EUI-64
-+        uint64_t hcrx_el2; /* Extended Hypervisor configuration register */
+-identifer that is not globally unique. If an EUI-64 identifer is required, the
-         uint64_t scr_el3; /* Secure configuration register.  */
++identifier that is not globally unique. If an EUI-64 identifier is required, the
-         union { /* Fault status registers.  */
+ user must set it explicitly using the ``nvme-ns`` device parameter ``eui64``.
-             struct {
-@@ -XXX,XX +XXX,XX @@ static inline void xpsr_write(CPUARMState *env, uint32_t val, uint32_t mask)
+ ``-device nvme,use-intel-id=on|off`` (since 7.1)
- #define HCR_TWEDEN    (1ULL << 59)
+diff --git a/docs/specs/acpi_erst.rst b/docs/specs/acpi_erst.rst
  #define HCR_TWEDEL    MAKE_64BIT_MASK(60, 4)
 +#define HCRX_ENAS0    (1ULL << 0)
 +#define HCRX_ENALS    (1ULL << 1)
 +#define HCRX_ENASR    (1ULL << 2)
 +#define HCRX_FNXS     (1ULL << 3)
 +#define HCRX_FGTNXS   (1ULL << 4)
 +#define HCRX_SMPME    (1ULL << 5)
 +#define HCRX_TALLINT  (1ULL << 6)
 +#define HCRX_VINMI    (1ULL << 7)
 +#define HCRX_VFNMI    (1ULL << 8)
 +#define HCRX_CMOW     (1ULL << 9)
 +#define HCRX_MCE2     (1ULL << 10)
 +#define HCRX_MSCEN    (1ULL << 11)
 +
  #define HPFAR_NS      (1ULL << 63)
  #define SCR_NS                (1U << 0)
@@ -XXX,XX +XXX,XX @@ static inline bool arm_is_el2_enabled(CPUARMState *env)
   * Not included here is HCR_RW.
   */
  uint64_t arm_hcr_el2_eff(CPUARMState *env);
 +uint64_t arm_hcrx_el2_eff(CPUARMState *env);
  /* Return true if the specified exception level is running in AArch64 state. */
  static inline bool arm_el_is_aa64(CPUARMState *env, int el)
@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_ats1e1(const ARMISARegisters *id)
      return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, PAN) >= 2;
  }
 +static inline bool isar_feature_aa64_hcx(const ARMISARegisters *id)
 +{
 +    return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, HCX) != 0;
 +}
 +
  static inline bool isar_feature_aa64_uao(const ARMISARegisters *id)
  {
      return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, UAO) != 0;
 diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
 index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu64.c
+--- a/docs/specs/acpi_erst.rst
-+++ b/target/arm/cpu64.c
++++ b/docs/specs/acpi_erst.rst
-@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
+@@ -XXX,XX +XXX,XX @@ Slot 0 contains a backend storage header that identifies the contents
-     t = FIELD_DP64(t, ID_AA64MMFR1, LO, 1);       /* FEAT_LOR */
+ as ERST and also facilitates efficient access to the records.
-     t = FIELD_DP64(t, ID_AA64MMFR1, PAN, 2);      /* FEAT_PAN2 */
+ Depending upon the size of the backend storage, additional slots will
-     t = FIELD_DP64(t, ID_AA64MMFR1, XNX, 1);      /* FEAT_XNX */
+ be designated to be a part of the slot 0 header. For example, at 8KiB,
-+    t = FIELD_DP64(t, ID_AA64MMFR1, HCX, 1);      /* FEAT_HCX */
+-the slot 0 header can accomodate 1021 records. Thus a storage size
-     cpu->isar.id_aa64mmfr1 = t;
++the slot 0 header can accommodate 1021 records. Thus a storage size
+ of 8MiB (8KiB * 1024) requires an additional slot for use by the
-     t = cpu->isar.id_aa64mmfr2;
+ header. In this scenario, slot 0 and slot 1 form the backend storage
-diff --git a/target/arm/helper.c b/target/arm/helper.c
+ header, and records can be stored starting at slot 2.
@@ -XXX,XX +XXX,XX @@ References
  [2] "Unified Extensible Firmware Interface Specification",
      version 2.1, October 2008.
 -[3] "Windows Hardware Error Architecture", specfically
 +[3] "Windows Hardware Error Architecture", specifically
      "Error Record Persistence Mechanism".
 diff --git a/docs/system/devices/canokey.rst b/docs/system/devices/canokey.rst
 index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
+--- a/docs/system/devices/canokey.rst
-+++ b/target/arm/helper.c
++++ b/docs/system/devices/canokey.rst
-@@ -XXX,XX +XXX,XX @@ uint64_t arm_hcr_el2_eff(CPUARMState *env)
+@@ -XXX,XX +XXX,XX @@ With the same software configuration as a hardware key,
-     return ret;
+ the guest OS can use all the functionalities of a secure key as if
- }
+ there was actually an hardware key plugged in.
-+static void hcrx_write(CPUARMState *env, const ARMCPRegInfo *ri,
+-CanoKey QEMU provides much convenience for debuging:
-+                       uint64_t value)
++CanoKey QEMU provides much convenience for debugging:
-+{
-+    uint64_t valid_mask = 0;
+-* libcanokey-qemu supports debuging output thus developers can
-+
++* libcanokey-qemu supports debugging output thus developers can
-+    /* No features adding bits to HCRX are implemented. */
+   inspect what happens inside a secure key
-+
+ * CanoKey QEMU supports trace event thus event
-+    /* Clear RES0 bits.  */
+ * QEMU USB stack supports pcap thus USB packet between the guest
-+    env->cp15.hcrx_el2 = value & valid_mask;
+@@ -XXX,XX +XXX,XX @@ and find CanoKey QEMU there:
-+}
-+
+ You may setup the key as guided in [6]_. The console for the key is at [7]_.
-+static CPAccessResult access_hxen(CPUARMState *env, const ARMCPRegInfo *ri,
-+                                  bool isread)
+-Debuging
-+{
+-========
-+    if (arm_current_el(env) < 3
++Debugging
-+        && arm_feature(env, ARM_FEATURE_EL3)
++=========
-+        && !(env->cp15.scr_el3 & SCR_HXEN)) {
-+        return CP_ACCESS_TRAP_EL3;
+ CanoKey QEMU consists of two parts, ``libcanokey-qemu.so`` and ``canokey.c``,
-+    }
+ the latter of which resides in QEMU. The former provides core functionality
-+    return CP_ACCESS_OK;
+diff --git a/docs/system/devices/cxl.rst b/docs/system/devices/cxl.rst
-+}
+index XXXXXXX..XXXXXXX 100644
-+
+--- a/docs/system/devices/cxl.rst
-+static const ARMCPRegInfo hcrx_el2_reginfo = {
++++ b/docs/system/devices/cxl.rst
-+    .name = "HCRX_EL2", .state = ARM_CP_STATE_AA64,
+@@ -XXX,XX +XXX,XX @@ CXL Fixed Memory Windows (CFMW)
-+    .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 2, .opc2 = 2,
+ A CFMW consists of a particular range of Host Physical Address space
-+    .access = PL2_RW, .writefn = hcrx_write, .accessfn = access_hxen,
+ which is routed to particular CXL Host Bridges.  At time of generic
-+    .fieldoffset = offsetof(CPUARMState, cp15.hcrx_el2),
+ software initialization it will have a particularly interleaving
-+};
+-configuration and associated Quality of Serice Throtling Group (QTG).
-+
++configuration and associated Quality of Service Throttling Group (QTG).
-+/* Return the effective value of HCRX_EL2.  */
+ This information is available to system software, when making
-+uint64_t arm_hcrx_el2_eff(CPUARMState *env)
+ decisions about how to configure interleave across available CXL
-+{
+ memory devices.  It is provide as CFMW Structures (CFMWS) in
-+    /*
+@@ -XXX,XX +XXX,XX @@ specification defined register interface called CXL Host Bridge
-+     * The bits in this register behave as 0 for all purposes other than
+ Component Registers (CHBCR). The location of this CHBCR MMIO
-+     * direct reads of the register if:
+ space is described to system software via a CXL Host Bridge
-+     *   - EL2 is not enabled in the current security state,
+ Structure (CHBS) in the CEDT ACPI table.  The actual interfaces
-+     *   - SCR_EL3.HXEn is 0.
+-are identical to those used for other parts of the CXL heirarchy
-+     */
++are identical to those used for other parts of the CXL hierarchy
-+    if (!arm_is_el2_enabled(env)
+ as CXL Component Registers in PCI BARs.
-+        || (arm_feature(env, ARM_FEATURE_EL3)
-+            && !(env->cp15.scr_el3 & SCR_HXEN))) {
+ Interfaces provided include:
-+        return 0;
+@@ -XXX,XX +XXX,XX @@ CXL Memory Devices - Type 3
-+    }
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+    return env->cp15.hcrx_el2;
+ CXL type 3 devices use a PCI class code and are intended to be supported
-+}
+ by a generic operating system driver. They have HDM decoders
-+
+-though in these EP devices, the decoder is reponsible not for
- static void cptr_el2_write(CPUARMState *env, const ARMCPRegInfo *ri,
++though in these EP devices, the decoder is responsible not for
-                            uint64_t value)
+ routing but for translation of the incoming host physical address (HPA)
- {
+ into a Device Physical Address (DPA).
-@@ -XXX,XX +XXX,XX @@ void register_cp_regs_for_features(ARMCPU *cpu)
-         define_arm_cp_regs(cpu, zcr_reginfo);
+@@ -XXX,XX +XXX,XX @@ Notes:
-     }
+     ranges of the system physical address map.  Each CFMW has
+     particular interleave setup across the CXL Host Bridges (HB)
-+    if (cpu_isar_feature(aa64_hcx, cpu)) {
+     CFMW0 provides uninterleaved access to HB0, CFW2 provides
-+        define_one_arm_cp_reg(cpu, &hcrx_el2_reginfo);
+-    uninterleaved acess to HB1. CFW1 provides interleaved memory access
-+    }
++    uninterleaved access to HB1. CFW1 provides interleaved memory access
-+
+     across HB0 and HB1.
- #ifdef TARGET_AARCH64
-     if (cpu_isar_feature(aa64_pauth, cpu)) {
+ (2) **Two CXL Host Bridges**. Each of these has 2 CXL Root Ports and
-         define_arm_cp_regs(cpu, pauth_reginfo);
+@@ -XXX,XX +XXX,XX @@ Example topology involving a switch::
              ---------------------------------------------------
             |    Switch 0  USP as PCI 0d:00.0                   |
             |    USP has HDM decoder which direct traffic to    |
 -           |    appropiate downstream port                     |
 +           |    appropriate downstream port                    |
             |    Switch BUS appears as 0e                       |
             |x__________________________________________________|
              |                  |               |              |
@@ -XXX,XX +XXX,XX @@ An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave::
  Kernel Configuration Options
  ----------------------------
 -In Linux 5.18 the followings options are necessary to make use of
 +In Linux 5.18 the following options are necessary to make use of
  OS management of CXL memory devices as described here.
  * CONFIG_CXL_BUS
 --
 .25.1

-[PULL 06/22] target/arm: Drop unsupported_encoding() macro
+[PULL 3/5] tests/unit: fix a -Wformat-truncation warning
-The unsupported_encoding() macro logs a LOG_UNIMP message and then
+From: Marc-André Lureau <marcandre.lureau@redhat.com>
 generates code to raise the usual exception for an unallocated
 encoding.  Back when we were still implementing the A64 decoder this
 was helpful for flagging up when guest code was using something we
 hadn't yet implemented.  Now we completely cover the A64 instruction
 set it is barely used.  The only remaining uses are for five
 instructions whose semantics are "UNDEF, unless being run under
 external halting debug":
  * HLT (when not being used for semihosting)
  * DCPSR1, DCPS2, DCPS3
  * DRPS
-QEMU doesn't implement external halting debug, so for us the UNDEF is
+../tests/test-qobject-input-visitor.c: In function ‘test_visitor_in_list’:
-the architecturally correct behaviour (because it's not possible to
+../tests/test-qobject-input-visitor.c:454:49: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Wformat-truncation=]
-execute these instructions with halting debug enabled).  The
+|         snprintf(string, sizeof(string), "string%d", i);
-LOG_UNIMP doesn't serve a useful purpose; replace these uses of
+      |                                                 ^~
-unsupported_encoding() with unallocated_encoding(), and delete the
+../tests/test-qobject-input-visitor.c:454:42: note: directive argument in the range [0, 2147483606]
-macro.
+|         snprintf(string, sizeof(string), "string%d", i);
       |                                          ^~~~~~~~~~
 ../tests/test-qobject-input-visitor.c:454:9: note: ‘snprintf’ output between 8 and 17 bytes into a destination of size 12
 |         snprintf(string, sizeof(string), "string%d", i);
       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Rather than trying to be clever, since this is called 3 times during
+tests, let's simply use g_strdup_printf().
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Reviewed-by: Markus Armbruster <armbru@redhat.com>
+Message-id: 20220810121513.1356081-1-marcandre.lureau@redhat.com
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
+[PMM: fixed commit message typos]
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220509160443.3561604-1-peter.maydell@linaro.org
 ---
- target/arm/translate-a64.h | 9 ---------
+ tests/unit/test-qobject-input-visitor.c | 3 +--
- target/arm/translate-a64.c | 8 ++++----
+file changed, 1 insertion(+), 2 deletions(-)
 files changed, 4 insertions(+), 13 deletions(-)
-diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h
+diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
 index XXXXXXX..XXXXXXX 100644
---- a/target/arm/translate-a64.h
+--- a/tests/unit/test-qobject-input-visitor.c
-+++ b/target/arm/translate-a64.h
++++ b/tests/unit/test-qobject-input-visitor.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static void test_visitor_in_list(TestInputVisitorData *data,
- #ifndef TARGET_ARM_TRANSLATE_A64_H
+     g_assert(head != NULL);
- #define TARGET_ARM_TRANSLATE_A64_H
+     for (i = 0, item = head; item; item = item->next, i++) {
--#define unsupported_encoding(s, insn)                                    \
+-        char string[12];
--    do {                                                                 \
++        g_autofree char *string = g_strdup_printf("string%d", i);
--        qemu_log_mask(LOG_UNIMP,                                         \
--                      "%s:%d: unsupported instruction encoding 0x%08x "  \
+-        snprintf(string, sizeof(string), "string%d", i);
--                      "at pc=%016" PRIx64 "\n",                          \
+         g_assert_cmpstr(item->value->string, ==, string);
--                      __FILE__, __LINE__, insn, s->pc_curr);             \
+         g_assert_cmpint(item->value->integer, ==, 42 + i);
--        unallocated_encoding(s);                                         \
+     }
 -    } while (0)
 -
  TCGv_i64 new_tmp_a64(DisasContext *s);
  TCGv_i64 new_tmp_a64_local(DisasContext *s);
  TCGv_i64 new_tmp_a64_zero(DisasContext *s);
 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
 index XXXXXXX..XXXXXXX 100644
 --- a/target/arm/translate-a64.c
 +++ b/target/arm/translate-a64.c
@@ -XXX,XX +XXX,XX @@ static void disas_exc(DisasContext *s, uint32_t insn)
               * with our 32-bit semihosting).
               */
              if (s->current_el == 0) {
 -                unsupported_encoding(s, insn);
 +                unallocated_encoding(s);
                  break;
              }
  #endif
              gen_exception_internal_insn(s, s->pc_curr, EXCP_SEMIHOST);
          } else {
 -            unsupported_encoding(s, insn);
 +            unallocated_encoding(s);
          }
          break;
      case 5:
@@ -XXX,XX +XXX,XX @@ static void disas_exc(DisasContext *s, uint32_t insn)
              break;
          }
          /* DCPS1, DCPS2, DCPS3 */
 -        unsupported_encoding(s, insn);
 +        unallocated_encoding(s);
          break;
      default:
          unallocated_encoding(s);
@@ -XXX,XX +XXX,XX @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn)
          if (op3 != 0 || op4 != 0 || rn != 0x1f) {
              goto do_unallocated;
          } else {
 -            unsupported_encoding(s, insn);
 +            unallocated_encoding(s);
          }
          return;
 --
 .25.1

-[PULL 07/22] hw/intc/arm_gicv3_cpuif: Handle CPUs that don't specify GICv3 parameters
+Deleted patch
-We allow a GICv3 to be connected to any CPU, but we don't do anything
-to handle the case where the CPU type doesn't in hardware have a
-GICv3 CPU interface and so the various GIC configuration fields
-(gic_num_lrs, vprebits, vpribits) are not specified.
-The current behaviour is that we will add the EL1 CPU interface
-registers, but will not put in the EL2 CPU interface registers, even
-if the CPU has EL2, which will leave the GIC in a broken state and
-probably result in the guest crashing as it tries to set it up.  This
-only affects the virt board when using the cortex-a15 or cortex-a7
-CPU types (both 32-bit) with -machine gic-version=3 (or 'max')
-and -machine virtualization=on.
-Instead of failing to set up the EL2 registers, if the CPU doesn't
-define the GIC configuration set it to a reasonable default, matching
-the standard configuration for most Arm CPUs.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-2-peter.maydell@linaro.org
----
- hw/intc/arm_gicv3_cpuif.c | 18 +++++++++++++-----
-file changed, 13 insertions(+), 5 deletions(-)
-diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_cpuif.c
-+++ b/hw/intc/arm_gicv3_cpuif.c
-@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
-         ARMCPU *cpu = ARM_CPU(qemu_get_cpu(i));
-         GICv3CPUState *cs = &s->cpu[i];
-+        /*
-+         * If the CPU doesn't define a GICv3 configuration, probably because
-+         * in real hardware it doesn't have one, then we use default values
-+         * matching the one used by most Arm CPUs. This applies to:
-+         *  cpu->gic_num_lrs
-+         *  cpu->gic_vpribits
-+         *  cpu->gic_vprebits
-+         */
-+
-         /* Note that we can't just use the GICv3CPUState as an opaque pointer
-          * in define_arm_cp_regs_with_opaque(), because when we're called back
-          * it might be with code translated by CPU 0 but run by CPU 1, in
-@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
-          * get back to the GICv3CPUState from the CPUARMState.
-          */
-         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
--        if (arm_feature(&cpu->env, ARM_FEATURE_EL2)
--            && cpu->gic_num_lrs) {
-+        if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
-             int j;
--            cs->num_list_regs = cpu->gic_num_lrs;
--            cs->vpribits = cpu->gic_vpribits;
--            cs->vprebits = cpu->gic_vprebits;
-+            cs->num_list_regs = cpu->gic_num_lrs ?: 4;
-+            cs->vpribits = cpu->gic_vpribits ?: 5;
-+            cs->vprebits = cpu->gic_vprebits ?: 5;
-             /* Check against architectural constraints: getting these
-              * wrong would be a bug in the CPU code defining these,
---
-.25.1

-[PULL 08/22] hw/intc/arm_gicv3: report correct PRIbits field in ICV_CTLR_EL1
+Deleted patch
-As noted in the comment, the PRIbits field in ICV_CTLR_EL1 is
-supposed to match the ICH_VTR_EL2 PRIbits setting; that is, it is the
-virtual priority bit setting, not the physical priority bit setting.
-(For QEMU currently we always implement 8 bits of physical priority,
-so the PRIbits field was previously 7, since it is defined to be
-"priority bits - 1".)
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-3-peter.maydell@linaro.org
-Message-id: 20220506162129.2896966-2-peter.maydell@linaro.org
----
- hw/intc/arm_gicv3_cpuif.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_cpuif.c
-+++ b/hw/intc/arm_gicv3_cpuif.c
-@@ -XXX,XX +XXX,XX @@ static uint64_t icv_ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
-      * should match the ones reported in ich_vtr_read().
-      */
-     value = ICC_CTLR_EL1_A3V | (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
--        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
-+        ((cs->vpribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
-     if (cs->ich_vmcr_el2 & ICH_VMCR_EL2_VEOIM) {
-         value |= ICC_CTLR_EL1_EOIMODE;
---
-.25.1

-[PULL 09/22] hw/intc/arm_gicv3_kvm.c: Stop using GIC_MIN_BPR constant
+Deleted patch
-The GIC_MIN_BPR constant defines the minimum BPR value that the TCG
-emulated GICv3 supports.  We're currently using this also as the
-value we reset the KVM GICv3 ICC_BPR registers to, but this is only
-right by accident.
-We want to make the emulated GICv3 use a configurable number of
-priority bits, which means that GIC_MIN_BPR will no longer be a
-constant.  Replace the uses in the KVM reset code with literal 0,
-plus a constant explaining why this is reasonable.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-4-peter.maydell@linaro.org
-Message-id: 20220506162129.2896966-3-peter.maydell@linaro.org
----
- hw/intc/arm_gicv3_kvm.c | 16 +++++++++++++---
-file changed, 13 insertions(+), 3 deletions(-)
-diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_kvm.c
-+++ b/hw/intc/arm_gicv3_kvm.c
-@@ -XXX,XX +XXX,XX @@ static void arm_gicv3_icc_reset(CPUARMState *env, const ARMCPRegInfo *ri)
-     s = c->gic;
-     c->icc_pmr_el1 = 0;
--    c->icc_bpr[GICV3_G0] = GIC_MIN_BPR;
--    c->icc_bpr[GICV3_G1] = GIC_MIN_BPR;
--    c->icc_bpr[GICV3_G1NS] = GIC_MIN_BPR;
-+    /*
-+     * Architecturally the reset value of the ICC_BPR registers
-+     * is UNKNOWN. We set them all to 0 here; when the kernel
-+     * uses these values to program the ICH_VMCR_EL2 fields that
-+     * determine the guest-visible ICC_BPR register values, the
-+     * hardware's "writing a value less than the minimum sets
-+     * the field to the minimum value" behaviour will result in
-+     * them effectively resetting to the correct minimum value
-+     * for the host GIC.
-+     */
-+    c->icc_bpr[GICV3_G0] = 0;
-+    c->icc_bpr[GICV3_G1] = 0;
-+    c->icc_bpr[GICV3_G1NS] = 0;
-     c->icc_sre_el1 = 0x7;
-     memset(c->icc_apr, 0, sizeof(c->icc_apr));
---
-.25.1

-[PULL 10/22] hw/intc/arm_gicv3: Support configurable number of physical priority bits
+Deleted patch
-The GICv3 code has always supported a configurable number of virtual
-priority and preemption bits, but our implementation currently
-hardcodes the number of physical priority bits at 8.  This is not
-what most hardware implementations provide; for instance the
-Cortex-A53 provides only 5 bits of physical priority.
-Make the number of physical priority/preemption bits driven by fields
-in the GICv3CPUState, the way that we already do for virtual
-priority/preemption bits.  We set cs->pribits to 8, so there is no
-behavioural change in this commit.  A following commit will add the
-machinery for CPUs to set this to the correct value for their
-implementation.
-Note that changing the number of priority bits would be a migration
-compatibility break, because the semantics of the icc_apr[][] array
-changes.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-5-peter.maydell@linaro.org
-Message-id: 20220506162129.2896966-4-peter.maydell@linaro.org
----
- include/hw/intc/arm_gicv3_common.h |   7 +-
- hw/intc/arm_gicv3_cpuif.c          | 182 ++++++++++++++++++++---------
-files changed, 130 insertions(+), 59 deletions(-)
-diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/intc/arm_gicv3_common.h
-+++ b/include/hw/intc/arm_gicv3_common.h
-@@ -XXX,XX +XXX,XX @@
- /* Maximum number of list registers (architectural limit) */
- #define GICV3_LR_MAX 16
--/* Minimum BPR for Secure, or when security not enabled */
--#define GIC_MIN_BPR 0
--/* Minimum BPR for Nonsecure when security is enabled */
--#define GIC_MIN_BPR_NS (GIC_MIN_BPR + 1)
--
- /* For some distributor fields we want to model the array of 32-bit
-  * register values which hold various bitmaps corresponding to enabled,
-  * pending, etc bits. These macros and functions facilitate that; the
-@@ -XXX,XX +XXX,XX @@ struct GICv3CPUState {
-     int num_list_regs;
-     int vpribits; /* number of virtual priority bits */
-     int vprebits; /* number of virtual preemption bits */
-+    int pribits; /* number of physical priority bits */
-+    int prebits; /* number of physical preemption bits */
-     /* Current highest priority pending interrupt for this CPU.
-      * This is cached information that can be recalculated from the
-diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_cpuif.c
-+++ b/hw/intc/arm_gicv3_cpuif.c
-@@ -XXX,XX +XXX,XX @@ static uint64_t icv_iar_read(CPUARMState *env, const ARMCPRegInfo *ri)
-     return intid;
- }
-+static uint32_t icc_fullprio_mask(GICv3CPUState *cs)
-+{
-+    /*
-+     * Return a mask word which clears the unimplemented priority bits
-+     * from a priority value for a physical interrupt. (Not to be confused
-+     * with the group priority, whose mask depends on the value of BPR
-+     * for the interrupt group.)
-+     */
-+    return ~0U << (8 - cs->pribits);
-+}
-+
-+static inline int icc_min_bpr(GICv3CPUState *cs)
-+{
-+    /* The minimum BPR for the physical interface. */
-+    return 7 - cs->prebits;
-+}
-+
-+static inline int icc_min_bpr_ns(GICv3CPUState *cs)
-+{
-+    return icc_min_bpr(cs) + 1;
-+}
-+
-+static inline int icc_num_aprs(GICv3CPUState *cs)
-+{
-+    /* Return the number of APR registers (1, 2, or 4) */
-+    int aprmax = 1 << MAX(cs->prebits - 5, 0);
-+    assert(aprmax <= ARRAY_SIZE(cs->icc_apr[0]));
-+    return aprmax;
-+}
-+
- static int icc_highest_active_prio(GICv3CPUState *cs)
- {
-     /* Calculate the current running priority based on the set bits
-@@ -XXX,XX +XXX,XX @@ static int icc_highest_active_prio(GICv3CPUState *cs)
-      */
-     int i;
--    for (i = 0; i < ARRAY_SIZE(cs->icc_apr[0]); i++) {
-+    for (i = 0; i < icc_num_aprs(cs); i++) {
-         uint32_t apr = cs->icc_apr[GICV3_G0][i] |
-             cs->icc_apr[GICV3_G1][i] | cs->icc_apr[GICV3_G1NS][i];
-         if (!apr) {
-             continue;
-         }
--        return (i * 32 + ctz32(apr)) << (GIC_MIN_BPR + 1);
-+        return (i * 32 + ctz32(apr)) << (icc_min_bpr(cs) + 1);
-     }
-     /* No current active interrupts: return idle priority */
-     return 0xff;
-@@ -XXX,XX +XXX,XX @@ static void icc_pmr_write(CPUARMState *env, const ARMCPRegInfo *ri,
-     trace_gicv3_icc_pmr_write(gicv3_redist_affid(cs), value);
--    value &= 0xff;
-+    value &= icc_fullprio_mask(cs);
-     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_is_secure(env) &&
-         (env->cp15.scr_el3 & SCR_FIQ)) {
-@@ -XXX,XX +XXX,XX @@ static void icc_activate_irq(GICv3CPUState *cs, int irq)
-      */
-     uint32_t mask = icc_gprio_mask(cs, cs->hppi.grp);
-     int prio = cs->hppi.prio & mask;
--    int aprbit = prio >> 1;
-+    int aprbit = prio >> (8 - cs->prebits);
-     int regno = aprbit / 32;
-     int regbit = aprbit % 32;
-@@ -XXX,XX +XXX,XX @@ static void icc_drop_prio(GICv3CPUState *cs, int grp)
-      */
-     int i;
--    for (i = 0; i < ARRAY_SIZE(cs->icc_apr[grp]); i++) {
-+    for (i = 0; i < icc_num_aprs(cs); i++) {
-         uint64_t *papr = &cs->icc_apr[grp][i];
-         if (!*papr) {
-@@ -XXX,XX +XXX,XX @@ static void icc_bpr_write(CPUARMState *env, const ARMCPRegInfo *ri,
-         return;
-     }
--    minval = (grp == GICV3_G1NS) ? GIC_MIN_BPR_NS : GIC_MIN_BPR;
-+    minval = (grp == GICV3_G1NS) ? icc_min_bpr_ns(cs) : icc_min_bpr(cs);
-     if (value < minval) {
-         value = minval;
-     }
-@@ -XXX,XX +XXX,XX @@ static void icc_reset(CPUARMState *env, const ARMCPRegInfo *ri)
-     cs->icc_ctlr_el1[GICV3_S] = ICC_CTLR_EL1_A3V |
-         (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
--        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
-+        ((cs->pribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
-     cs->icc_ctlr_el1[GICV3_NS] = ICC_CTLR_EL1_A3V |
-         (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
--        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
-+        ((cs->pribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
-     cs->icc_pmr_el1 = 0;
--    cs->icc_bpr[GICV3_G0] = GIC_MIN_BPR;
--    cs->icc_bpr[GICV3_G1] = GIC_MIN_BPR;
--    cs->icc_bpr[GICV3_G1NS] = GIC_MIN_BPR_NS;
-+    cs->icc_bpr[GICV3_G0] = icc_min_bpr(cs);
-+    cs->icc_bpr[GICV3_G1] = icc_min_bpr(cs);
-+    cs->icc_bpr[GICV3_G1NS] = icc_min_bpr_ns(cs);
-     memset(cs->icc_apr, 0, sizeof(cs->icc_apr));
-     memset(cs->icc_igrpen, 0, sizeof(cs->icc_igrpen));
-     cs->icc_ctlr_el3 = ICC_CTLR_EL3_NDS | ICC_CTLR_EL3_A3V |
-         (1 << ICC_CTLR_EL3_IDBITS_SHIFT) |
--        (7 << ICC_CTLR_EL3_PRIBITS_SHIFT);
-+        ((cs->pribits - 1) << ICC_CTLR_EL3_PRIBITS_SHIFT);
-     memset(cs->ich_apr, 0, sizeof(cs->ich_apr));
-     cs->ich_hcr_el2 = 0;
-@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
-       .readfn = icc_ap_read,
-       .writefn = icc_ap_write,
-     },
--    { .name = "ICC_AP0R1_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 5,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_fiq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
--    { .name = "ICC_AP0R2_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 6,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_fiq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
--    { .name = "ICC_AP0R3_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 7,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_fiq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
-     /* All the ICC_AP1R*_EL1 registers are banked */
-     { .name = "ICC_AP1R0_EL1", .state = ARM_CP_STATE_BOTH,
-       .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 0,
-@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
-       .readfn = icc_ap_read,
-       .writefn = icc_ap_write,
-     },
--    { .name = "ICC_AP1R1_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 1,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_irq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
--    { .name = "ICC_AP1R2_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 2,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_irq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
--    { .name = "ICC_AP1R3_EL1", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 3,
--      .type = ARM_CP_IO | ARM_CP_NO_RAW,
--      .access = PL1_RW, .accessfn = gicv3_irq_access,
--      .readfn = icc_ap_read,
--      .writefn = icc_ap_write,
--    },
-     { .name = "ICC_DIR_EL1", .state = ARM_CP_STATE_BOTH,
-       .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 11, .opc2 = 1,
-       .type = ARM_CP_IO | ARM_CP_NO_RAW,
-@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
-     },
- };
-+static const ARMCPRegInfo gicv3_cpuif_icc_apxr1_reginfo[] = {
-+    { .name = "ICC_AP0R1_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 5,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+    { .name = "ICC_AP1R1_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 1,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_irq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+};
-+
-+static const ARMCPRegInfo gicv3_cpuif_icc_apxr23_reginfo[] = {
-+    { .name = "ICC_AP0R2_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 6,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+    { .name = "ICC_AP0R3_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 7,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+    { .name = "ICC_AP1R2_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 2,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_irq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+    { .name = "ICC_AP1R3_EL1", .state = ARM_CP_STATE_BOTH,
-+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 3,
-+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-+      .access = PL1_RW, .accessfn = gicv3_irq_access,
-+      .readfn = icc_ap_read,
-+      .writefn = icc_ap_write,
-+    },
-+};
-+
- static uint64_t ich_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)
- {
-     GICv3CPUState *cs = icc_cs_from_env(env);
-@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
-          * get back to the GICv3CPUState from the CPUARMState.
-          */
-         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
-+
-+        /*
-+         * For the moment, retain the existing behaviour of 8 priority bits;
-+         * in a following commit we will take this from the CPU state,
-+         * as we do for the virtual priority bits.
-+         */
-+        cs->pribits = 8;
-+        /*
-+         * The GICv3 has separate ID register fields for virtual priority
-+         * and preemption bit values, but only a single ID register field
-+         * for the physical priority bits. The preemption bit count is
-+         * always the same as the priority bit count, except that 8 bits
-+         * of priority means 7 preemption bits. We precalculate the
-+         * preemption bits because it simplifies the code and makes the
-+         * parallels between the virtual and physical bits of the GIC
-+         * a bit clearer.
-+         */
-+        cs->prebits = cs->pribits;
-+        if (cs->prebits == 8) {
-+            cs->prebits--;
-+        }
-+        /*
-+         * Check that CPU code defining pribits didn't violate
-+         * architectural constraints our implementation relies on.
-+         */
-+        g_assert(cs->pribits >= 4 && cs->pribits <= 8);
-+
-+        /*
-+         * gicv3_cpuif_reginfo[] defines ICC_AP*R0_EL1; add definitions
-+         * for ICC_AP*R{1,2,3}_EL1 if the prebits value requires them.
-+         */
-+        if (cs->prebits >= 6) {
-+            define_arm_cp_regs(cpu, gicv3_cpuif_icc_apxr1_reginfo);
-+        }
-+        if (cs->prebits == 7) {
-+            define_arm_cp_regs(cpu, gicv3_cpuif_icc_apxr23_reginfo);
-+        }
-+
-         if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
-             int j;
---
-.25.1

-[PULL 11/22] hw/intc/arm_gicv3: Use correct number of priority bits for the CPU
+Deleted patch
-Make the GICv3 set its number of bits of physical priority from the
-implementation-specific value provided in the CPU state struct, in
-the same way we already do for virtual priority bits.  Because this
-would be a migration compatibility break, we provide a property
-force-8-bit-prio which is enabled for 7.0 and earlier versioned board
-models to retain the legacy "always use 8 bits" behaviour.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-6-peter.maydell@linaro.org
-Message-id: 20220506162129.2896966-5-peter.maydell@linaro.org
----
- include/hw/intc/arm_gicv3_common.h |  1 +
- target/arm/cpu.h                   |  1 +
- hw/core/machine.c                  |  4 +++-
- hw/intc/arm_gicv3_common.c         |  5 +++++
- hw/intc/arm_gicv3_cpuif.c          | 15 +++++++++++----
- target/arm/cpu64.c                 |  6 ++++++
-files changed, 27 insertions(+), 5 deletions(-)
-diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/intc/arm_gicv3_common.h
-+++ b/include/hw/intc/arm_gicv3_common.h
-@@ -XXX,XX +XXX,XX @@ struct GICv3State {
-     uint32_t revision;
-     bool lpi_enable;
-     bool security_extn;
-+    bool force_8bit_prio;
-     bool irq_reset_nonsecure;
-     bool gicd_no_migration_shift_bug;
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
-     int gic_num_lrs; /* number of list registers */
-     int gic_vpribits; /* number of virtual priority bits */
-     int gic_vprebits; /* number of virtual preemption bits */
-+    int gic_pribits; /* number of physical priority bits */
-     /* Whether the cfgend input is high (i.e. this CPU should reset into
-      * big-endian mode).  This setting isn't used directly: instead it modifies
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -XXX,XX +XXX,XX @@
- #include "hw/virtio/virtio-pci.h"
- #include "qom/object_interfaces.h"
--GlobalProperty hw_compat_7_0[] = {};
-+GlobalProperty hw_compat_7_0[] = {
-+    { "arm-gicv3-common", "force-8-bit-prio", "on" },
-+};
- const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0);
- GlobalProperty hw_compat_6_2[] = {
-diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_common.c
-+++ b/hw/intc/arm_gicv3_common.c
-@@ -XXX,XX +XXX,XX @@ static Property arm_gicv3_common_properties[] = {
-     DEFINE_PROP_UINT32("revision", GICv3State, revision, 3),
-     DEFINE_PROP_BOOL("has-lpi", GICv3State, lpi_enable, 0),
-     DEFINE_PROP_BOOL("has-security-extensions", GICv3State, security_extn, 0),
-+    /*
-+     * Compatibility property: force 8 bits of physical priority, even
-+     * if the CPU being emulated should have fewer.
-+     */
-+    DEFINE_PROP_BOOL("force-8-bit-prio", GICv3State, force_8bit_prio, 0),
-     DEFINE_PROP_ARRAY("redist-region-count", GICv3State, nb_redist_regions,
-                       redist_region_count, qdev_prop_uint32, uint32_t),
-     DEFINE_PROP_LINK("sysmem", GICv3State, dma, TYPE_MEMORY_REGION,
-diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_cpuif.c
-+++ b/hw/intc/arm_gicv3_cpuif.c
-@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
-          *  cpu->gic_num_lrs
-          *  cpu->gic_vpribits
-          *  cpu->gic_vprebits
-+         *  cpu->gic_pribits
-          */
-         /* Note that we can't just use the GICv3CPUState as an opaque pointer
-@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
-         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
-         /*
--         * For the moment, retain the existing behaviour of 8 priority bits;
--         * in a following commit we will take this from the CPU state,
--         * as we do for the virtual priority bits.
-+         * The CPU implementation specifies the number of supported
-+         * bits of physical priority. For backwards compatibility
-+         * of migration, we have a compat property that forces use
-+         * of 8 priority bits regardless of what the CPU really has.
-          */
--        cs->pribits = 8;
-+        if (s->force_8bit_prio) {
-+            cs->pribits = 8;
-+        } else {
-+            cs->pribits = cpu->gic_pribits ?: 5;
-+        }
-+
-         /*
-          * The GICv3 has separate ID register fields for virtual priority
-          * and preemption bit values, but only a single ID register field
-diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu64.c
-+++ b/target/arm/cpu64.c
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a57_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     define_cortex_a72_a57_a53_cp_reginfo(cpu);
- }
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a53_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     define_cortex_a72_a57_a53_cp_reginfo(cpu);
- }
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a72_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     define_cortex_a72_a57_a53_cp_reginfo(cpu);
- }
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a76_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     /* From B5.1 AdvSIMD AArch64 register summary */
-     cpu->isar.mvfr0 = 0x10110222;
-@@ -XXX,XX +XXX,XX @@ static void aarch64_neoverse_n1_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     /* From B5.1 AdvSIMD AArch64 register summary */
-     cpu->isar.mvfr0 = 0x10110222;
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a64fx_initfn(Object *obj)
-     cpu->gic_num_lrs = 4;
-     cpu->gic_vpribits = 5;
-     cpu->gic_vprebits = 5;
-+    cpu->gic_pribits = 5;
-     /* Suppport of A64FX's vector length are 128,256 and 512bit only */
-     aarch64_add_sve_properties(obj);
---
-.25.1

-[PULL 12/22] hw/intc/arm_gicv3: Provide ich_num_aprs()
+Deleted patch
-We previously open-coded the expression for the number of virtual APR
-registers and the assertion that it was not going to cause us to
-overflow the cs->ich_apr[] array.  Factor this out into a new
-ich_num_aprs() function, for consistency with the icc_num_aprs()
-function we just added for the physical APR handling.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220512151457.3899052-7-peter.maydell@linaro.org
-Message-id: 20220506162129.2896966-6-peter.maydell@linaro.org
----
- hw/intc/arm_gicv3_cpuif.c | 16 ++++++++++------
-file changed, 10 insertions(+), 6 deletions(-)
-diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/intc/arm_gicv3_cpuif.c
-+++ b/hw/intc/arm_gicv3_cpuif.c
-@@ -XXX,XX +XXX,XX @@ static inline int icv_min_vbpr(GICv3CPUState *cs)
-     return 7 - cs->vprebits;
- }
-+static inline int ich_num_aprs(GICv3CPUState *cs)
-+{
-+    /* Return the number of virtual APR registers (1, 2, or 4) */
-+    int aprmax = 1 << (cs->vprebits - 5);
-+    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
-+    return aprmax;
-+}
-+
- /* Simple accessor functions for LR fields */
- static uint32_t ich_lr_vintid(uint64_t lr)
- {
-@@ -XXX,XX +XXX,XX @@ static int ich_highest_active_virt_prio(GICv3CPUState *cs)
-      * in the ICH Active Priority Registers.
-      */
-     int i;
--    int aprmax = 1 << (cs->vprebits - 5);
--
--    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
-+    int aprmax = ich_num_aprs(cs);
-     for (i = 0; i < aprmax; i++) {
-         uint32_t apr = cs->ich_apr[GICV3_G0][i] |
-@@ -XXX,XX +XXX,XX @@ static int icv_drop_prio(GICv3CPUState *cs)
-      * 32 bits are actually relevant.
-      */
-     int i;
--    int aprmax = 1 << (cs->vprebits - 5);
--
--    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
-+    int aprmax = ich_num_aprs(cs);
-     for (i = 0; i < aprmax; i++) {
-         uint64_t *papr0 = &cs->ich_apr[GICV3_G0][i];
---
-.25.1

-[PULL 13/22] Fix aarch64 debug register names.
+[PULL 4/5] hw/arm/virt-acpi-build: Present the GICR structure properly for GICv4
-From: Chris Howard <cvz185@web.de>
+From: Zenghui Yu <yuzenghui@huawei.com>
-Give all the debug registers their correct names including the
+With the introduction of the new TCG GICv4, build_madt() is badly broken
-index, rather than having multiple registers all with the
+as we do not present any GIC Redistributor structure in MADT for GICv4
-same name string, which is confusing when viewed over the
+guests, so that they have no idea about where the Redistributor
-gdbstub interface.
+register frames are. This fixes a Linux guest crash at boot time with
 ACPI enabled and '-machine gic-version=4'.
-Signed-off-by: CHRIS HOWARD <cvz185@web.de>
+While at it, let's convert the remaining hard coded gic_version into
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
+enumeration VIRT_GIC_VERSION_2 for consistency.
-Message-id: 4127D8CA-D54A-47C7-A039-0DB7361E30C0@web.de
-[PMM: expanded commit message]
+Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
 Message-id: 20220812022018.1069-1-yuzenghui@huawei.com
 Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 ---
- target/arm/helper.c | 16 ++++++++++++----
+ hw/arm/virt-acpi-build.c | 4 ++--
-file changed, 12 insertions(+), 4 deletions(-)
+file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/target/arm/helper.c b/target/arm/helper.c
+diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
 index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
+--- a/hw/arm/virt-acpi-build.c
-+++ b/target/arm/helper.c
++++ b/hw/arm/virt-acpi-build.c
-@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
+@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
          uint32_t pmu_interrupt = arm_feature(&armcpu->env, ARM_FEATURE_PMU) ?
                                               PPI(VIRTUAL_PMU_IRQ) : 0;
 -        if (vms->gic_version == 2) {
 +        if (vms->gic_version == VIRT_GIC_VERSION_2) {
              physical_base_address = memmap[VIRT_GIC_CPU].base;
              gicv = memmap[VIRT_GIC_VCPU].base;
              gich = memmap[VIRT_GIC_HYP].base;
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
          build_append_int_noprefix(table_data, armcpu->mp_affinity, 8);
      }
-     for (i = 0; i < brps; i++) {
+-    if (vms->gic_version == 3) {
-+        char *dbgbvr_el1_name = g_strdup_printf("DBGBVR%d_EL1", i);
++    if (vms->gic_version != VIRT_GIC_VERSION_2) {
-+        char *dbgbcr_el1_name = g_strdup_printf("DBGBCR%d_EL1", i);
+         build_append_gicr(table_data, memmap[VIRT_GIC_REDIST].base,
-         ARMCPRegInfo dbgregs[] = {
+                                       memmap[VIRT_GIC_REDIST].size);
--            { .name = "DBGBVR", .state = ARM_CP_STATE_BOTH,
+         if (virt_gicv3_redist_region_count(vms) == 2) {
 +            { .name = dbgbvr_el1_name, .state = ARM_CP_STATE_BOTH,
                .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 4,
                .access = PL1_RW, .accessfn = access_tda,
                .fieldoffset = offsetof(CPUARMState, cp15.dbgbvr[i]),
                .writefn = dbgbvr_write, .raw_writefn = raw_write
              },
 -            { .name = "DBGBCR", .state = ARM_CP_STATE_BOTH,
 +            { .name = dbgbcr_el1_name, .state = ARM_CP_STATE_BOTH,
                .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 5,
                .access = PL1_RW, .accessfn = access_tda,
                .fieldoffset = offsetof(CPUARMState, cp15.dbgbcr[i]),
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
              },
          };
          define_arm_cp_regs(cpu, dbgregs);
 +        g_free(dbgbvr_el1_name);
 +        g_free(dbgbcr_el1_name);
      }
      for (i = 0; i < wrps; i++) {
 +        char *dbgwvr_el1_name = g_strdup_printf("DBGWVR%d_EL1", i);
 +        char *dbgwcr_el1_name = g_strdup_printf("DBGWCR%d_EL1", i);
          ARMCPRegInfo dbgregs[] = {
 -            { .name = "DBGWVR", .state = ARM_CP_STATE_BOTH,
 +            { .name = dbgwvr_el1_name, .state = ARM_CP_STATE_BOTH,
                .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 6,
                .access = PL1_RW, .accessfn = access_tda,
                .fieldoffset = offsetof(CPUARMState, cp15.dbgwvr[i]),
                .writefn = dbgwvr_write, .raw_writefn = raw_write
              },
 -            { .name = "DBGWCR", .state = ARM_CP_STATE_BOTH,
 +            { .name = dbgwcr_el1_name, .state = ARM_CP_STATE_BOTH,
                .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 7,
                .access = PL1_RW, .accessfn = access_tda,
                .fieldoffset = offsetof(CPUARMState, cp15.dbgwcr[i]),
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
              },
          };
          define_arm_cp_regs(cpu, dbgregs);
 +        g_free(dbgwvr_el1_name);
 +        g_free(dbgwcr_el1_name);
      }
  }
 --
 .25.1

-[PULL 14/22] hw/adc/zynq-xadc: Use qemu_irq typedef
+[PULL 5/5] cutils: Add missing dyld(3) include on macOS
 From: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Except hw/core/irq.c which implements the forward-declared opaque
+Commit 06680b15b4 moved qemu_*_exec_dir() to cutils but forgot
-qemu_irq structure, hw/adc/zynq-xadc.{c,h} are the only files not
+to move the macOS dyld(3) include, resulting in the following
-using the typedef. Fix this single exception.
+error (when building with Homebrew GCC on macOS Monterey 12.4):
+  [313/1197] Compiling C object libqemuutil.a.p/util_cutils.c.o
+  FAILED: libqemuutil.a.p/util_cutils.c.o
+  ../../util/cutils.c:1039:13: error: implicit declaration of function '_NSGetExecutablePath' [-Werror=implicit-function-declaration]
+|         if (_NSGetExecutablePath(fpath, &len) == 0) {
+        |             ^~~~~~~~~~~~~~~~~~~~
+  ../../util/cutils.c:1039:13: error: nested extern declaration of '_NSGetExecutablePath' [-Werror=nested-externs]
+Fix by moving the include line to cutils.
+Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: Bernhard Beschow <shentey@gmail.com>
+Message-id: 20220809222046.30812-1-f4bug@amsat.org
-Message-id: 20220509202035.50335-1-philippe.mathieu.daude@gmail.com
+Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
 ---
- include/hw/adc/zynq-xadc.h | 3 +--
+ util/cutils.c      | 4 ++++
- hw/adc/zynq-xadc.c         | 4 ++--
+ util/oslib-posix.c | 4 ----
-files changed, 3 insertions(+), 4 deletions(-)
+files changed, 4 insertions(+), 4 deletions(-)
-diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h
+diff --git a/util/cutils.c b/util/cutils.c
 index XXXXXXX..XXXXXXX 100644
---- a/include/hw/adc/zynq-xadc.h
+--- a/util/cutils.c
-+++ b/include/hw/adc/zynq-xadc.h
++++ b/util/cutils.c
-@@ -XXX,XX +XXX,XX @@ struct ZynqXADCState {
+@@ -XXX,XX +XXX,XX @@
-     uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH];
+ #include <kernel/image.h>
-     uint16_t xadc_dfifo_entries;
+ #endif
--    struct IRQState *qemu_irq;
++#ifdef __APPLE__
 +#include <mach-o/dyld.h>
 +#endif
 +
  #ifdef G_OS_WIN32
  #include <pathcch.h>
  #include <wchar.h>
 diff --git a/util/oslib-posix.c b/util/oslib-posix.c
 index XXXXXXX..XXXXXXX 100644
 --- a/util/oslib-posix.c
 +++ b/util/oslib-posix.c
@@ -XXX,XX +XXX,XX @@
  #include <lwp.h>
  #endif
 -#ifdef __APPLE__
 -#include <mach-o/dyld.h>
 -#endif
 -
-+    qemu_irq irq;
+ #include "qemu/mmap-alloc.h"
- };
+ #ifdef CONFIG_DEBUG_STACK_USAGE
  #endif /* ZYNQ_XADC_H */
 diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/adc/zynq-xadc.c
 +++ b/hw/adc/zynq-xadc.c
@@ -XXX,XX +XXX,XX @@ static void zynq_xadc_update_ints(ZynqXADCState *s)
          s->regs[INT_STS] |= INT_DFIFO_GTH;
      }
 -    qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK]));
 +    qemu_set_irq(s->irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK]));
  }
  static void zynq_xadc_reset(DeviceState *d)
@@ -XXX,XX +XXX,XX @@ static void zynq_xadc_init(Object *obj)
      memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc",
                            ZYNQ_XADC_MMIO_SIZE);
      sysbus_init_mmio(sbd, &s->iomem);
 -    sysbus_init_irq(sbd, &s->qemu_irq);
 +    sysbus_init_irq(sbd, &s->irq);
  }
  static const VMStateDescription vmstate_zynq_xadc = {
 --
 .25.1

-[PULL 15/22] target/arm/helper.c: Delete stray obsolete comment
+Deleted patch
-In commit 88ce6c6ee85d we switched from directly fishing the number
-of breakpoints and watchpoints out of the ID register fields to
-abstracting out functions to do this job, but we forgot to delete the
-now-obsolete comment in define_debug_regs() about the relation
-between the ID field value and the actual number of breakpoints and
-watchpoints.  Delete the obsolete comment.
-Reported-by: CHRIS HOWARD <cvz185@web.de>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220513131801.4082712-1-peter.maydell@linaro.org
----
- target/arm/helper.c | 1 -
-file changed, 1 deletion(-)
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
-         define_one_arm_cp_reg(cpu, &dbgdidr);
-     }
--    /* Note that all these register fields hold "number of Xs minus 1". */
-     brps = arm_num_brps(cpu);
-     wrps = arm_num_wrps(cpu);
-     ctx_cmps = arm_num_ctx_cmps(cpu);
---
-.25.1

-[PULL 16/22] target/arm: Make number of counters in PMCR follow the CPU
+Deleted patch
-Currently we give all the v7-and-up CPUs a PMU with 4 counters.  This
-means that we don't provide the 6 counters that are required by the
-Arm BSA (Base System Architecture) specification if the CPU supports
-the Virtualization extensions.
-Instead of having a single PMCR_NUM_COUNTERS, make each CPU type
-specify the PMCR reset value (obtained from the appropriate TRM), and
-use the 'N' field of that value to define the number of counters
-provided.
-This means that we now supply 6 counters instead of 4 for:
- Cortex-A9, Cortex-A15, Cortex-A53, Cortex-A57, Cortex-A72,
- Cortex-A76, Neoverse-N1, '-cpu max'
-This CPU goes from 4 to 8 counters:
- A64FX
-These CPUs remain with 4 counters:
- Cortex-A7, Cortex-A8
-This CPU goes down from 4 to 3 counters:
- Cortex-R5
-Note that because we now use the PMCR reset value of the specific
-implementation, we no longer set the LC bit out of reset.  This has
-an UNKNOWN value out of reset for all cores with any AArch32 support,
-so guest software should be setting it anyway if it wants it.
-This change was originally landed in commit f7fb73b8cdd3f7 (during
-the 6.0 release cycle) but was then reverted by commit
-c2dd77a6aa517 before that release because it did not work with KVM.
-This version fixes that by creating the scratch vCPU in
-kvm_arm_get_host_cpu_features() with the KVM_ARM_VCPU_PMU_V3 feature
-if KVM supports it, and then only asking KVM for the PMCR_EL0 value
-if the vCPU has a PMU.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-[PMM: Added the correct value for a64fx]
-Message-id: 20220513122852.4063586-1-peter.maydell@linaro.org
----
- target/arm/cpu.h       |  1 +
- target/arm/internals.h |  4 +++-
- target/arm/cpu64.c     | 11 +++++++++++
- target/arm/cpu_tcg.c   |  6 ++++++
- target/arm/helper.c    | 25 ++++++++++++++-----------
- target/arm/kvm64.c     | 12 ++++++++++++
-files changed, 47 insertions(+), 12 deletions(-)
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
-         uint64_t id_aa64dfr0;
-         uint64_t id_aa64dfr1;
-         uint64_t id_aa64zfr0;
-+        uint64_t reset_pmcr_el0;
-     } isar;
-     uint64_t midr;
-     uint32_t revidr;
-diff --git a/target/arm/internals.h b/target/arm/internals.h
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/internals.h
-+++ b/target/arm/internals.h
-@@ -XXX,XX +XXX,XX @@ enum MVEECIState {
- static inline uint32_t pmu_num_counters(CPUARMState *env)
- {
--  return (env->cp15.c9_pmcr & PMCRN_MASK) >> PMCRN_SHIFT;
-+    ARMCPU *cpu = env_archcpu(env);
-+
-+    return (cpu->isar.reset_pmcr_el0 & PMCRN_MASK) >> PMCRN_SHIFT;
- }
- /* Bits allowed to be set/cleared for PMCNTEN* and PMINTEN* */
-diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu64.c
-+++ b/target/arm/cpu64.c
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a57_initfn(Object *obj)
-     cpu->isar.id_aa64isar0 = 0x00011120;
-     cpu->isar.id_aa64mmfr0 = 0x00001124;
-     cpu->isar.dbgdidr = 0x3516d000;
-+    cpu->isar.reset_pmcr_el0 = 0x41013000;
-     cpu->clidr = 0x0a200023;
-     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
-     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a53_initfn(Object *obj)
-     cpu->isar.id_aa64isar0 = 0x00011120;
-     cpu->isar.id_aa64mmfr0 = 0x00001122; /* 40 bit physical addr */
-     cpu->isar.dbgdidr = 0x3516d000;
-+    cpu->isar.reset_pmcr_el0 = 0x41033000;
-     cpu->clidr = 0x0a200023;
-     cpu->ccsidr[0] = 0x700fe01a; /* 32KB L1 dcache */
-     cpu->ccsidr[1] = 0x201fe00a; /* 32KB L1 icache */
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a72_initfn(Object *obj)
-     cpu->isar.id_aa64isar0 = 0x00011120;
-     cpu->isar.id_aa64mmfr0 = 0x00001124;
-     cpu->isar.dbgdidr = 0x3516d000;
-+    cpu->isar.reset_pmcr_el0 = 0x41023000;
-     cpu->clidr = 0x0a200023;
-     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
-     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a76_initfn(Object *obj)
-     cpu->isar.mvfr0 = 0x10110222;
-     cpu->isar.mvfr1 = 0x13211111;
-     cpu->isar.mvfr2 = 0x00000043;
-+
-+    /* From D5.1 AArch64 PMU register summary */
-+    cpu->isar.reset_pmcr_el0 = 0x410b3000;
- }
- static void aarch64_neoverse_n1_initfn(Object *obj)
-@@ -XXX,XX +XXX,XX @@ static void aarch64_neoverse_n1_initfn(Object *obj)
-     cpu->isar.mvfr0 = 0x10110222;
-     cpu->isar.mvfr1 = 0x13211111;
-     cpu->isar.mvfr2 = 0x00000043;
-+
-+    /* From D5.1 AArch64 PMU register summary */
-+    cpu->isar.reset_pmcr_el0 = 0x410c3000;
- }
- void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
-@@ -XXX,XX +XXX,XX @@ static void aarch64_a64fx_initfn(Object *obj)
-     set_bit(1, cpu->sve_vq_supported); /* 256bit */
-     set_bit(3, cpu->sve_vq_supported); /* 512bit */
-+    cpu->isar.reset_pmcr_el0 = 0x46014040;
-+
-     /* TODO:  Add A64FX specific HPC extension registers */
- }
-diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/cpu_tcg.c
-+++ b/target/arm/cpu_tcg.c
-@@ -XXX,XX +XXX,XX @@ static void cortex_a8_initfn(Object *obj)
-     cpu->ccsidr[1] = 0x2007e01a; /* 16k L1 icache. */
-     cpu->ccsidr[2] = 0xf0000000; /* No L2 icache. */
-     cpu->reset_auxcr = 2;
-+    cpu->isar.reset_pmcr_el0 = 0x41002000;
-     define_arm_cp_regs(cpu, cortexa8_cp_reginfo);
- }
-@@ -XXX,XX +XXX,XX @@ static void cortex_a9_initfn(Object *obj)
-     cpu->clidr = (1 << 27) | (1 << 24) | 3;
-     cpu->ccsidr[0] = 0xe00fe019; /* 16k L1 dcache. */
-     cpu->ccsidr[1] = 0x200fe019; /* 16k L1 icache. */
-+    cpu->isar.reset_pmcr_el0 = 0x41093000;
-     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);
- }
-@@ -XXX,XX +XXX,XX @@ static void cortex_a7_initfn(Object *obj)
-     cpu->ccsidr[0] = 0x701fe00a; /* 32K L1 dcache */
-     cpu->ccsidr[1] = 0x201fe00a; /* 32K L1 icache */
-     cpu->ccsidr[2] = 0x711fe07a; /* 4096K L2 unified cache */
-+    cpu->isar.reset_pmcr_el0 = 0x41072000;
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */
- }
-@@ -XXX,XX +XXX,XX @@ static void cortex_a15_initfn(Object *obj)
-     cpu->ccsidr[0] = 0x701fe00a; /* 32K L1 dcache */
-     cpu->ccsidr[1] = 0x201fe00a; /* 32K L1 icache */
-     cpu->ccsidr[2] = 0x711fe07a; /* 4096K L2 unified cache */
-+    cpu->isar.reset_pmcr_el0 = 0x410F3000;
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);
- }
-@@ -XXX,XX +XXX,XX @@ static void cortex_r5_initfn(Object *obj)
-     cpu->isar.id_isar6 = 0x0;
-     cpu->mp_is_up = true;
-     cpu->pmsav7_dregion = 16;
-+    cpu->isar.reset_pmcr_el0 = 0x41151800;
-     define_arm_cp_regs(cpu, cortexr5_cp_reginfo);
- }
-@@ -XXX,XX +XXX,XX @@ static void arm_max_initfn(Object *obj)
-     cpu->isar.id_isar5 = 0x00011121;
-     cpu->isar.id_isar6 = 0;
-     cpu->isar.dbgdidr = 0x3516d000;
-+    cpu->isar.reset_pmcr_el0 = 0x41013000;
-     cpu->clidr = 0x0a200023;
-     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
-     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@
- #include "cpregs.h"
- #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */
--#define PMCR_NUM_COUNTERS 4 /* QEMU IMPDEF choice */
- #ifndef CONFIG_USER_ONLY
-@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
-       .resetvalue = 0,
-       .writefn = gt_hyp_ctl_write, .raw_writefn = raw_write },
- #endif
--    /* The only field of MDCR_EL2 that has a defined architectural reset value
--     * is MDCR_EL2.HPMN which should reset to the value of PMCR_EL0.N.
--     */
--    { .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH,
--      .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1,
--      .access = PL2_RW, .resetvalue = PMCR_NUM_COUNTERS,
--      .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2), },
-     { .name = "HPFAR", .state = ARM_CP_STATE_AA32,
-       .cp = 15, .opc1 = 4, .crn = 6, .crm = 0, .opc2 = 4,
-       .access = PL2_RW, .accessfn = access_el3_aa32ns,
-@@ -XXX,XX +XXX,XX @@ static void define_pmu_regs(ARMCPU *cpu)
-      * field as main ID register, and we implement four counters in
-      * addition to the cycle count register.
-      */
--    unsigned int i, pmcrn = PMCR_NUM_COUNTERS;
-+    unsigned int i, pmcrn = pmu_num_counters(&cpu->env);
-     ARMCPRegInfo pmcr = {
-         .name = "PMCR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 0,
-         .access = PL0_RW,
-@@ -XXX,XX +XXX,XX @@ static void define_pmu_regs(ARMCPU *cpu)
-         .access = PL0_RW, .accessfn = pmreg_access,
-         .type = ARM_CP_IO,
-         .fieldoffset = offsetof(CPUARMState, cp15.c9_pmcr),
--        .resetvalue = (cpu->midr & 0xff000000) | (pmcrn << PMCRN_SHIFT) |
--                      PMCRLC,
-+        .resetvalue = cpu->isar.reset_pmcr_el0,
-         .writefn = pmcr_write, .raw_writefn = raw_write,
-     };
-+
-     define_one_arm_cp_reg(cpu, &pmcr);
-     define_one_arm_cp_reg(cpu, &pmcr64);
-     for (i = 0; i < pmcrn; i++) {
-@@ -XXX,XX +XXX,XX @@ void register_cp_regs_for_features(ARMCPU *cpu)
-               .type = ARM_CP_EL3_NO_EL2_C_NZ,
-               .fieldoffset = offsetof(CPUARMState, cp15.vmpidr_el2) },
-         };
-+        /*
-+         * The only field of MDCR_EL2 that has a defined architectural reset
-+         * value is MDCR_EL2.HPMN which should reset to the value of PMCR_EL0.N.
-+         */
-+        ARMCPRegInfo mdcr_el2 = {
-+            .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH,
-+            .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1,
-+            .access = PL2_RW, .resetvalue = pmu_num_counters(env),
-+            .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2),
-+        };
-+        define_one_arm_cp_reg(cpu, &mdcr_el2);
-         define_arm_cp_regs(cpu, vpidr_regs);
-         define_arm_cp_regs(cpu, el2_cp_reginfo);
-         if (arm_feature(env, ARM_FEATURE_V8)) {
-diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/kvm64.c
-+++ b/target/arm/kvm64.c
-@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
-      */
-     int fdarray[3];
-     bool sve_supported;
-+    bool pmu_supported = false;
-     uint64_t features = 0;
-     uint64_t t;
-     int err;
-@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
-<< KVM_ARM_VCPU_PTRAUTH_GENERIC);
-     }
-+    if (kvm_arm_pmu_supported()) {
-+        init.features[0] |= 1 << KVM_ARM_VCPU_PMU_V3;
-+        pmu_supported = true;
-+    }
-+
-     if (!kvm_arm_create_scratch_host_vcpu(cpus_to_try, fdarray, &init)) {
-         return false;
-     }
-@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
-             dbgdidr |= (1 << 15); /* RES1 bit */
-             ahcf->isar.dbgdidr = dbgdidr;
-         }
-+
-+        if (pmu_supported) {
-+            /* PMCR_EL0 is only accessible if the vCPU has feature PMU_V3 */
-+            err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0,
-+                                  ARM64_SYS_REG(3, 3, 9, 12, 0));
-+        }
-     }
-     sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0;
---
-.25.1

-[PULL 17/22] hw/arm/virt: Fix incorrect non-secure flash dtb node name
+Deleted patch
-In the virt board with secure=on we put two nodes in the dtb
-for flash devices: one for the secure-only flash, and one
-for the non-secure flash. We get the reg properties for these
-correct, but in the DT node name, which by convention includes
-the base address of devices, we used the wrong address. Fix it.
-Spotted by dtc, which will complain
-Warning (unique_unit_address): /flash@0: duplicate unit-address (also used in node /secflash@0)
-if you dump the dtb from QEMU with -machine dumpdtb=file.dtb
-and then decompile it with dtc.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220513131316.4081539-2-peter.maydell@linaro.org
----
- hw/arm/virt.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -XXX,XX +XXX,XX @@ static void virt_flash_fdt(VirtMachineState *vms,
-         qemu_fdt_setprop_string(ms->fdt, nodename, "secure-status", "okay");
-         g_free(nodename);
--        nodename = g_strdup_printf("/flash@%" PRIx64, flashbase);
-+        nodename = g_strdup_printf("/flash@%" PRIx64, flashbase + flashsize);
-         qemu_fdt_add_subnode(ms->fdt, nodename);
-         qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "cfi-flash");
-         qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
---
-.25.1

-[PULL 18/22] hw/arm/virt: Drop #size-cells and #address-cells from gpio-keys dtb node
+Deleted patch
-The virt board generates a gpio-keys node in the dtb, but it
-incorrectly gives this node #size-cells and #address-cells
-properties. If you dump the dtb with 'machine dumpdtb=file.dtb'
-and run it through dtc, dtc will warn about this:
-Warning (avoid_unnecessary_addr_size): /gpio-keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property
-Remove the bogus properties.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220513131316.4081539-3-peter.maydell@linaro.org
----
- hw/arm/virt.c | 2 --
-file changed, 2 deletions(-)
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -XXX,XX +XXX,XX @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev,
-     qemu_fdt_add_subnode(fdt, "/gpio-keys");
-     qemu_fdt_setprop_string(fdt, "/gpio-keys", "compatible", "gpio-keys");
--    qemu_fdt_setprop_cell(fdt, "/gpio-keys", "#size-cells", 0);
--    qemu_fdt_setprop_cell(fdt, "/gpio-keys", "#address-cells", 1);
-     qemu_fdt_add_subnode(fdt, "/gpio-keys/poweroff");
-     qemu_fdt_setprop_string(fdt, "/gpio-keys/poweroff",
---
-.25.1

-[PULL 19/22] ptimer: Rename PTIMER_POLICY_DEFAULT to PTIMER_POLICY_LEGACY
+Deleted patch
-The traditional ptimer behaviour includes a collection of weird edge
-case behaviours.  In 2016 we improved the ptimer implementation to
-fix these and generally make the behaviour more flexible, with
-ptimers opting in to the new behaviour by passing an appropriate set
-of policy flags to ptimer_init().  For backwards-compatibility, we
-defined PTIMER_POLICY_DEFAULT (which sets no flags) to give the old
-weird behaviour.
-This turns out to be a poor choice of name, because people writing
-new devices which use ptimers are misled into thinking that the
-default is probably a sensible choice of flags, when in fact it is
-almost always not what you want.  Rename PTIMER_POLICY_DEFAULT to
-PTIMER_POLICY_LEGACY and beef up the comment to more clearly say that
-new devices should not be using it.
-The code-change part of this commit was produced by
-  sed -i -e 's/PTIMER_POLICY_DEFAULT/PTIMER_POLICY_LEGACY/g' $(git grep -l PTIMER_POLICY_DEFAULT)
-with the exception of a test name string change in
-tests/unit/ptimer-test.c which was added manually.
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220516103058.162280-1-peter.maydell@linaro.org
----
- include/hw/ptimer.h          | 16 ++++++++++++----
- hw/arm/musicpal.c            |  2 +-
- hw/dma/xilinx_axidma.c       |  2 +-
- hw/dma/xlnx_csu_dma.c        |  2 +-
- hw/m68k/mcf5206.c            |  2 +-
- hw/m68k/mcf5208.c            |  2 +-
- hw/net/can/xlnx-zynqmp-can.c |  2 +-
- hw/net/fsl_etsec/etsec.c     |  2 +-
- hw/net/lan9118.c             |  2 +-
- hw/rtc/exynos4210_rtc.c      |  4 ++--
- hw/timer/allwinner-a10-pit.c |  2 +-
- hw/timer/altera_timer.c      |  2 +-
- hw/timer/arm_timer.c         |  2 +-
- hw/timer/digic-timer.c       |  2 +-
- hw/timer/etraxfs_timer.c     |  6 +++---
- hw/timer/exynos4210_mct.c    |  6 +++---
- hw/timer/exynos4210_pwm.c    |  2 +-
- hw/timer/grlib_gptimer.c     |  2 +-
- hw/timer/imx_epit.c          |  4 ++--
- hw/timer/imx_gpt.c           |  2 +-
- hw/timer/mss-timer.c         |  2 +-
- hw/timer/sh_timer.c          |  2 +-
- hw/timer/slavio_timer.c      |  2 +-
- hw/timer/xilinx_timer.c      |  2 +-
- tests/unit/ptimer-test.c     |  6 +++---
-files changed, 44 insertions(+), 36 deletions(-)
-diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
-index XXXXXXX..XXXXXXX 100644
---- a/include/hw/ptimer.h
-+++ b/include/hw/ptimer.h
-@@ -XXX,XX +XXX,XX @@
-  * to stderr when the guest attempts to enable the timer.
-  */
--/* The default ptimer policy retains backward compatibility with the legacy
-- * timers. Custom policies are adjusting the default one. Consider providing
-- * a correct policy for your timer.
-+/*
-+ * The 'legacy' ptimer policy retains backward compatibility with the
-+ * traditional ptimer behaviour from before policy flags were introduced.
-+ * It has several weird behaviours which don't match typical hardware
-+ * timer behaviour. For a new device using ptimers, you should not
-+ * use PTIMER_POLICY_LEGACY, but instead check the actual behaviour
-+ * that you need and specify the right set of policy flags to get that.
-+ *
-+ * If you are overhauling an existing device that uses PTIMER_POLICY_LEGACY
-+ * and are in a position to check or test the real hardware behaviour,
-+ * consider updating it to specify the right policy flags.
-  *
-  * The rough edges of the default policy:
-  *  - Starting to run with a period = 0 emits error message and stops the
-@@ -XXX,XX +XXX,XX @@
-  *    since the last period, effectively restarting the timer with a
-  *    counter = counter value at the moment of change (.i.e. one less).
-  */
--#define PTIMER_POLICY_DEFAULT               0
-+#define PTIMER_POLICY_LEGACY                0
- /* Periodic timer counter stays with "0" for a one period before wrapping
-  * around.  */
-diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/arm/musicpal.c
-+++ b/hw/arm/musicpal.c
-@@ -XXX,XX +XXX,XX @@ static void mv88w8618_timer_init(SysBusDevice *dev, mv88w8618_timer_state *s,
-     sysbus_init_irq(dev, &s->irq);
-     s->freq = freq;
--    s->ptimer = ptimer_init(mv88w8618_timer_tick, s, PTIMER_POLICY_DEFAULT);
-+    s->ptimer = ptimer_init(mv88w8618_timer_tick, s, PTIMER_POLICY_LEGACY);
- }
- static uint64_t mv88w8618_pit_read(void *opaque, hwaddr offset,
-diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/dma/xilinx_axidma.c
-+++ b/hw/dma/xilinx_axidma.c
-@@ -XXX,XX +XXX,XX @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
-         st->dma = s;
-         st->nr = i;
--        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_DEFAULT);
-+        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_LEGACY);
-         ptimer_transaction_begin(st->ptimer);
-         ptimer_set_freq(st->ptimer, s->freqhz);
-         ptimer_transaction_commit(st->ptimer);
-diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/dma/xlnx_csu_dma.c
-+++ b/hw/dma/xlnx_csu_dma.c
-@@ -XXX,XX +XXX,XX @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error **errp)
-     sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
-     s->src_timer = ptimer_init(xlnx_csu_dma_src_timeout_hit,
--                               s, PTIMER_POLICY_DEFAULT);
-+                               s, PTIMER_POLICY_LEGACY);
-     s->attr = MEMTXATTRS_UNSPECIFIED;
-diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/m68k/mcf5206.c
-+++ b/hw/m68k/mcf5206.c
-@@ -XXX,XX +XXX,XX @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq)
-     m5206_timer_state *s;
-     s = g_new0(m5206_timer_state, 1);
--    s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_DEFAULT);
-+    s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_LEGACY);
-     s->irq = irq;
-     m5206_timer_reset(s);
-     return s;
-diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/m68k/mcf5208.c
-+++ b/hw/m68k/mcf5208.c
-@@ -XXX,XX +XXX,XX @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
-     /* Timers.  */
-     for (i = 0; i < 2; i++) {
-         s = g_new0(m5208_timer_state, 1);
--        s->timer = ptimer_init(m5208_timer_trigger, s, PTIMER_POLICY_DEFAULT);
-+        s->timer = ptimer_init(m5208_timer_trigger, s, PTIMER_POLICY_LEGACY);
-         memory_region_init_io(&s->iomem, NULL, &m5208_timer_ops, s,
-                               "m5208-timer", 0x00004000);
-         memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i,
-diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/can/xlnx-zynqmp-can.c
-+++ b/hw/net/can/xlnx-zynqmp-can.c
-@@ -XXX,XX +XXX,XX @@ static void xlnx_zynqmp_can_realize(DeviceState *dev, Error **errp)
-     /* Allocate a new timer. */
-     s->can_timer = ptimer_init(xlnx_zynqmp_can_ptimer_cb, s,
--                               PTIMER_POLICY_DEFAULT);
-+                               PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(s->can_timer);
-diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/fsl_etsec/etsec.c
-+++ b/hw/net/fsl_etsec/etsec.c
-@@ -XXX,XX +XXX,XX @@ static void etsec_realize(DeviceState *dev, Error **errp)
-                               object_get_typename(OBJECT(dev)), dev->id, etsec);
-     qemu_format_nic_info_str(qemu_get_queue(etsec->nic), etsec->conf.macaddr.a);
--    etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_DEFAULT);
-+    etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(etsec->ptimer);
-     ptimer_set_freq(etsec->ptimer, 100);
-     ptimer_transaction_commit(etsec->ptimer);
-diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/net/lan9118.c
-+++ b/hw/net/lan9118.c
-@@ -XXX,XX +XXX,XX @@ static void lan9118_realize(DeviceState *dev, Error **errp)
-     s->pmt_ctrl = 1;
-     s->txp = &s->tx_packet;
--    s->timer = ptimer_init(lan9118_tick, s, PTIMER_POLICY_DEFAULT);
-+    s->timer = ptimer_init(lan9118_tick, s, PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(s->timer);
-     ptimer_set_freq(s->timer, 10000);
-     ptimer_set_limit(s->timer, 0xffff, 1);
-diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/rtc/exynos4210_rtc.c
-+++ b/hw/rtc/exynos4210_rtc.c
-@@ -XXX,XX +XXX,XX @@ static void exynos4210_rtc_init(Object *obj)
-     Exynos4210RTCState *s = EXYNOS4210_RTC(obj);
-     SysBusDevice *dev = SYS_BUS_DEVICE(obj);
--    s->ptimer = ptimer_init(exynos4210_rtc_tick, s, PTIMER_POLICY_DEFAULT);
-+    s->ptimer = ptimer_init(exynos4210_rtc_tick, s, PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(s->ptimer);
-     ptimer_set_freq(s->ptimer, RTC_BASE_FREQ);
-     exynos4210_rtc_update_freq(s, 0);
-     ptimer_transaction_commit(s->ptimer);
-     s->ptimer_1Hz = ptimer_init(exynos4210_rtc_1Hz_tick,
--                                s, PTIMER_POLICY_DEFAULT);
-+                                s, PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(s->ptimer_1Hz);
-     ptimer_set_freq(s->ptimer_1Hz, RTC_BASE_FREQ);
-     ptimer_transaction_commit(s->ptimer_1Hz);
-diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/allwinner-a10-pit.c
-+++ b/hw/timer/allwinner-a10-pit.c
-@@ -XXX,XX +XXX,XX @@ static void a10_pit_init(Object *obj)
-         tc->container = s;
-         tc->index = i;
--        s->timer[i] = ptimer_init(a10_pit_timer_cb, tc, PTIMER_POLICY_DEFAULT);
-+        s->timer[i] = ptimer_init(a10_pit_timer_cb, tc, PTIMER_POLICY_LEGACY);
-     }
- }
-diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/altera_timer.c
-+++ b/hw/timer/altera_timer.c
-@@ -XXX,XX +XXX,XX @@ static void altera_timer_realize(DeviceState *dev, Error **errp)
-         return;
-     }
--    t->ptimer = ptimer_init(timer_hit, t, PTIMER_POLICY_DEFAULT);
-+    t->ptimer = ptimer_init(timer_hit, t, PTIMER_POLICY_LEGACY);
-     ptimer_transaction_begin(t->ptimer);
-     ptimer_set_freq(t->ptimer, t->freq_hz);
-     ptimer_transaction_commit(t->ptimer);
-diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/arm_timer.c
-+++ b/hw/timer/arm_timer.c
-@@ -XXX,XX +XXX,XX @@ static arm_timer_state *arm_timer_init(uint32_t freq)
-     s->freq = freq;
-     s->control = TIMER_CTRL_IE;
--    s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_DEFAULT);
-+    s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY);
-     vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s);
-     return s;
- }
-diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/digic-timer.c
-+++ b/hw/timer/digic-timer.c
-@@ -XXX,XX +XXX,XX @@ static void digic_timer_init(Object *obj)
- {
-     DigicTimerState *s = DIGIC_TIMER(obj);
--    s->ptimer = ptimer_init(digic_timer_tick, NULL, PTIMER_POLICY_DEFAULT);
-+    s->ptimer = ptimer_init(digic_timer_tick, NULL, PTIMER_POLICY_LEGACY);
-     /*
-      * FIXME: there is no documentation on Digic timer
-diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/etraxfs_timer.c
-+++ b/hw/timer/etraxfs_timer.c
-@@ -XXX,XX +XXX,XX @@ static void etraxfs_timer_realize(DeviceState *dev, Error **errp)
-     ETRAXTimerState *t = ETRAX_TIMER(dev);
-     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
--    t->ptimer_t0 = ptimer_init(timer0_hit, t, PTIMER_POLICY_DEFAULT);
--    t->ptimer_t1 = ptimer_init(timer1_hit, t, PTIMER_POLICY_DEFAULT);
--    t->ptimer_wd = ptimer_init(watchdog_hit, t, PTIMER_POLICY_DEFAULT);
-+    t->ptimer_t0 = ptimer_init(timer0_hit, t, PTIMER_POLICY_LEGACY);
-+    t->ptimer_t1 = ptimer_init(timer1_hit, t, PTIMER_POLICY_LEGACY);
-+    t->ptimer_wd = ptimer_init(watchdog_hit, t, PTIMER_POLICY_LEGACY);
-     sysbus_init_irq(sbd, &t->irq);
-     sysbus_init_irq(sbd, &t->nmi);
-diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/exynos4210_mct.c
-+++ b/hw/timer/exynos4210_mct.c
-@@ -XXX,XX +XXX,XX @@ static void exynos4210_mct_init(Object *obj)
-     /* Global timer */
-     s->g_timer.ptimer_frc = ptimer_init(exynos4210_gfrc_event, s,
--                                        PTIMER_POLICY_DEFAULT);
-+                                        PTIMER_POLICY_LEGACY);
-     memset(&s->g_timer.reg, 0, sizeof(struct gregs));
-     /* Local timers */
-     for (i = 0; i < 2; i++) {
-         s->l_timer[i].tick_timer.ptimer_tick =
-             ptimer_init(exynos4210_ltick_event, &s->l_timer[i],
--                        PTIMER_POLICY_DEFAULT);
-+                        PTIMER_POLICY_LEGACY);
-         s->l_timer[i].ptimer_frc =
-             ptimer_init(exynos4210_lfrc_event, &s->l_timer[i],
--                        PTIMER_POLICY_DEFAULT);
-+                        PTIMER_POLICY_LEGACY);
-         s->l_timer[i].id = i;
-     }
-diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/exynos4210_pwm.c
-+++ b/hw/timer/exynos4210_pwm.c
-@@ -XXX,XX +XXX,XX @@ static void exynos4210_pwm_init(Object *obj)
-         sysbus_init_irq(dev, &s->timer[i].irq);
-         s->timer[i].ptimer = ptimer_init(exynos4210_pwm_tick,
-                                          &s->timer[i],
--                                         PTIMER_POLICY_DEFAULT);
-+                                         PTIMER_POLICY_LEGACY);
-         s->timer[i].id = i;
-         s->timer[i].parent = s;
-     }
-diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/grlib_gptimer.c
-+++ b/hw/timer/grlib_gptimer.c
-@@ -XXX,XX +XXX,XX @@ static void grlib_gptimer_realize(DeviceState *dev, Error **errp)
-         timer->unit   = unit;
-         timer->ptimer = ptimer_init(grlib_gptimer_hit, timer,
--                                    PTIMER_POLICY_DEFAULT);
-+                                    PTIMER_POLICY_LEGACY);
-         timer->id     = i;
-         /* One IRQ line for each timer */
-diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/imx_epit.c
-+++ b/hw/timer/imx_epit.c
-@@ -XXX,XX +XXX,XX @@ static void imx_epit_realize(DeviceState *dev, Error **errp)
-x00001000);
-     sysbus_init_mmio(sbd, &s->iomem);
--    s->timer_reload = ptimer_init(imx_epit_reload, s, PTIMER_POLICY_DEFAULT);
-+    s->timer_reload = ptimer_init(imx_epit_reload, s, PTIMER_POLICY_LEGACY);
--    s->timer_cmp = ptimer_init(imx_epit_cmp, s, PTIMER_POLICY_DEFAULT);
-+    s->timer_cmp = ptimer_init(imx_epit_cmp, s, PTIMER_POLICY_LEGACY);
- }
- static void imx_epit_class_init(ObjectClass *klass, void *data)
-diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/imx_gpt.c
-+++ b/hw/timer/imx_gpt.c
-@@ -XXX,XX +XXX,XX @@ static void imx_gpt_realize(DeviceState *dev, Error **errp)
-x00001000);
-     sysbus_init_mmio(sbd, &s->iomem);
--    s->timer = ptimer_init(imx_gpt_timeout, s, PTIMER_POLICY_DEFAULT);
-+    s->timer = ptimer_init(imx_gpt_timeout, s, PTIMER_POLICY_LEGACY);
- }
- static void imx_gpt_class_init(ObjectClass *klass, void *data)
-diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/mss-timer.c
-+++ b/hw/timer/mss-timer.c
-@@ -XXX,XX +XXX,XX @@ static void mss_timer_init(Object *obj)
-     for (i = 0; i < NUM_TIMERS; i++) {
-         struct Msf2Timer *st = &t->timers[i];
--        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_DEFAULT);
-+        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_LEGACY);
-         ptimer_transaction_begin(st->ptimer);
-         ptimer_set_freq(st->ptimer, t->freq_hz);
-         ptimer_transaction_commit(st->ptimer);
-diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/sh_timer.c
-+++ b/hw/timer/sh_timer.c
-@@ -XXX,XX +XXX,XX @@ static void *sh_timer_init(uint32_t freq, int feat, qemu_irq irq)
-     s->enabled = 0;
-     s->irq = irq;
--    s->timer = ptimer_init(sh_timer_tick, s, PTIMER_POLICY_DEFAULT);
-+    s->timer = ptimer_init(sh_timer_tick, s, PTIMER_POLICY_LEGACY);
-     sh_timer_write(s, OFFSET_TCOR >> 2, s->tcor);
-     sh_timer_write(s, OFFSET_TCNT >> 2, s->tcnt);
-diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/slavio_timer.c
-+++ b/hw/timer/slavio_timer.c
-@@ -XXX,XX +XXX,XX @@ static void slavio_timer_init(Object *obj)
-         tc->timer_index = i;
-         s->cputimer[i].timer = ptimer_init(slavio_timer_irq, tc,
--                                           PTIMER_POLICY_DEFAULT);
-+                                           PTIMER_POLICY_LEGACY);
-         ptimer_transaction_begin(s->cputimer[i].timer);
-         ptimer_set_period(s->cputimer[i].timer, TIMER_PERIOD);
-         ptimer_transaction_commit(s->cputimer[i].timer);
-diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
-index XXXXXXX..XXXXXXX 100644
---- a/hw/timer/xilinx_timer.c
-+++ b/hw/timer/xilinx_timer.c
-@@ -XXX,XX +XXX,XX @@ static void xilinx_timer_realize(DeviceState *dev, Error **errp)
-         xt->parent = t;
-         xt->nr = i;
--        xt->ptimer = ptimer_init(timer_hit, xt, PTIMER_POLICY_DEFAULT);
-+        xt->ptimer = ptimer_init(timer_hit, xt, PTIMER_POLICY_LEGACY);
-         ptimer_transaction_begin(xt->ptimer);
-         ptimer_set_freq(xt->ptimer, t->freq_hz);
-         ptimer_transaction_commit(xt->ptimer);
-diff --git a/tests/unit/ptimer-test.c b/tests/unit/ptimer-test.c
-index XXXXXXX..XXXXXXX 100644
---- a/tests/unit/ptimer-test.c
-+++ b/tests/unit/ptimer-test.c
-@@ -XXX,XX +XXX,XX @@ static void add_ptimer_tests(uint8_t policy)
-     char policy_name[256] = "";
-     char *tmp;
--    if (policy == PTIMER_POLICY_DEFAULT) {
--        g_sprintf(policy_name, "default");
-+    if (policy == PTIMER_POLICY_LEGACY) {
-+        g_sprintf(policy_name, "legacy");
-     }
-     if (policy & PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD) {
-@@ -XXX,XX +XXX,XX @@ static void add_ptimer_tests(uint8_t policy)
- static void add_all_ptimer_policies_comb_tests(void)
- {
-     int last_policy = PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT;
--    int policy = PTIMER_POLICY_DEFAULT;
-+    int policy = PTIMER_POLICY_LEGACY;
-     for (; policy < (last_policy << 1); policy++) {
-         if ((policy & PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT) &&
---
-.25.1

-[PULL 20/22] target/arm: Fix PAuth keys access checks for disabled SEL2
+Deleted patch
-From: Florian Lugou <florian.lugou@provenrun.com>
-As per the description of the HCR_EL2.APK field in the ARMv8 ARM,
-Pointer Authentication keys accesses should only be trapped to Secure
-EL2 if it is enabled.
-Signed-off-by: Florian Lugou <florian.lugou@provenrun.com>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20220517145242.1215271-1-florian.lugou@provenrun.com
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- target/arm/helper.c | 2 +-
-file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -XXX,XX +XXX,XX @@ static CPAccessResult access_pauth(CPUARMState *env, const ARMCPRegInfo *ri,
-     int el = arm_current_el(env);
-     if (el < 2 &&
--        arm_feature(env, ARM_FEATURE_EL2) &&
-+        arm_is_el2_enabled(env) &&
-         !(arm_hcr_el2_eff(env) & HCR_APK)) {
-         return CP_ACCESS_TRAP_EL2;
-     }
---
-.25.1

target-arm queue: mostly patches from me this time round.
Nothing too exciting.

-- PMM

The following changes since commit 78ac2eebbab9150edf5d0d00e3648f5ebb599001:

Merge tag 'artist-cursor-fix-final-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2022-05-18 09:32:15 -0700)

are available in the Git repository at:

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220519

for you to fetch changes up to fab8ad39fb75a0d9f097db67b2a334444754e88e:

target/arm: Use FIELD definitions for CPACR, CPTR_ELx (2022-05-19 18:34:10 +0100)

----------------------------------------------------------------
target-arm queue:
 * Implement FEAT_S2FWB
 * Implement FEAT_IDST
 * Drop unsupported_encoding() macro
 * hw/intc/arm_gicv3: Use correct number of priority bits for the CPU
 * Fix aarch64 debug register names
 * hw/adc/zynq-xadc: Use qemu_irq typedef
 * target/arm/helper.c: Delete stray obsolete comment
 * Make number of counters in PMCR follow the CPU
 * hw/arm/virt: Fix dtb nits
 * ptimer: Rename PTIMER_POLICY_DEFAULT to PTIMER_POLICY_LEGACY
 * target/arm: Fix PAuth keys access checks for disabled SEL2
 * Enable FEAT_HCX for -cpu max
 * Use FIELD definitions for CPACR, CPTR_ELx

----------------------------------------------------------------
Chris Howard (1):
      Fix aarch64 debug register names.

Florian Lugou (1):
      target/arm: Fix PAuth keys access checks for disabled SEL2

Peter Maydell (17):
      target/arm: Postpone interpretation of stage 2 descriptor attribute bits
      target/arm: Factor out FWB=0 specific part of combine_cacheattrs()
      target/arm: Implement FEAT_S2FWB
      target/arm: Enable FEAT_S2FWB for -cpu max
      target/arm: Implement FEAT_IDST
      target/arm: Drop unsupported_encoding() macro
      hw/intc/arm_gicv3_cpuif: Handle CPUs that don't specify GICv3 parameters
      hw/intc/arm_gicv3: report correct PRIbits field in ICV_CTLR_EL1
      hw/intc/arm_gicv3_kvm.c: Stop using GIC_MIN_BPR constant
      hw/intc/arm_gicv3: Support configurable number of physical priority bits
      hw/intc/arm_gicv3: Use correct number of priority bits for the CPU
      hw/intc/arm_gicv3: Provide ich_num_aprs()
      target/arm/helper.c: Delete stray obsolete comment
      target/arm: Make number of counters in PMCR follow the CPU
      hw/arm/virt: Fix incorrect non-secure flash dtb node name
      hw/arm/virt: Drop #size-cells and #address-cells from gpio-keys dtb node
      ptimer: Rename PTIMER_POLICY_DEFAULT to PTIMER_POLICY_LEGACY

Philippe Mathieu-Daudé (1):
      hw/adc/zynq-xadc: Use qemu_irq typedef

Richard Henderson (2):
      target/arm: Enable FEAT_HCX for -cpu max
      target/arm: Use FIELD definitions for CPACR, CPTR_ELx

In the original Arm v8 two-stage translation, both stage 1 and stage
2 specify memory attributes (memory type, cacheability,
shareability); these are then combined to produce the overall memory
attributes for the whole stage 1+2 access.  In QEMU we implement this
by having get_phys_addr() fill in an ARMCacheAttrs struct, and we
convert both the stage 1 and stage 2 attribute bit formats to the
same encoding (an 8-bit attribute value matching the MAIR_EL1 fields,
plus a 2-bit shareability value).

The new FEAT_S2FWB feature allows the guest to enable a different
interpretation of the attribute bits in the stage 2 descriptors.
These bits can now be used to control details of how the stage 1 and
2 attributes should be combined (for instance they can say "always
use the stage 1 attributes" or "ignore the stage 1 attributes and
always be Device memory").  This means we need to pass the raw bit
information for stage 2 down to the function which combines the stage
1 and stage 2 information.

Add a field to ARMCacheAttrs that indicates whether the attrs field
should be interpreted as MAIR format, or as the raw stage 2 attribute
bits from the descriptor, and store the appropriate values when
filling in cacheattrs.

We only need to interpret the attrs field in a few places:
 * in do_ats_write(), where we know to expect a MAIR value
   (there is no ATS instruction to do a stage-2-only walk)
 * in S1_ptw_translate(), where we want to know whether the
   combined S1 + S2 attributes indicate Device memory that
   should provoke a fault
 * in combine_cacheattrs(), which does the S1 + S2 combining
Update those places accordingly.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220505183950.2781801-2-peter.maydell@linaro.org
---
 target/arm/internals.h |  7 ++++++-
 target/arm/helper.c    | 42 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/target/arm/internals.h b/target/arm/internals.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -XXX,XX +XXX,XX @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address,
 
 /* Cacheability and shareability attributes for a memory access */
 typedef struct ARMCacheAttrs {
-    unsigned int attrs:8; /* as in the MAIR register encoding */
+    /*
+     * If is_s2_format is true, attrs is the S2 descriptor bits [5:2]
+     * Otherwise, attrs is the same as the MAIR_EL1 8-bit format
+     */
+    unsigned int attrs:8;
     unsigned int shareability:2; /* as in the SH field of the VMSAv8-64 PTEs */
+    bool is_s2_format:1;
 } ARMCacheAttrs;
 
 bool get_phys_addr(CPUARMState *env, target_ulong address,
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static uint64_t do_ats_write(CPUARMState *env, uint64_t value,
     ret = get_phys_addr(env, value, access_type, mmu_idx, &phys_addr, &attrs,
                         &prot, &page_size, &fi, &cacheattrs);
 
+    /*
+     * ATS operations only do S1 or S1+S2 translations, so we never
+     * have to deal with the ARMCacheAttrs format for S2 only.
+     */
+    assert(!cacheattrs.is_s2_format);
+
     if (ret) {
         /*
          * Some kinds of translation fault must cause exceptions rather
@@ -XXX,XX +XXX,XX @@ static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx,
     return true;
 }
 
+static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs)
+{
+    /*
+     * For an S1 page table walk, the stage 1 attributes are always
+     * some form of "this is Normal memory". The combined S1+S2
+     * attributes are therefore only Device if stage 2 specifies Device.
+     * With HCR_EL2.FWB == 0 this is when descriptor bits [5:4] are 0b00,
+     * ie when cacheattrs.attrs bits [3:2] are 0b00.
+     */
+    assert(cacheattrs.is_s2_format);
+    return (cacheattrs.attrs & 0xc) == 0;
+}
+
 /* Translate a S1 pagetable walk through S2 if needed.  */
 static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
                                hwaddr addr, bool *is_secure,
@@ -XXX,XX +XXX,XX @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
             return ~0;
         }
         if ((arm_hcr_el2_eff(env) & HCR_PTW) &&
-            (cacheattrs.attrs & 0xf0) == 0) {
+            ptw_attrs_are_device(env, cacheattrs)) {
             /*
              * PTW set and S1 walk touched S2 Device memory:
              * generate Permission fault.
@@ -XXX,XX +XXX,XX @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address,
     }
 
     if (mmu_idx == ARMMMUIdx_Stage2 || mmu_idx == ARMMMUIdx_Stage2_S) {
-        cacheattrs->attrs = convert_stage2_attrs(env, extract32(attrs, 0, 4));
+        cacheattrs->is_s2_format = true;
+        cacheattrs->attrs = extract32(attrs, 0, 4);
     } else {
         /* Index into MAIR registers for cache attributes */
         uint8_t attrindx = extract32(attrs, 0, 3);
         uint64_t mair = env->cp15.mair_el[regime_el(env, mmu_idx)];
         assert(attrindx <= 7);
+        cacheattrs->is_s2_format = false;
         cacheattrs->attrs = extract64(mair, attrindx * 8, 8);
     }
 
@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
 /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
  * and CombineS1S2Desc()
  *
+ * @env:     CPUARMState
  * @s1:      Attributes from stage 1 walk
  * @s2:      Attributes from stage 2 walk
  */
-static ARMCacheAttrs combine_cacheattrs(ARMCacheAttrs s1, ARMCacheAttrs s2)
+static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
+                                        ARMCacheAttrs s1, ARMCacheAttrs s2)
 {
     uint8_t s1lo, s2lo, s1hi, s2hi;
     ARMCacheAttrs ret;
     bool tagged = false;
+    uint8_t s2_mair_attrs;
+
+    assert(s2.is_s2_format && !s1.is_s2_format);
+    ret.is_s2_format = false;
+
+    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
 
     if (s1.attrs == 0xf0) {
         tagged = true;
@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(ARMCacheAttrs s1, ARMCacheAttrs s2)
     }
 
     s1lo = extract32(s1.attrs, 0, 4);
-    s2lo = extract32(s2.attrs, 0, 4);
+    s2lo = extract32(s2_mair_attrs, 0, 4);
     s1hi = extract32(s1.attrs, 4, 4);
-    s2hi = extract32(s2.attrs, 4, 4);
+    s2hi = extract32(s2_mair_attrs, 4, 4);
 
     /* Combine shareability attributes (table D4-43) */
     if (s1.shareability == 2 || s2.shareability == 2) {
@@ -XXX,XX +XXX,XX @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
                 }
                 cacheattrs->shareability = 0;
             }
-            *cacheattrs = combine_cacheattrs(*cacheattrs, cacheattrs2);
+            *cacheattrs = combine_cacheattrs(env, *cacheattrs, cacheattrs2);
 
             /* Check if IPA translates to secure or non-secure PA space. */
             if (arm_is_secure_below_el3(env)) {
@@ -XXX,XX +XXX,XX @@ bool get_phys_addr(CPUARMState *env, target_ulong address,
         /* Fill in cacheattr a-la AArch64.TranslateAddressS1Off. */
         hcr = arm_hcr_el2_eff(env);
         cacheattrs->shareability = 0;
+        cacheattrs->is_s2_format = false;
         if (hcr & HCR_DC) {
             if (hcr & HCR_DCT) {
                 memattr = 0xf0;  /* Tagged, Normal, WB, RWA */
-- 
2.25.1

Factor out the part of combine_cacheattrs() that is specific to
handling HCR_EL2.FWB == 0.  This is the part where we combine the
memory type and cacheability attributes.

The "force Outer Shareable for Device or Normal Inner-NC Outer-NC"
logic remains in combine_cacheattrs() because it holds regardless
(this is the equivalent of the pseudocode EffectiveShareability()
function).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220505183950.2781801-3-peter.maydell@linaro.org
---
 target/arm/helper.c | 88 +++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 38 deletions(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
     }
 }
 
+/*
+ * Combine the memory type and cacheability attributes of
+ * s1 and s2 for the HCR_EL2.FWB == 0 case, returning the
+ * combined attributes in MAIR_EL1 format.
+ */
+static uint8_t combined_attrs_nofwb(CPUARMState *env,
+                                    ARMCacheAttrs s1, ARMCacheAttrs s2)
+{
+    uint8_t s1lo, s2lo, s1hi, s2hi, s2_mair_attrs, ret_attrs;
+
+    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
+
+    s1lo = extract32(s1.attrs, 0, 4);
+    s2lo = extract32(s2_mair_attrs, 0, 4);
+    s1hi = extract32(s1.attrs, 4, 4);
+    s2hi = extract32(s2_mair_attrs, 4, 4);
+
+    /* Combine memory type and cacheability attributes */
+    if (s1hi == 0 || s2hi == 0) {
+        /* Device has precedence over normal */
+        if (s1lo == 0 || s2lo == 0) {
+            /* nGnRnE has precedence over anything */
+            ret_attrs = 0;
+        } else if (s1lo == 4 || s2lo == 4) {
+            /* non-Reordering has precedence over Reordering */
+            ret_attrs = 4;  /* nGnRE */
+        } else if (s1lo == 8 || s2lo == 8) {
+            /* non-Gathering has precedence over Gathering */
+            ret_attrs = 8;  /* nGRE */
+        } else {
+            ret_attrs = 0xc; /* GRE */
+        }
+    } else { /* Normal memory */
+        /* Outer/inner cacheability combine independently */
+        ret_attrs = combine_cacheattr_nibble(s1hi, s2hi) << 4
+                  | combine_cacheattr_nibble(s1lo, s2lo);
+    }
+    return ret_attrs;
+}
+
 /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
  * and CombineS1S2Desc()
  *
@@ -XXX,XX +XXX,XX @@ static uint8_t combine_cacheattr_nibble(uint8_t s1, uint8_t s2)
 static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
                                         ARMCacheAttrs s1, ARMCacheAttrs s2)
 {
-    uint8_t s1lo, s2lo, s1hi, s2hi;
     ARMCacheAttrs ret;
     bool tagged = false;
-    uint8_t s2_mair_attrs;
 
     assert(s2.is_s2_format && !s1.is_s2_format);
     ret.is_s2_format = false;
 
-    s2_mair_attrs = convert_stage2_attrs(env, s2.attrs);
-
     if (s1.attrs == 0xf0) {
         tagged = true;
         s1.attrs = 0xff;
     }
 
-    s1lo = extract32(s1.attrs, 0, 4);
-    s2lo = extract32(s2_mair_attrs, 0, 4);
-    s1hi = extract32(s1.attrs, 4, 4);
-    s2hi = extract32(s2_mair_attrs, 4, 4);
-
     /* Combine shareability attributes (table D4-43) */
     if (s1.shareability == 2 || s2.shareability == 2) {
         /* if either are outer-shareable, the result is outer-shareable */
@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
     }
 
     /* Combine memory type and cacheability attributes */
-    if (s1hi == 0 || s2hi == 0) {
-        /* Device has precedence over normal */
-        if (s1lo == 0 || s2lo == 0) {
-            /* nGnRnE has precedence over anything */
-            ret.attrs = 0;
-        } else if (s1lo == 4 || s2lo == 4) {
-            /* non-Reordering has precedence over Reordering */
-            ret.attrs = 4;  /* nGnRE */
-        } else if (s1lo == 8 || s2lo == 8) {
-            /* non-Gathering has precedence over Gathering */
-            ret.attrs = 8;  /* nGRE */
-        } else {
-            ret.attrs = 0xc; /* GRE */
-        }
+    ret.attrs = combined_attrs_nofwb(env, s1, s2);
 
-        /* Any location for which the resultant memory type is any
-         * type of Device memory is always treated as Outer Shareable.
-         */
+    /*
+     * Any location for which the resultant memory type is any
+     * type of Device memory is always treated as Outer Shareable.
+     * Any location for which the resultant memory type is Normal
+     * Inner Non-cacheable, Outer Non-cacheable is always treated
+     * as Outer Shareable.
+     * TODO: FEAT_XS adds another value (0x40) also meaning iNCoNC
+     */
+    if ((ret.attrs & 0xf0) == 0 || ret.attrs == 0x44) {
         ret.shareability = 2;
-    } else { /* Normal memory */
-        /* Outer/inner cacheability combine independently */
-        ret.attrs = combine_cacheattr_nibble(s1hi, s2hi) << 4
-                  | combine_cacheattr_nibble(s1lo, s2lo);
-
-        if (ret.attrs == 0x44) {
-            /* Any location for which the resultant memory type is Normal
-             * Inner Non-cacheable, Outer Non-cacheable is always treated
-             * as Outer Shareable.
-             */
-            ret.shareability = 2;
-        }
     }
 
     /* TODO: CombineS1S2Desc does not consider transient, only WB, RWA. */
-- 
2.25.1

Implement the handling of FEAT_S2FWB; the meat of this is in the new
combined_attrs_fwb() function which combines S1 and S2 attributes
when HCR_EL2.FWB is set.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220505183950.2781801-4-peter.maydell@linaro.org
---
 target/arm/cpu.h    |  5 +++
 target/arm/helper.c | 84 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_st(const ARMISARegisters *id)
     return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, ST) != 0;
 }
 
+static inline bool isar_feature_aa64_fwb(const ARMISARegisters *id)
+{
+    return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, FWB) != 0;
+}
+
 static inline bool isar_feature_aa64_bti(const ARMISARegisters *id)
 {
     return FIELD_EX64(id->id_aa64pfr1, ID_AA64PFR1, BT) != 0;
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask)
         if (cpu_isar_feature(aa64_scxtnum, cpu)) {
             valid_mask |= HCR_ENSCXT;
         }
+        if (cpu_isar_feature(aa64_fwb, cpu)) {
+            valid_mask |= HCR_FWB;
+        }
     }
 
     /* Clear RES0 bits.  */
@@ -XXX,XX +XXX,XX @@ static void do_hcr_write(CPUARMState *env, uint64_t value, uint64_t valid_mask)
      * HCR_PTW forbids certain page-table setups
      * HCR_DC disables stage1 and enables stage2 translation
      * HCR_DCT enables tagging on (disabled) stage1 translation
+     * HCR_FWB changes the interpretation of stage2 descriptor bits
      */
-    if ((env->cp15.hcr_el2 ^ value) & (HCR_VM | HCR_PTW | HCR_DC | HCR_DCT)) {
+    if ((env->cp15.hcr_el2 ^ value) &
+        (HCR_VM | HCR_PTW | HCR_DC | HCR_DCT | HCR_FWB)) {
         tlb_flush(CPU(cpu));
     }
     env->cp15.hcr_el2 = value;
@@ -XXX,XX +XXX,XX @@ static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs)
      * attributes are therefore only Device if stage 2 specifies Device.
      * With HCR_EL2.FWB == 0 this is when descriptor bits [5:4] are 0b00,
      * ie when cacheattrs.attrs bits [3:2] are 0b00.
+     * With HCR_EL2.FWB == 1 this is when descriptor bit [4] is 0, ie
+     * when cacheattrs.attrs bit [2] is 0.
      */
     assert(cacheattrs.is_s2_format);
-    return (cacheattrs.attrs & 0xc) == 0;
+    if (arm_hcr_el2_eff(env) & HCR_FWB) {
+        return (cacheattrs.attrs & 0x4) == 0;
+    } else {
+        return (cacheattrs.attrs & 0xc) == 0;
+    }
 }
 
 /* Translate a S1 pagetable walk through S2 if needed.  */
@@ -XXX,XX +XXX,XX @@ static uint8_t combined_attrs_nofwb(CPUARMState *env,
     return ret_attrs;
 }
 
+static uint8_t force_cacheattr_nibble_wb(uint8_t attr)
+{
+    /*
+     * Given the 4 bits specifying the outer or inner cacheability
+     * in MAIR format, return a value specifying Normal Write-Back,
+     * with the allocation and transient hints taken from the input
+     * if the input specified some kind of cacheable attribute.
+     */
+    if (attr == 0 || attr == 4) {
+        /*
+         * 0 == an UNPREDICTABLE encoding
+         * 4 == Non-cacheable
+         * Either way, force Write-Back RW allocate non-transient
+         */
+        return 0xf;
+    }
+    /* Change WriteThrough to WriteBack, keep allocation and transient hints */
+    return attr | 4;
+}
+
+/*
+ * Combine the memory type and cacheability attributes of
+ * s1 and s2 for the HCR_EL2.FWB == 1 case, returning the
+ * combined attributes in MAIR_EL1 format.
+ */
+static uint8_t combined_attrs_fwb(CPUARMState *env,
+                                  ARMCacheAttrs s1, ARMCacheAttrs s2)
+{
+    switch (s2.attrs) {
+    case 7:
+        /* Use stage 1 attributes */
+        return s1.attrs;
+    case 6:
+        /*
+         * Force Normal Write-Back. Note that if S1 is Normal cacheable
+         * then we take the allocation hints from it; otherwise it is
+         * RW allocate, non-transient.
+         */
+        if ((s1.attrs & 0xf0) == 0) {
+            /* S1 is Device */
+            return 0xff;
+        }
+        /* Need to check the Inner and Outer nibbles separately */
+        return force_cacheattr_nibble_wb(s1.attrs & 0xf) |
+            force_cacheattr_nibble_wb(s1.attrs >> 4) << 4;
+    case 5:
+        /* If S1 attrs are Device, use them; otherwise Normal Non-cacheable */
+        if ((s1.attrs & 0xf0) == 0) {
+            return s1.attrs;
+        }
+        return 0x44;
+    case 0 ... 3:
+        /* Force Device, of subtype specified by S2 */
+        return s2.attrs << 2;
+    default:
+        /*
+         * RESERVED values (including RES0 descriptor bit [5] being nonzero);
+         * arbitrarily force Device.
+         */
+        return 0;
+    }
+}
+
 /* Combine S1 and S2 cacheability/shareability attributes, per D4.5.4
  * and CombineS1S2Desc()
  *
@@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(CPUARMState *env,
     }
 
     /* Combine memory type and cacheability attributes */
-    ret.attrs = combined_attrs_nofwb(env, s1, s2);
+    if (arm_hcr_el2_eff(env) & HCR_FWB) {
+        ret.attrs = combined_attrs_fwb(env, s1, s2);
+    } else {
+        ret.attrs = combined_attrs_nofwb(env, s1, s2);
+    }
 
     /*
      * Any location for which the resultant memory type is any
-- 
2.25.1

Enable the FEAT_S2FWB for -cpu max. Since FEAT_S2FWB requires that
CLIDR_EL1.{LoUU,LoUIS} are zero, we explicitly squash these (the
inherited CLIDR_EL1 value from the Cortex-A57 has them as 1).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220505183950.2781801-5-peter.maydell@linaro.org
---
 docs/system/arm/emulation.rst |  1 +
 target/arm/cpu64.c            | 11 +++++++++++
 2 files changed, 12 insertions(+)

The Armv8.4 feature FEAT_IDST specifies that exceptions generated by
read accesses to the feature ID space should report a syndrome code
of 0x18 (EC_SYSTEMREGISTERTRAP) rather than 0x00 (EC_UNCATEGORIZED).
The feature ID space is defined to be:
 op0 == 3, op1 == {0,1,3}, CRn == 0, CRm == {0-7}, op2 == {0-7}

In our implementation we might return the EC_UNCATEGORIZED syndrome
value for a system register access in four cases:
 * no reginfo struct in the hashtable
 * cp_access_ok() fails (ie ri->access doesn't permit the access)
 * ri->accessfn returns CP_ACCESS_TRAP_UNCATEGORIZED at runtime
 * ri->type includes ARM_CP_RAISES_EXC, and the readfn raises
   an UNDEF exception at runtime

We have very few regdefs that set ARM_CP_RAISES_EXC, and none of
them are in the feature ID space. (In the unlikely event that any
are added in future they would need to take care of setting the
correct syndrome themselves.) This patch deals with the other
three cases, and enables FEAT_IDST for AArch64 -cpu max.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220509155457.3560724-1-peter.maydell@linaro.org
---
 docs/system/arm/emulation.rst |  1 +
 target/arm/cpregs.h           | 24 ++++++++++++++++++++++++
 target/arm/cpu.h              |  5 +++++
 target/arm/cpu64.c            |  1 +
 target/arm/op_helper.c        |  9 +++++++++
 target/arm/translate-a64.c    | 28 ++++++++++++++++++++++++++--
 6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/system/arm/emulation.rst
+++ b/docs/system/arm/emulation.rst
@@ -XXX,XX +XXX,XX @@ the following architecture extensions:
 - FEAT_FlagM2 (Enhancements to flag manipulation instructions)
 - FEAT_HPDS (Hierarchical permission disables)
 - FEAT_I8MM (AArch64 Int8 matrix multiplication instructions)
+- FEAT_IDST (ID space trap handling)
 - FEAT_IESB (Implicit error synchronization event)
 - FEAT_JSCVT (JavaScript conversion instructions)
 - FEAT_LOR (Limited ordering regions)
diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpregs.h
+++ b/target/arm/cpregs.h
@@ -XXX,XX +XXX,XX @@ static inline bool cp_access_ok(int current_el,
 /* Raw read of a coprocessor register (as needed for migration, etc) */
 uint64_t read_raw_cp_reg(CPUARMState *env, const ARMCPRegInfo *ri);
 
+/*
+ * Return true if the cp register encoding is in the "feature ID space" as
+ * defined by FEAT_IDST (and thus should be reported with ER_ELx.EC
+ * as EC_SYSTEMREGISTERTRAP rather than EC_UNCATEGORIZED).
+ */
+static inline bool arm_cpreg_encoding_in_idspace(uint8_t opc0, uint8_t opc1,
+                                                 uint8_t opc2,
+                                                 uint8_t crn, uint8_t crm)
+{
+    return opc0 == 3 && (opc1 == 0 || opc1 == 1 || opc1 == 3) &&
+        crn == 0 && crm < 8;
+}
+
+/*
+ * As arm_cpreg_encoding_in_idspace(), but take the encoding from an
+ * ARMCPRegInfo.
+ */
+static inline bool arm_cpreg_in_idspace(const ARMCPRegInfo *ri)
+{
+    return ri->state == ARM_CP_STATE_AA64 &&
+        arm_cpreg_encoding_in_idspace(ri->opc0, ri->opc1, ri->opc2,
+                                      ri->crn, ri->crm);
+}
+
 #endif /* TARGET_ARM_CPREGS_H */
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_fwb(const ARMISARegisters *id)
     return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, FWB) != 0;
 }
 
+static inline bool isar_feature_aa64_ids(const ARMISARegisters *id)
+{
+    return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, IDS) != 0;
+}
+
 static inline bool isar_feature_aa64_bti(const ARMISARegisters *id)
 {
     return FIELD_EX64(id->id_aa64pfr1, ID_AA64PFR1, BT) != 0;
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
     t = FIELD_DP64(t, ID_AA64MMFR2, IESB, 1);     /* FEAT_IESB */
     t = FIELD_DP64(t, ID_AA64MMFR2, VARANGE, 1);  /* FEAT_LVA */
     t = FIELD_DP64(t, ID_AA64MMFR2, ST, 1);       /* FEAT_TTST */
+    t = FIELD_DP64(t, ID_AA64MMFR2, IDS, 1);      /* FEAT_IDST */
     t = FIELD_DP64(t, ID_AA64MMFR2, FWB, 1);      /* FEAT_S2FWB */
     t = FIELD_DP64(t, ID_AA64MMFR2, TTL, 1);      /* FEAT_TTL */
     t = FIELD_DP64(t, ID_AA64MMFR2, BBM, 2);      /* FEAT_BBM at level 2 */
diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/op_helper.c
+++ b/target/arm/op_helper.c
@@ -XXX,XX +XXX,XX @@ uint32_t HELPER(mrs_banked)(CPUARMState *env, uint32_t tgtmode, uint32_t regno)
 void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome,
                                  uint32_t isread)
 {
+    ARMCPU *cpu = env_archcpu(env);
     const ARMCPRegInfo *ri = rip;
     CPAccessResult res = CP_ACCESS_OK;
     int target_el;
@@ -XXX,XX +XXX,XX @@ void HELPER(access_check_cp_reg)(CPUARMState *env, void *rip, uint32_t syndrome,
     case CP_ACCESS_TRAP:
         break;
     case CP_ACCESS_TRAP_UNCATEGORIZED:
+        if (cpu_isar_feature(aa64_ids, cpu) && isread &&
+            arm_cpreg_in_idspace(ri)) {
+            /*
+             * FEAT_IDST says this should be reported as EC_SYSTEMREGISTERTRAP,
+             * not EC_UNCATEGORIZED
+             */
+            break;
+        }
         syndrome = syn_uncategorized();
         break;
     default:
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -XXX,XX +XXX,XX @@ static void gen_set_nzcv(TCGv_i64 tcg_rt)
     tcg_temp_free_i32(nzcv);
 }
 
+static void gen_sysreg_undef(DisasContext *s, bool isread,
+                             uint8_t op0, uint8_t op1, uint8_t op2,
+                             uint8_t crn, uint8_t crm, uint8_t rt)
+{
+    /*
+     * Generate code to emit an UNDEF with correct syndrome
+     * information for a failed system register access.
+     * This is EC_UNCATEGORIZED (ie a standard UNDEF) in most cases,
+     * but if FEAT_IDST is implemented then read accesses to registers
+     * in the feature ID space are reported with the EC_SYSTEMREGISTERTRAP
+     * syndrome.
+     */
+    uint32_t syndrome;
+
+    if (isread && dc_isar_feature(aa64_ids, s) &&
+        arm_cpreg_encoding_in_idspace(op0, op1, op2, crn, crm)) {
+        syndrome = syn_aa64_sysregtrap(op0, op1, op2, crn, crm, rt, isread);
+    } else {
+        syndrome = syn_uncategorized();
+    }
+    gen_exception_insn(s, s->pc_curr, EXCP_UDEF, syndrome,
+                       default_exception_el(s));
+}
+
 /* MRS - move from system register
  * MSR (register) - move to system register
  * SYS
@@ -XXX,XX +XXX,XX @@ static void handle_sys(DisasContext *s, uint32_t insn, bool isread,
         qemu_log_mask(LOG_UNIMP, "%s access to unsupported AArch64 "
                       "system register op0:%d op1:%d crn:%d crm:%d op2:%d\n",
                       isread ? "read" : "write", op0, op1, crn, crm, op2);
-        unallocated_encoding(s);
+        gen_sysreg_undef(s, isread, op0, op1, op2, crn, crm, rt);
         return;
     }
 
     /* Check access permissions */
     if (!cp_access_ok(s->current_el, ri, isread)) {
-        unallocated_encoding(s);
+        gen_sysreg_undef(s, isread, op0, op1, op2, crn, crm, rt);
         return;
     }
 
-- 
2.25.1

The unsupported_encoding() macro logs a LOG_UNIMP message and then
generates code to raise the usual exception for an unallocated
encoding.  Back when we were still implementing the A64 decoder this
was helpful for flagging up when guest code was using something we
hadn't yet implemented.  Now we completely cover the A64 instruction
set it is barely used.  The only remaining uses are for five
instructions whose semantics are "UNDEF, unless being run under
external halting debug":
 * HLT (when not being used for semihosting)
 * DCPSR1, DCPS2, DCPS3
 * DRPS

QEMU doesn't implement external halting debug, so for us the UNDEF is
the architecturally correct behaviour (because it's not possible to
execute these instructions with halting debug enabled).  The
LOG_UNIMP doesn't serve a useful purpose; replace these uses of
unsupported_encoding() with unallocated_encoding(), and delete the
macro.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220509160443.3561604-1-peter.maydell@linaro.org
---
 target/arm/translate-a64.h | 9 ---------
 target/arm/translate-a64.c | 8 ++++----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/target/arm/translate-a64.h b/target/arm/translate-a64.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/translate-a64.h
+++ b/target/arm/translate-a64.h
@@ -XXX,XX +XXX,XX @@
 #ifndef TARGET_ARM_TRANSLATE_A64_H
 #define TARGET_ARM_TRANSLATE_A64_H
 
-#define unsupported_encoding(s, insn)                                    \
-    do {                                                                 \
-        qemu_log_mask(LOG_UNIMP,                                         \
-                      "%s:%d: unsupported instruction encoding 0x%08x "  \
-                      "at pc=%016" PRIx64 "\n",                          \
-                      __FILE__, __LINE__, insn, s->pc_curr);             \
-        unallocated_encoding(s);                                         \
-    } while (0)
-
 TCGv_i64 new_tmp_a64(DisasContext *s);
 TCGv_i64 new_tmp_a64_local(DisasContext *s);
 TCGv_i64 new_tmp_a64_zero(DisasContext *s);
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/translate-a64.c
+++ b/target/arm/translate-a64.c
@@ -XXX,XX +XXX,XX @@ static void disas_exc(DisasContext *s, uint32_t insn)
              * with our 32-bit semihosting).
              */
             if (s->current_el == 0) {
-                unsupported_encoding(s, insn);
+                unallocated_encoding(s);
                 break;
             }
 #endif
             gen_exception_internal_insn(s, s->pc_curr, EXCP_SEMIHOST);
         } else {
-            unsupported_encoding(s, insn);
+            unallocated_encoding(s);
         }
         break;
     case 5:
@@ -XXX,XX +XXX,XX @@ static void disas_exc(DisasContext *s, uint32_t insn)
             break;
         }
         /* DCPS1, DCPS2, DCPS3 */
-        unsupported_encoding(s, insn);
+        unallocated_encoding(s);
         break;
     default:
         unallocated_encoding(s);
@@ -XXX,XX +XXX,XX @@ static void disas_uncond_b_reg(DisasContext *s, uint32_t insn)
         if (op3 != 0 || op4 != 0 || rn != 0x1f) {
             goto do_unallocated;
         } else {
-            unsupported_encoding(s, insn);
+            unallocated_encoding(s);
         }
         return;
 
-- 
2.25.1

We allow a GICv3 to be connected to any CPU, but we don't do anything
to handle the case where the CPU type doesn't in hardware have a
GICv3 CPU interface and so the various GIC configuration fields
(gic_num_lrs, vprebits, vpribits) are not specified.

The current behaviour is that we will add the EL1 CPU interface
registers, but will not put in the EL2 CPU interface registers, even
if the CPU has EL2, which will leave the GIC in a broken state and
probably result in the guest crashing as it tries to set it up.  This
only affects the virt board when using the cortex-a15 or cortex-a7
CPU types (both 32-bit) with -machine gic-version=3 (or 'max')
and -machine virtualization=on.

Instead of failing to set up the EL2 registers, if the CPU doesn't
define the GIC configuration set it to a reasonable default, matching
the standard configuration for most Arm CPUs.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-2-peter.maydell@linaro.org
---
 hw/intc/arm_gicv3_cpuif.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
         ARMCPU *cpu = ARM_CPU(qemu_get_cpu(i));
         GICv3CPUState *cs = &s->cpu[i];
 
+        /*
+         * If the CPU doesn't define a GICv3 configuration, probably because
+         * in real hardware it doesn't have one, then we use default values
+         * matching the one used by most Arm CPUs. This applies to:
+         *  cpu->gic_num_lrs
+         *  cpu->gic_vpribits
+         *  cpu->gic_vprebits
+         */
+
         /* Note that we can't just use the GICv3CPUState as an opaque pointer
          * in define_arm_cp_regs_with_opaque(), because when we're called back
          * it might be with code translated by CPU 0 but run by CPU 1, in
@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
          * get back to the GICv3CPUState from the CPUARMState.
          */
         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
-        if (arm_feature(&cpu->env, ARM_FEATURE_EL2)
-            && cpu->gic_num_lrs) {
+        if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
             int j;
 
-            cs->num_list_regs = cpu->gic_num_lrs;
-            cs->vpribits = cpu->gic_vpribits;
-            cs->vprebits = cpu->gic_vprebits;
+            cs->num_list_regs = cpu->gic_num_lrs ?: 4;
+            cs->vpribits = cpu->gic_vpribits ?: 5;
+            cs->vprebits = cpu->gic_vprebits ?: 5;
 
             /* Check against architectural constraints: getting these
              * wrong would be a bug in the CPU code defining these,
-- 
2.25.1

As noted in the comment, the PRIbits field in ICV_CTLR_EL1 is
supposed to match the ICH_VTR_EL2 PRIbits setting; that is, it is the
virtual priority bit setting, not the physical priority bit setting.
(For QEMU currently we always implement 8 bits of physical priority,
so the PRIbits field was previously 7, since it is defined to be
"priority bits - 1".)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-3-peter.maydell@linaro.org
Message-id: 20220506162129.2896966-2-peter.maydell@linaro.org
---
 hw/intc/arm_gicv3_cpuif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -XXX,XX +XXX,XX @@ static uint64_t icv_ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
      * should match the ones reported in ich_vtr_read().
      */
     value = ICC_CTLR_EL1_A3V | (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
-        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
+        ((cs->vpribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
 
     if (cs->ich_vmcr_el2 & ICH_VMCR_EL2_VEOIM) {
         value |= ICC_CTLR_EL1_EOIMODE;
-- 
2.25.1

The GIC_MIN_BPR constant defines the minimum BPR value that the TCG
emulated GICv3 supports.  We're currently using this also as the
value we reset the KVM GICv3 ICC_BPR registers to, but this is only
right by accident.

We want to make the emulated GICv3 use a configurable number of
priority bits, which means that GIC_MIN_BPR will no longer be a
constant.  Replace the uses in the KVM reset code with literal 0,
plus a constant explaining why this is reasonable.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-4-peter.maydell@linaro.org
Message-id: 20220506162129.2896966-3-peter.maydell@linaro.org
---
 hw/intc/arm_gicv3_kvm.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -XXX,XX +XXX,XX @@ static void arm_gicv3_icc_reset(CPUARMState *env, const ARMCPRegInfo *ri)
     s = c->gic;
 
     c->icc_pmr_el1 = 0;
-    c->icc_bpr[GICV3_G0] = GIC_MIN_BPR;
-    c->icc_bpr[GICV3_G1] = GIC_MIN_BPR;
-    c->icc_bpr[GICV3_G1NS] = GIC_MIN_BPR;
+    /*
+     * Architecturally the reset value of the ICC_BPR registers
+     * is UNKNOWN. We set them all to 0 here; when the kernel
+     * uses these values to program the ICH_VMCR_EL2 fields that
+     * determine the guest-visible ICC_BPR register values, the
+     * hardware's "writing a value less than the minimum sets
+     * the field to the minimum value" behaviour will result in
+     * them effectively resetting to the correct minimum value
+     * for the host GIC.
+     */
+    c->icc_bpr[GICV3_G0] = 0;
+    c->icc_bpr[GICV3_G1] = 0;
+    c->icc_bpr[GICV3_G1NS] = 0;
 
     c->icc_sre_el1 = 0x7;
     memset(c->icc_apr, 0, sizeof(c->icc_apr));
-- 
2.25.1

The GICv3 code has always supported a configurable number of virtual
priority and preemption bits, but our implementation currently
hardcodes the number of physical priority bits at 8.  This is not
what most hardware implementations provide; for instance the
Cortex-A53 provides only 5 bits of physical priority.

Make the number of physical priority/preemption bits driven by fields
in the GICv3CPUState, the way that we already do for virtual
priority/preemption bits.  We set cs->pribits to 8, so there is no
behavioural change in this commit.  A following commit will add the
machinery for CPUs to set this to the correct value for their
implementation.

Note that changing the number of priority bits would be a migration
compatibility break, because the semantics of the icc_apr[][] array
changes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-5-peter.maydell@linaro.org
Message-id: 20220506162129.2896966-4-peter.maydell@linaro.org
---
 include/hw/intc/arm_gicv3_common.h |   7 +-
 hw/intc/arm_gicv3_cpuif.c          | 182 ++++++++++++++++++++---------
 2 files changed, 130 insertions(+), 59 deletions(-)

diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/intc/arm_gicv3_common.h
+++ b/include/hw/intc/arm_gicv3_common.h
@@ -XXX,XX +XXX,XX @@
 /* Maximum number of list registers (architectural limit) */
 #define GICV3_LR_MAX 16
 
-/* Minimum BPR for Secure, or when security not enabled */
-#define GIC_MIN_BPR 0
-/* Minimum BPR for Nonsecure when security is enabled */
-#define GIC_MIN_BPR_NS (GIC_MIN_BPR + 1)
-
 /* For some distributor fields we want to model the array of 32-bit
  * register values which hold various bitmaps corresponding to enabled,
  * pending, etc bits. These macros and functions facilitate that; the
@@ -XXX,XX +XXX,XX @@ struct GICv3CPUState {
     int num_list_regs;
     int vpribits; /* number of virtual priority bits */
     int vprebits; /* number of virtual preemption bits */
+    int pribits; /* number of physical priority bits */
+    int prebits; /* number of physical preemption bits */
 
     /* Current highest priority pending interrupt for this CPU.
      * This is cached information that can be recalculated from the
diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -XXX,XX +XXX,XX @@ static uint64_t icv_iar_read(CPUARMState *env, const ARMCPRegInfo *ri)
     return intid;
 }
 
+static uint32_t icc_fullprio_mask(GICv3CPUState *cs)
+{
+    /*
+     * Return a mask word which clears the unimplemented priority bits
+     * from a priority value for a physical interrupt. (Not to be confused
+     * with the group priority, whose mask depends on the value of BPR
+     * for the interrupt group.)
+     */
+    return ~0U << (8 - cs->pribits);
+}
+
+static inline int icc_min_bpr(GICv3CPUState *cs)
+{
+    /* The minimum BPR for the physical interface. */
+    return 7 - cs->prebits;
+}
+
+static inline int icc_min_bpr_ns(GICv3CPUState *cs)
+{
+    return icc_min_bpr(cs) + 1;
+}
+
+static inline int icc_num_aprs(GICv3CPUState *cs)
+{
+    /* Return the number of APR registers (1, 2, or 4) */
+    int aprmax = 1 << MAX(cs->prebits - 5, 0);
+    assert(aprmax <= ARRAY_SIZE(cs->icc_apr[0]));
+    return aprmax;
+}
+
 static int icc_highest_active_prio(GICv3CPUState *cs)
 {
     /* Calculate the current running priority based on the set bits
@@ -XXX,XX +XXX,XX @@ static int icc_highest_active_prio(GICv3CPUState *cs)
      */
     int i;
 
-    for (i = 0; i < ARRAY_SIZE(cs->icc_apr[0]); i++) {
+    for (i = 0; i < icc_num_aprs(cs); i++) {
         uint32_t apr = cs->icc_apr[GICV3_G0][i] |
             cs->icc_apr[GICV3_G1][i] | cs->icc_apr[GICV3_G1NS][i];
 
         if (!apr) {
             continue;
         }
-        return (i * 32 + ctz32(apr)) << (GIC_MIN_BPR + 1);
+        return (i * 32 + ctz32(apr)) << (icc_min_bpr(cs) + 1);
     }
     /* No current active interrupts: return idle priority */
     return 0xff;
@@ -XXX,XX +XXX,XX @@ static void icc_pmr_write(CPUARMState *env, const ARMCPRegInfo *ri,
 
     trace_gicv3_icc_pmr_write(gicv3_redist_affid(cs), value);
 
-    value &= 0xff;
+    value &= icc_fullprio_mask(cs);
 
     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_is_secure(env) &&
         (env->cp15.scr_el3 & SCR_FIQ)) {
@@ -XXX,XX +XXX,XX @@ static void icc_activate_irq(GICv3CPUState *cs, int irq)
      */
     uint32_t mask = icc_gprio_mask(cs, cs->hppi.grp);
     int prio = cs->hppi.prio & mask;
-    int aprbit = prio >> 1;
+    int aprbit = prio >> (8 - cs->prebits);
     int regno = aprbit / 32;
     int regbit = aprbit % 32;
 
@@ -XXX,XX +XXX,XX @@ static void icc_drop_prio(GICv3CPUState *cs, int grp)
      */
     int i;
 
-    for (i = 0; i < ARRAY_SIZE(cs->icc_apr[grp]); i++) {
+    for (i = 0; i < icc_num_aprs(cs); i++) {
         uint64_t *papr = &cs->icc_apr[grp][i];
 
         if (!*papr) {
@@ -XXX,XX +XXX,XX @@ static void icc_bpr_write(CPUARMState *env, const ARMCPRegInfo *ri,
         return;
     }
 
-    minval = (grp == GICV3_G1NS) ? GIC_MIN_BPR_NS : GIC_MIN_BPR;
+    minval = (grp == GICV3_G1NS) ? icc_min_bpr_ns(cs) : icc_min_bpr(cs);
     if (value < minval) {
         value = minval;
     }
@@ -XXX,XX +XXX,XX @@ static void icc_reset(CPUARMState *env, const ARMCPRegInfo *ri)
 
     cs->icc_ctlr_el1[GICV3_S] = ICC_CTLR_EL1_A3V |
         (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
-        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
+        ((cs->pribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
     cs->icc_ctlr_el1[GICV3_NS] = ICC_CTLR_EL1_A3V |
         (1 << ICC_CTLR_EL1_IDBITS_SHIFT) |
-        (7 << ICC_CTLR_EL1_PRIBITS_SHIFT);
+        ((cs->pribits - 1) << ICC_CTLR_EL1_PRIBITS_SHIFT);
     cs->icc_pmr_el1 = 0;
-    cs->icc_bpr[GICV3_G0] = GIC_MIN_BPR;
-    cs->icc_bpr[GICV3_G1] = GIC_MIN_BPR;
-    cs->icc_bpr[GICV3_G1NS] = GIC_MIN_BPR_NS;
+    cs->icc_bpr[GICV3_G0] = icc_min_bpr(cs);
+    cs->icc_bpr[GICV3_G1] = icc_min_bpr(cs);
+    cs->icc_bpr[GICV3_G1NS] = icc_min_bpr_ns(cs);
     memset(cs->icc_apr, 0, sizeof(cs->icc_apr));
     memset(cs->icc_igrpen, 0, sizeof(cs->icc_igrpen));
     cs->icc_ctlr_el3 = ICC_CTLR_EL3_NDS | ICC_CTLR_EL3_A3V |
         (1 << ICC_CTLR_EL3_IDBITS_SHIFT) |
-        (7 << ICC_CTLR_EL3_PRIBITS_SHIFT);
+        ((cs->pribits - 1) << ICC_CTLR_EL3_PRIBITS_SHIFT);
 
     memset(cs->ich_apr, 0, sizeof(cs->ich_apr));
     cs->ich_hcr_el2 = 0;
@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
       .readfn = icc_ap_read,
       .writefn = icc_ap_write,
     },
-    { .name = "ICC_AP0R1_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 5,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
-    { .name = "ICC_AP0R2_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 6,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
-    { .name = "ICC_AP0R3_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 7,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_fiq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
     /* All the ICC_AP1R*_EL1 registers are banked */
     { .name = "ICC_AP1R0_EL1", .state = ARM_CP_STATE_BOTH,
       .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 0,
@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
       .readfn = icc_ap_read,
       .writefn = icc_ap_write,
     },
-    { .name = "ICC_AP1R1_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 1,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_irq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
-    { .name = "ICC_AP1R2_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 2,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_irq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
-    { .name = "ICC_AP1R3_EL1", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 3,
-      .type = ARM_CP_IO | ARM_CP_NO_RAW,
-      .access = PL1_RW, .accessfn = gicv3_irq_access,
-      .readfn = icc_ap_read,
-      .writefn = icc_ap_write,
-    },
     { .name = "ICC_DIR_EL1", .state = ARM_CP_STATE_BOTH,
       .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 11, .opc2 = 1,
       .type = ARM_CP_IO | ARM_CP_NO_RAW,
@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo gicv3_cpuif_reginfo[] = {
     },
 };
 
+static const ARMCPRegInfo gicv3_cpuif_icc_apxr1_reginfo[] = {
+    { .name = "ICC_AP0R1_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 5,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+    { .name = "ICC_AP1R1_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 1,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_irq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+};
+
+static const ARMCPRegInfo gicv3_cpuif_icc_apxr23_reginfo[] = {
+    { .name = "ICC_AP0R2_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 6,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+    { .name = "ICC_AP0R3_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 8, .opc2 = 7,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_fiq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+    { .name = "ICC_AP1R2_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 2,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_irq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+    { .name = "ICC_AP1R3_EL1", .state = ARM_CP_STATE_BOTH,
+      .opc0 = 3, .opc1 = 0, .crn = 12, .crm = 9, .opc2 = 3,
+      .type = ARM_CP_IO | ARM_CP_NO_RAW,
+      .access = PL1_RW, .accessfn = gicv3_irq_access,
+      .readfn = icc_ap_read,
+      .writefn = icc_ap_write,
+    },
+};
+
 static uint64_t ich_ap_read(CPUARMState *env, const ARMCPRegInfo *ri)
 {
     GICv3CPUState *cs = icc_cs_from_env(env);
@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
          * get back to the GICv3CPUState from the CPUARMState.
          */
         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
+
+        /*
+         * For the moment, retain the existing behaviour of 8 priority bits;
+         * in a following commit we will take this from the CPU state,
+         * as we do for the virtual priority bits.
+         */
+        cs->pribits = 8;
+        /*
+         * The GICv3 has separate ID register fields for virtual priority
+         * and preemption bit values, but only a single ID register field
+         * for the physical priority bits. The preemption bit count is
+         * always the same as the priority bit count, except that 8 bits
+         * of priority means 7 preemption bits. We precalculate the
+         * preemption bits because it simplifies the code and makes the
+         * parallels between the virtual and physical bits of the GIC
+         * a bit clearer.
+         */
+        cs->prebits = cs->pribits;
+        if (cs->prebits == 8) {
+            cs->prebits--;
+        }
+        /*
+         * Check that CPU code defining pribits didn't violate
+         * architectural constraints our implementation relies on.
+         */
+        g_assert(cs->pribits >= 4 && cs->pribits <= 8);
+
+        /*
+         * gicv3_cpuif_reginfo[] defines ICC_AP*R0_EL1; add definitions
+         * for ICC_AP*R{1,2,3}_EL1 if the prebits value requires them.
+         */
+        if (cs->prebits >= 6) {
+            define_arm_cp_regs(cpu, gicv3_cpuif_icc_apxr1_reginfo);
+        }
+        if (cs->prebits == 7) {
+            define_arm_cp_regs(cpu, gicv3_cpuif_icc_apxr23_reginfo);
+        }
+
         if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
             int j;
 
-- 
2.25.1

Make the GICv3 set its number of bits of physical priority from the
implementation-specific value provided in the CPU state struct, in
the same way we already do for virtual priority bits.  Because this
would be a migration compatibility break, we provide a property
force-8-bit-prio which is enabled for 7.0 and earlier versioned board
models to retain the legacy "always use 8 bits" behaviour.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-6-peter.maydell@linaro.org
Message-id: 20220506162129.2896966-5-peter.maydell@linaro.org
---
 include/hw/intc/arm_gicv3_common.h |  1 +
 target/arm/cpu.h                   |  1 +
 hw/core/machine.c                  |  4 +++-
 hw/intc/arm_gicv3_common.c         |  5 +++++
 hw/intc/arm_gicv3_cpuif.c          | 15 +++++++++++----
 target/arm/cpu64.c                 |  6 ++++++
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/include/hw/intc/arm_gicv3_common.h b/include/hw/intc/arm_gicv3_common.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/intc/arm_gicv3_common.h
+++ b/include/hw/intc/arm_gicv3_common.h
@@ -XXX,XX +XXX,XX @@ struct GICv3State {
     uint32_t revision;
     bool lpi_enable;
     bool security_extn;
+    bool force_8bit_prio;
     bool irq_reset_nonsecure;
     bool gicd_no_migration_shift_bug;
 
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
     int gic_num_lrs; /* number of list registers */
     int gic_vpribits; /* number of virtual priority bits */
     int gic_vprebits; /* number of virtual preemption bits */
+    int gic_pribits; /* number of physical priority bits */
 
     /* Whether the cfgend input is high (i.e. this CPU should reset into
      * big-endian mode).  This setting isn't used directly: instead it modifies
diff --git a/hw/core/machine.c b/hw/core/machine.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/virtio/virtio-pci.h"
 #include "qom/object_interfaces.h"
 
-GlobalProperty hw_compat_7_0[] = {};
+GlobalProperty hw_compat_7_0[] = {
+    { "arm-gicv3-common", "force-8-bit-prio", "on" },
+};
 const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0);
 
 GlobalProperty hw_compat_6_2[] = {
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -XXX,XX +XXX,XX @@ static Property arm_gicv3_common_properties[] = {
     DEFINE_PROP_UINT32("revision", GICv3State, revision, 3),
     DEFINE_PROP_BOOL("has-lpi", GICv3State, lpi_enable, 0),
     DEFINE_PROP_BOOL("has-security-extensions", GICv3State, security_extn, 0),
+    /*
+     * Compatibility property: force 8 bits of physical priority, even
+     * if the CPU being emulated should have fewer.
+     */
+    DEFINE_PROP_BOOL("force-8-bit-prio", GICv3State, force_8bit_prio, 0),
     DEFINE_PROP_ARRAY("redist-region-count", GICv3State, nb_redist_regions,
                       redist_region_count, qdev_prop_uint32, uint32_t),
     DEFINE_PROP_LINK("sysmem", GICv3State, dma, TYPE_MEMORY_REGION,
diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
          *  cpu->gic_num_lrs
          *  cpu->gic_vpribits
          *  cpu->gic_vprebits
+         *  cpu->gic_pribits
          */
 
         /* Note that we can't just use the GICv3CPUState as an opaque pointer
@@ -XXX,XX +XXX,XX @@ void gicv3_init_cpuif(GICv3State *s)
         define_arm_cp_regs(cpu, gicv3_cpuif_reginfo);
 
         /*
-         * For the moment, retain the existing behaviour of 8 priority bits;
-         * in a following commit we will take this from the CPU state,
-         * as we do for the virtual priority bits.
+         * The CPU implementation specifies the number of supported
+         * bits of physical priority. For backwards compatibility
+         * of migration, we have a compat property that forces use
+         * of 8 priority bits regardless of what the CPU really has.
          */
-        cs->pribits = 8;
+        if (s->force_8bit_prio) {
+            cs->pribits = 8;
+        } else {
+            cs->pribits = cpu->gic_pribits ?: 5;
+        }
+
         /*
          * The GICv3 has separate ID register fields for virtual priority
          * and preemption bit values, but only a single ID register field
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -XXX,XX +XXX,XX @@ static void aarch64_a57_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
     define_cortex_a72_a57_a53_cp_reginfo(cpu);
 }
 
@@ -XXX,XX +XXX,XX @@ static void aarch64_a53_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
     define_cortex_a72_a57_a53_cp_reginfo(cpu);
 }
 
@@ -XXX,XX +XXX,XX @@ static void aarch64_a72_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
     define_cortex_a72_a57_a53_cp_reginfo(cpu);
 }
 
@@ -XXX,XX +XXX,XX @@ static void aarch64_a76_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
 
     /* From B5.1 AdvSIMD AArch64 register summary */
     cpu->isar.mvfr0 = 0x10110222;
@@ -XXX,XX +XXX,XX @@ static void aarch64_neoverse_n1_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
 
     /* From B5.1 AdvSIMD AArch64 register summary */
     cpu->isar.mvfr0 = 0x10110222;
@@ -XXX,XX +XXX,XX @@ static void aarch64_a64fx_initfn(Object *obj)
     cpu->gic_num_lrs = 4;
     cpu->gic_vpribits = 5;
     cpu->gic_vprebits = 5;
+    cpu->gic_pribits = 5;
 
     /* Suppport of A64FX's vector length are 128,256 and 512bit only */
     aarch64_add_sve_properties(obj);
-- 
2.25.1

We previously open-coded the expression for the number of virtual APR
registers and the assertion that it was not going to cause us to
overflow the cs->ich_apr[] array.  Factor this out into a new
ich_num_aprs() function, for consistency with the icc_num_aprs()
function we just added for the physical APR handling.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220512151457.3899052-7-peter.maydell@linaro.org
Message-id: 20220506162129.2896966-6-peter.maydell@linaro.org
---
 hw/intc/arm_gicv3_cpuif.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/hw/intc/arm_gicv3_cpuif.c b/hw/intc/arm_gicv3_cpuif.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/intc/arm_gicv3_cpuif.c
+++ b/hw/intc/arm_gicv3_cpuif.c
@@ -XXX,XX +XXX,XX @@ static inline int icv_min_vbpr(GICv3CPUState *cs)
     return 7 - cs->vprebits;
 }
 
+static inline int ich_num_aprs(GICv3CPUState *cs)
+{
+    /* Return the number of virtual APR registers (1, 2, or 4) */
+    int aprmax = 1 << (cs->vprebits - 5);
+    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
+    return aprmax;
+}
+
 /* Simple accessor functions for LR fields */
 static uint32_t ich_lr_vintid(uint64_t lr)
 {
@@ -XXX,XX +XXX,XX @@ static int ich_highest_active_virt_prio(GICv3CPUState *cs)
      * in the ICH Active Priority Registers.
      */
     int i;
-    int aprmax = 1 << (cs->vprebits - 5);
-
-    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
+    int aprmax = ich_num_aprs(cs);
 
     for (i = 0; i < aprmax; i++) {
         uint32_t apr = cs->ich_apr[GICV3_G0][i] |
@@ -XXX,XX +XXX,XX @@ static int icv_drop_prio(GICv3CPUState *cs)
      * 32 bits are actually relevant.
      */
     int i;
-    int aprmax = 1 << (cs->vprebits - 5);
-
-    assert(aprmax <= ARRAY_SIZE(cs->ich_apr[0]));
+    int aprmax = ich_num_aprs(cs);
 
     for (i = 0; i < aprmax; i++) {
         uint64_t *papr0 = &cs->ich_apr[GICV3_G0][i];
-- 
2.25.1

From: Chris Howard <cvz185@web.de>

Give all the debug registers their correct names including the
index, rather than having multiple registers all with the
same name string, which is confusing when viewed over the
gdbstub interface.

Signed-off-by: CHRIS HOWARD <cvz185@web.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 4127D8CA-D54A-47C7-A039-0DB7361E30C0@web.de
[PMM: expanded commit message]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/helper.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
     }
 
     for (i = 0; i < brps; i++) {
+        char *dbgbvr_el1_name = g_strdup_printf("DBGBVR%d_EL1", i);
+        char *dbgbcr_el1_name = g_strdup_printf("DBGBCR%d_EL1", i);
         ARMCPRegInfo dbgregs[] = {
-            { .name = "DBGBVR", .state = ARM_CP_STATE_BOTH,
+            { .name = dbgbvr_el1_name, .state = ARM_CP_STATE_BOTH,
               .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 4,
               .access = PL1_RW, .accessfn = access_tda,
               .fieldoffset = offsetof(CPUARMState, cp15.dbgbvr[i]),
               .writefn = dbgbvr_write, .raw_writefn = raw_write
             },
-            { .name = "DBGBCR", .state = ARM_CP_STATE_BOTH,
+            { .name = dbgbcr_el1_name, .state = ARM_CP_STATE_BOTH,
               .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 5,
               .access = PL1_RW, .accessfn = access_tda,
               .fieldoffset = offsetof(CPUARMState, cp15.dbgbcr[i]),
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
             },
         };
         define_arm_cp_regs(cpu, dbgregs);
+        g_free(dbgbvr_el1_name);
+        g_free(dbgbcr_el1_name);
     }
 
     for (i = 0; i < wrps; i++) {
+        char *dbgwvr_el1_name = g_strdup_printf("DBGWVR%d_EL1", i);
+        char *dbgwcr_el1_name = g_strdup_printf("DBGWCR%d_EL1", i);
         ARMCPRegInfo dbgregs[] = {
-            { .name = "DBGWVR", .state = ARM_CP_STATE_BOTH,
+            { .name = dbgwvr_el1_name, .state = ARM_CP_STATE_BOTH,
               .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 6,
               .access = PL1_RW, .accessfn = access_tda,
               .fieldoffset = offsetof(CPUARMState, cp15.dbgwvr[i]),
               .writefn = dbgwvr_write, .raw_writefn = raw_write
             },
-            { .name = "DBGWCR", .state = ARM_CP_STATE_BOTH,
+            { .name = dbgwcr_el1_name, .state = ARM_CP_STATE_BOTH,
               .cp = 14, .opc0 = 2, .opc1 = 0, .crn = 0, .crm = i, .opc2 = 7,
               .access = PL1_RW, .accessfn = access_tda,
               .fieldoffset = offsetof(CPUARMState, cp15.dbgwcr[i]),
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
             },
         };
         define_arm_cp_regs(cpu, dbgregs);
+        g_free(dbgwvr_el1_name);
+        g_free(dbgwcr_el1_name);
     }
 }
 
-- 
2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Except hw/core/irq.c which implements the forward-declared opaque
qemu_irq structure, hw/adc/zynq-xadc.{c,h} are the only files not
using the typedef. Fix this single exception.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Bernhard Beschow <shentey@gmail.com>
Message-id: 20220509202035.50335-1-philippe.mathieu.daude@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 include/hw/adc/zynq-xadc.h | 3 +--
 hw/adc/zynq-xadc.c         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/hw/adc/zynq-xadc.h b/include/hw/adc/zynq-xadc.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/adc/zynq-xadc.h
+++ b/include/hw/adc/zynq-xadc.h
@@ -XXX,XX +XXX,XX @@ struct ZynqXADCState {
     uint16_t xadc_dfifo[ZYNQ_XADC_FIFO_DEPTH];
     uint16_t xadc_dfifo_entries;
 
-    struct IRQState *qemu_irq;
-
+    qemu_irq irq;
 };
 
 #endif /* ZYNQ_XADC_H */
diff --git a/hw/adc/zynq-xadc.c b/hw/adc/zynq-xadc.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/adc/zynq-xadc.c
+++ b/hw/adc/zynq-xadc.c
@@ -XXX,XX +XXX,XX @@ static void zynq_xadc_update_ints(ZynqXADCState *s)
         s->regs[INT_STS] |= INT_DFIFO_GTH;
     }
 
-    qemu_set_irq(s->qemu_irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK]));
+    qemu_set_irq(s->irq, !!(s->regs[INT_STS] & ~s->regs[INT_MASK]));
 }
 
 static void zynq_xadc_reset(DeviceState *d)
@@ -XXX,XX +XXX,XX @@ static void zynq_xadc_init(Object *obj)
     memory_region_init_io(&s->iomem, obj, &xadc_ops, s, "zynq-xadc",
                           ZYNQ_XADC_MMIO_SIZE);
     sysbus_init_mmio(sbd, &s->iomem);
-    sysbus_init_irq(sbd, &s->qemu_irq);
+    sysbus_init_irq(sbd, &s->irq);
 }
 
 static const VMStateDescription vmstate_zynq_xadc = {
-- 
2.25.1

In commit 88ce6c6ee85d we switched from directly fishing the number
of breakpoints and watchpoints out of the ID register fields to
abstracting out functions to do this job, but we forgot to delete the
now-obsolete comment in define_debug_regs() about the relation
between the ID field value and the actual number of breakpoints and
watchpoints.  Delete the obsolete comment.

Reported-by: CHRIS HOWARD <cvz185@web.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220513131801.4082712-1-peter.maydell@linaro.org
---
 target/arm/helper.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void define_debug_regs(ARMCPU *cpu)
         define_one_arm_cp_reg(cpu, &dbgdidr);
     }
 
-    /* Note that all these register fields hold "number of Xs minus 1". */
     brps = arm_num_brps(cpu);
     wrps = arm_num_wrps(cpu);
     ctx_cmps = arm_num_ctx_cmps(cpu);
-- 
2.25.1

Currently we give all the v7-and-up CPUs a PMU with 4 counters.  This
means that we don't provide the 6 counters that are required by the
Arm BSA (Base System Architecture) specification if the CPU supports
the Virtualization extensions.

Instead of having a single PMCR_NUM_COUNTERS, make each CPU type
specify the PMCR reset value (obtained from the appropriate TRM), and
use the 'N' field of that value to define the number of counters
provided.

This means that we now supply 6 counters instead of 4 for:
 Cortex-A9, Cortex-A15, Cortex-A53, Cortex-A57, Cortex-A72,
 Cortex-A76, Neoverse-N1, '-cpu max'
This CPU goes from 4 to 8 counters:
 A64FX
These CPUs remain with 4 counters:
 Cortex-A7, Cortex-A8
This CPU goes down from 4 to 3 counters:
 Cortex-R5

Note that because we now use the PMCR reset value of the specific
implementation, we no longer set the LC bit out of reset.  This has
an UNKNOWN value out of reset for all cores with any AArch32 support,
so guest software should be setting it anyway if it wants it.

This change was originally landed in commit f7fb73b8cdd3f7 (during
the 6.0 release cycle) but was then reverted by commit
21c2dd77a6aa517 before that release because it did not work with KVM.
This version fixes that by creating the scratch vCPU in
kvm_arm_get_host_cpu_features() with the KVM_ARM_VCPU_PMU_V3 feature
if KVM supports it, and then only asking KVM for the PMCR_EL0 value
if the vCPU has a PMU.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[PMM: Added the correct value for a64fx]
Message-id: 20220513122852.4063586-1-peter.maydell@linaro.org
---
 target/arm/cpu.h       |  1 +
 target/arm/internals.h |  4 +++-
 target/arm/cpu64.c     | 11 +++++++++++
 target/arm/cpu_tcg.c   |  6 ++++++
 target/arm/helper.c    | 25 ++++++++++++++-----------
 target/arm/kvm64.c     | 12 ++++++++++++
 6 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ struct ArchCPU {
         uint64_t id_aa64dfr0;
         uint64_t id_aa64dfr1;
         uint64_t id_aa64zfr0;
+        uint64_t reset_pmcr_el0;
     } isar;
     uint64_t midr;
     uint32_t revidr;
diff --git a/target/arm/internals.h b/target/arm/internals.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -XXX,XX +XXX,XX @@ enum MVEECIState {
 
 static inline uint32_t pmu_num_counters(CPUARMState *env)
 {
-  return (env->cp15.c9_pmcr & PMCRN_MASK) >> PMCRN_SHIFT;
+    ARMCPU *cpu = env_archcpu(env);
+
+    return (cpu->isar.reset_pmcr_el0 & PMCRN_MASK) >> PMCRN_SHIFT;
 }
 
 /* Bits allowed to be set/cleared for PMCNTEN* and PMINTEN* */
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -XXX,XX +XXX,XX @@ static void aarch64_a57_initfn(Object *obj)
     cpu->isar.id_aa64isar0 = 0x00011120;
     cpu->isar.id_aa64mmfr0 = 0x00001124;
     cpu->isar.dbgdidr = 0x3516d000;
+    cpu->isar.reset_pmcr_el0 = 0x41013000;
     cpu->clidr = 0x0a200023;
     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
@@ -XXX,XX +XXX,XX @@ static void aarch64_a53_initfn(Object *obj)
     cpu->isar.id_aa64isar0 = 0x00011120;
     cpu->isar.id_aa64mmfr0 = 0x00001122; /* 40 bit physical addr */
     cpu->isar.dbgdidr = 0x3516d000;
+    cpu->isar.reset_pmcr_el0 = 0x41033000;
     cpu->clidr = 0x0a200023;
     cpu->ccsidr[0] = 0x700fe01a; /* 32KB L1 dcache */
     cpu->ccsidr[1] = 0x201fe00a; /* 32KB L1 icache */
@@ -XXX,XX +XXX,XX @@ static void aarch64_a72_initfn(Object *obj)
     cpu->isar.id_aa64isar0 = 0x00011120;
     cpu->isar.id_aa64mmfr0 = 0x00001124;
     cpu->isar.dbgdidr = 0x3516d000;
+    cpu->isar.reset_pmcr_el0 = 0x41023000;
     cpu->clidr = 0x0a200023;
     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
@@ -XXX,XX +XXX,XX @@ static void aarch64_a76_initfn(Object *obj)
     cpu->isar.mvfr0 = 0x10110222;
     cpu->isar.mvfr1 = 0x13211111;
     cpu->isar.mvfr2 = 0x00000043;
+
+    /* From D5.1 AArch64 PMU register summary */
+    cpu->isar.reset_pmcr_el0 = 0x410b3000;
 }
 
 static void aarch64_neoverse_n1_initfn(Object *obj)
@@ -XXX,XX +XXX,XX @@ static void aarch64_neoverse_n1_initfn(Object *obj)
     cpu->isar.mvfr0 = 0x10110222;
     cpu->isar.mvfr1 = 0x13211111;
     cpu->isar.mvfr2 = 0x00000043;
+
+    /* From D5.1 AArch64 PMU register summary */
+    cpu->isar.reset_pmcr_el0 = 0x410c3000;
 }
 
 void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
@@ -XXX,XX +XXX,XX @@ static void aarch64_a64fx_initfn(Object *obj)
     set_bit(1, cpu->sve_vq_supported); /* 256bit */
     set_bit(3, cpu->sve_vq_supported); /* 512bit */
 
+    cpu->isar.reset_pmcr_el0 = 0x46014040;
+
     /* TODO:  Add A64FX specific HPC extension registers */
 }
 
diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu_tcg.c
+++ b/target/arm/cpu_tcg.c
@@ -XXX,XX +XXX,XX @@ static void cortex_a8_initfn(Object *obj)
     cpu->ccsidr[1] = 0x2007e01a; /* 16k L1 icache. */
     cpu->ccsidr[2] = 0xf0000000; /* No L2 icache. */
     cpu->reset_auxcr = 2;
+    cpu->isar.reset_pmcr_el0 = 0x41002000;
     define_arm_cp_regs(cpu, cortexa8_cp_reginfo);
 }
 
@@ -XXX,XX +XXX,XX @@ static void cortex_a9_initfn(Object *obj)
     cpu->clidr = (1 << 27) | (1 << 24) | 3;
     cpu->ccsidr[0] = 0xe00fe019; /* 16k L1 dcache. */
     cpu->ccsidr[1] = 0x200fe019; /* 16k L1 icache. */
+    cpu->isar.reset_pmcr_el0 = 0x41093000;
     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);
 }
 
@@ -XXX,XX +XXX,XX @@ static void cortex_a7_initfn(Object *obj)
     cpu->ccsidr[0] = 0x701fe00a; /* 32K L1 dcache */
     cpu->ccsidr[1] = 0x201fe00a; /* 32K L1 icache */
     cpu->ccsidr[2] = 0x711fe07a; /* 4096K L2 unified cache */
+    cpu->isar.reset_pmcr_el0 = 0x41072000;
     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */
 }
 
@@ -XXX,XX +XXX,XX @@ static void cortex_a15_initfn(Object *obj)
     cpu->ccsidr[0] = 0x701fe00a; /* 32K L1 dcache */
     cpu->ccsidr[1] = 0x201fe00a; /* 32K L1 icache */
     cpu->ccsidr[2] = 0x711fe07a; /* 4096K L2 unified cache */
+    cpu->isar.reset_pmcr_el0 = 0x410F3000;
     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);
 }
 
@@ -XXX,XX +XXX,XX @@ static void cortex_r5_initfn(Object *obj)
     cpu->isar.id_isar6 = 0x0;
     cpu->mp_is_up = true;
     cpu->pmsav7_dregion = 16;
+    cpu->isar.reset_pmcr_el0 = 0x41151800;
     define_arm_cp_regs(cpu, cortexr5_cp_reginfo);
 }
 
@@ -XXX,XX +XXX,XX @@ static void arm_max_initfn(Object *obj)
     cpu->isar.id_isar5 = 0x00011121;
     cpu->isar.id_isar6 = 0;
     cpu->isar.dbgdidr = 0x3516d000;
+    cpu->isar.reset_pmcr_el0 = 0x41013000;
     cpu->clidr = 0x0a200023;
     cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */
     cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@
 #include "cpregs.h"
 
 #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */
-#define PMCR_NUM_COUNTERS 4 /* QEMU IMPDEF choice */
 
 #ifndef CONFIG_USER_ONLY
 
@@ -XXX,XX +XXX,XX @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
       .resetvalue = 0,
       .writefn = gt_hyp_ctl_write, .raw_writefn = raw_write },
 #endif
-    /* The only field of MDCR_EL2 that has a defined architectural reset value
-     * is MDCR_EL2.HPMN which should reset to the value of PMCR_EL0.N.
-     */
-    { .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH,
-      .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1,
-      .access = PL2_RW, .resetvalue = PMCR_NUM_COUNTERS,
-      .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2), },
     { .name = "HPFAR", .state = ARM_CP_STATE_AA32,
       .cp = 15, .opc1 = 4, .crn = 6, .crm = 0, .opc2 = 4,
       .access = PL2_RW, .accessfn = access_el3_aa32ns,
@@ -XXX,XX +XXX,XX @@ static void define_pmu_regs(ARMCPU *cpu)
      * field as main ID register, and we implement four counters in
      * addition to the cycle count register.
      */
-    unsigned int i, pmcrn = PMCR_NUM_COUNTERS;
+    unsigned int i, pmcrn = pmu_num_counters(&cpu->env);
     ARMCPRegInfo pmcr = {
         .name = "PMCR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 0,
         .access = PL0_RW,
@@ -XXX,XX +XXX,XX @@ static void define_pmu_regs(ARMCPU *cpu)
         .access = PL0_RW, .accessfn = pmreg_access,
         .type = ARM_CP_IO,
         .fieldoffset = offsetof(CPUARMState, cp15.c9_pmcr),
-        .resetvalue = (cpu->midr & 0xff000000) | (pmcrn << PMCRN_SHIFT) |
-                      PMCRLC,
+        .resetvalue = cpu->isar.reset_pmcr_el0,
         .writefn = pmcr_write, .raw_writefn = raw_write,
     };
+
     define_one_arm_cp_reg(cpu, &pmcr);
     define_one_arm_cp_reg(cpu, &pmcr64);
     for (i = 0; i < pmcrn; i++) {
@@ -XXX,XX +XXX,XX @@ void register_cp_regs_for_features(ARMCPU *cpu)
               .type = ARM_CP_EL3_NO_EL2_C_NZ,
               .fieldoffset = offsetof(CPUARMState, cp15.vmpidr_el2) },
         };
+        /*
+         * The only field of MDCR_EL2 that has a defined architectural reset
+         * value is MDCR_EL2.HPMN which should reset to the value of PMCR_EL0.N.
+         */
+        ARMCPRegInfo mdcr_el2 = {
+            .name = "MDCR_EL2", .state = ARM_CP_STATE_BOTH,
+            .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 1,
+            .access = PL2_RW, .resetvalue = pmu_num_counters(env),
+            .fieldoffset = offsetof(CPUARMState, cp15.mdcr_el2),
+        };
+        define_one_arm_cp_reg(cpu, &mdcr_el2);
         define_arm_cp_regs(cpu, vpidr_regs);
         define_arm_cp_regs(cpu, el2_cp_reginfo);
         if (arm_feature(env, ARM_FEATURE_V8)) {
diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/kvm64.c
+++ b/target/arm/kvm64.c
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
      */
     int fdarray[3];
     bool sve_supported;
+    bool pmu_supported = false;
     uint64_t features = 0;
     uint64_t t;
     int err;
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
                              1 << KVM_ARM_VCPU_PTRAUTH_GENERIC);
     }
 
+    if (kvm_arm_pmu_supported()) {
+        init.features[0] |= 1 << KVM_ARM_VCPU_PMU_V3;
+        pmu_supported = true;
+    }
+
     if (!kvm_arm_create_scratch_host_vcpu(cpus_to_try, fdarray, &init)) {
         return false;
     }
@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
             dbgdidr |= (1 << 15); /* RES1 bit */
             ahcf->isar.dbgdidr = dbgdidr;
         }
+
+        if (pmu_supported) {
+            /* PMCR_EL0 is only accessible if the vCPU has feature PMU_V3 */
+            err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0,
+                                  ARM64_SYS_REG(3, 3, 9, 12, 0));
+        }
     }
 
     sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0;
-- 
2.25.1

In the virt board with secure=on we put two nodes in the dtb
for flash devices: one for the secure-only flash, and one
for the non-secure flash. We get the reg properties for these
correct, but in the DT node name, which by convention includes
the base address of devices, we used the wrong address. Fix it.

Spotted by dtc, which will complain
Warning (unique_unit_address): /flash@0: duplicate unit-address (also used in node /secflash@0)
if you dump the dtb from QEMU with -machine dumpdtb=file.dtb
and then decompile it with dtc.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220513131316.4081539-2-peter.maydell@linaro.org
---
 hw/arm/virt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -XXX,XX +XXX,XX @@ static void virt_flash_fdt(VirtMachineState *vms,
         qemu_fdt_setprop_string(ms->fdt, nodename, "secure-status", "okay");
         g_free(nodename);
 
-        nodename = g_strdup_printf("/flash@%" PRIx64, flashbase);
+        nodename = g_strdup_printf("/flash@%" PRIx64, flashbase + flashsize);
         qemu_fdt_add_subnode(ms->fdt, nodename);
         qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "cfi-flash");
         qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg",
-- 
2.25.1

The virt board generates a gpio-keys node in the dtb, but it
incorrectly gives this node #size-cells and #address-cells
properties. If you dump the dtb with 'machine dumpdtb=file.dtb'
and run it through dtc, dtc will warn about this:

Warning (avoid_unnecessary_addr_size): /gpio-keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property

Remove the bogus properties.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220513131316.4081539-3-peter.maydell@linaro.org
---
 hw/arm/virt.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -XXX,XX +XXX,XX @@ static void create_gpio_keys(char *fdt, DeviceState *pl061_dev,
 
     qemu_fdt_add_subnode(fdt, "/gpio-keys");
     qemu_fdt_setprop_string(fdt, "/gpio-keys", "compatible", "gpio-keys");
-    qemu_fdt_setprop_cell(fdt, "/gpio-keys", "#size-cells", 0);
-    qemu_fdt_setprop_cell(fdt, "/gpio-keys", "#address-cells", 1);
 
     qemu_fdt_add_subnode(fdt, "/gpio-keys/poweroff");
     qemu_fdt_setprop_string(fdt, "/gpio-keys/poweroff",
-- 
2.25.1

The traditional ptimer behaviour includes a collection of weird edge
case behaviours.  In 2016 we improved the ptimer implementation to
fix these and generally make the behaviour more flexible, with
ptimers opting in to the new behaviour by passing an appropriate set
of policy flags to ptimer_init().  For backwards-compatibility, we
defined PTIMER_POLICY_DEFAULT (which sets no flags) to give the old
weird behaviour.

This turns out to be a poor choice of name, because people writing
new devices which use ptimers are misled into thinking that the
default is probably a sensible choice of flags, when in fact it is
almost always not what you want.  Rename PTIMER_POLICY_DEFAULT to
PTIMER_POLICY_LEGACY and beef up the comment to more clearly say that
new devices should not be using it.

The code-change part of this commit was produced by
  sed -i -e 's/PTIMER_POLICY_DEFAULT/PTIMER_POLICY_LEGACY/g' $(git grep -l PTIMER_POLICY_DEFAULT)
with the exception of a test name string change in
tests/unit/ptimer-test.c which was added manually.

diff --git a/include/hw/ptimer.h b/include/hw/ptimer.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/ptimer.h
+++ b/include/hw/ptimer.h
@@ -XXX,XX +XXX,XX @@
  * to stderr when the guest attempts to enable the timer.
  */
 
-/* The default ptimer policy retains backward compatibility with the legacy
- * timers. Custom policies are adjusting the default one. Consider providing
- * a correct policy for your timer.
+/*
+ * The 'legacy' ptimer policy retains backward compatibility with the
+ * traditional ptimer behaviour from before policy flags were introduced.
+ * It has several weird behaviours which don't match typical hardware
+ * timer behaviour. For a new device using ptimers, you should not
+ * use PTIMER_POLICY_LEGACY, but instead check the actual behaviour
+ * that you need and specify the right set of policy flags to get that.
+ *
+ * If you are overhauling an existing device that uses PTIMER_POLICY_LEGACY
+ * and are in a position to check or test the real hardware behaviour,
+ * consider updating it to specify the right policy flags.
  *
  * The rough edges of the default policy:
  *  - Starting to run with a period = 0 emits error message and stops the
@@ -XXX,XX +XXX,XX @@
  *    since the last period, effectively restarting the timer with a
  *    counter = counter value at the moment of change (.i.e. one less).
  */
-#define PTIMER_POLICY_DEFAULT               0
+#define PTIMER_POLICY_LEGACY                0
 
 /* Periodic timer counter stays with "0" for a one period before wrapping
  * around.  */
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -XXX,XX +XXX,XX @@ static void mv88w8618_timer_init(SysBusDevice *dev, mv88w8618_timer_state *s,
     sysbus_init_irq(dev, &s->irq);
     s->freq = freq;
 
-    s->ptimer = ptimer_init(mv88w8618_timer_tick, s, PTIMER_POLICY_DEFAULT);
+    s->ptimer = ptimer_init(mv88w8618_timer_tick, s, PTIMER_POLICY_LEGACY);
 }
 
 static uint64_t mv88w8618_pit_read(void *opaque, hwaddr offset,
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -XXX,XX +XXX,XX @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp)
 
         st->dma = s;
         st->nr = i;
-        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_DEFAULT);
+        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_LEGACY);
         ptimer_transaction_begin(st->ptimer);
         ptimer_set_freq(st->ptimer, s->freqhz);
         ptimer_transaction_commit(st->ptimer);
diff --git a/hw/dma/xlnx_csu_dma.c b/hw/dma/xlnx_csu_dma.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/dma/xlnx_csu_dma.c
+++ b/hw/dma/xlnx_csu_dma.c
@@ -XXX,XX +XXX,XX @@ static void xlnx_csu_dma_realize(DeviceState *dev, Error **errp)
     sysbus_init_irq(SYS_BUS_DEVICE(dev), &s->irq);
 
     s->src_timer = ptimer_init(xlnx_csu_dma_src_timeout_hit,
-                               s, PTIMER_POLICY_DEFAULT);
+                               s, PTIMER_POLICY_LEGACY);
 
     s->attr = MEMTXATTRS_UNSPECIFIED;
 
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -XXX,XX +XXX,XX @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq)
     m5206_timer_state *s;
 
     s = g_new0(m5206_timer_state, 1);
-    s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_DEFAULT);
+    s->timer = ptimer_init(m5206_timer_trigger, s, PTIMER_POLICY_LEGACY);
     s->irq = irq;
     m5206_timer_reset(s);
     return s;
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -XXX,XX +XXX,XX @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic)
     /* Timers.  */
     for (i = 0; i < 2; i++) {
         s = g_new0(m5208_timer_state, 1);
-        s->timer = ptimer_init(m5208_timer_trigger, s, PTIMER_POLICY_DEFAULT);
+        s->timer = ptimer_init(m5208_timer_trigger, s, PTIMER_POLICY_LEGACY);
         memory_region_init_io(&s->iomem, NULL, &m5208_timer_ops, s,
                               "m5208-timer", 0x00004000);
         memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i,
diff --git a/hw/net/can/xlnx-zynqmp-can.c b/hw/net/can/xlnx-zynqmp-can.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/can/xlnx-zynqmp-can.c
+++ b/hw/net/can/xlnx-zynqmp-can.c
@@ -XXX,XX +XXX,XX @@ static void xlnx_zynqmp_can_realize(DeviceState *dev, Error **errp)
 
     /* Allocate a new timer. */
     s->can_timer = ptimer_init(xlnx_zynqmp_can_ptimer_cb, s,
-                               PTIMER_POLICY_DEFAULT);
+                               PTIMER_POLICY_LEGACY);
 
     ptimer_transaction_begin(s->can_timer);
 
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -XXX,XX +XXX,XX @@ static void etsec_realize(DeviceState *dev, Error **errp)
                               object_get_typename(OBJECT(dev)), dev->id, etsec);
     qemu_format_nic_info_str(qemu_get_queue(etsec->nic), etsec->conf.macaddr.a);
 
-    etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_DEFAULT);
+    etsec->ptimer = ptimer_init(etsec_timer_hit, etsec, PTIMER_POLICY_LEGACY);
     ptimer_transaction_begin(etsec->ptimer);
     ptimer_set_freq(etsec->ptimer, 100);
     ptimer_transaction_commit(etsec->ptimer);
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -XXX,XX +XXX,XX @@ static void lan9118_realize(DeviceState *dev, Error **errp)
     s->pmt_ctrl = 1;
     s->txp = &s->tx_packet;
 
-    s->timer = ptimer_init(lan9118_tick, s, PTIMER_POLICY_DEFAULT);
+    s->timer = ptimer_init(lan9118_tick, s, PTIMER_POLICY_LEGACY);
     ptimer_transaction_begin(s->timer);
     ptimer_set_freq(s->timer, 10000);
     ptimer_set_limit(s->timer, 0xffff, 1);
diff --git a/hw/rtc/exynos4210_rtc.c b/hw/rtc/exynos4210_rtc.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/rtc/exynos4210_rtc.c
+++ b/hw/rtc/exynos4210_rtc.c
@@ -XXX,XX +XXX,XX @@ static void exynos4210_rtc_init(Object *obj)
     Exynos4210RTCState *s = EXYNOS4210_RTC(obj);
     SysBusDevice *dev = SYS_BUS_DEVICE(obj);
 
-    s->ptimer = ptimer_init(exynos4210_rtc_tick, s, PTIMER_POLICY_DEFAULT);
+    s->ptimer = ptimer_init(exynos4210_rtc_tick, s, PTIMER_POLICY_LEGACY);
     ptimer_transaction_begin(s->ptimer);
     ptimer_set_freq(s->ptimer, RTC_BASE_FREQ);
     exynos4210_rtc_update_freq(s, 0);
     ptimer_transaction_commit(s->ptimer);
 
     s->ptimer_1Hz = ptimer_init(exynos4210_rtc_1Hz_tick,
-                                s, PTIMER_POLICY_DEFAULT);
+                                s, PTIMER_POLICY_LEGACY);
     ptimer_transaction_begin(s->ptimer_1Hz);
     ptimer_set_freq(s->ptimer_1Hz, RTC_BASE_FREQ);
     ptimer_transaction_commit(s->ptimer_1Hz);
diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/allwinner-a10-pit.c
+++ b/hw/timer/allwinner-a10-pit.c
@@ -XXX,XX +XXX,XX @@ static void a10_pit_init(Object *obj)
 
         tc->container = s;
         tc->index = i;
-        s->timer[i] = ptimer_init(a10_pit_timer_cb, tc, PTIMER_POLICY_DEFAULT);
+        s->timer[i] = ptimer_init(a10_pit_timer_cb, tc, PTIMER_POLICY_LEGACY);
     }
 }
 
diff --git a/hw/timer/altera_timer.c b/hw/timer/altera_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/altera_timer.c
+++ b/hw/timer/altera_timer.c
@@ -XXX,XX +XXX,XX @@ static void altera_timer_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    t->ptimer = ptimer_init(timer_hit, t, PTIMER_POLICY_DEFAULT);
+    t->ptimer = ptimer_init(timer_hit, t, PTIMER_POLICY_LEGACY);
     ptimer_transaction_begin(t->ptimer);
     ptimer_set_freq(t->ptimer, t->freq_hz);
     ptimer_transaction_commit(t->ptimer);
diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/arm_timer.c
+++ b/hw/timer/arm_timer.c
@@ -XXX,XX +XXX,XX @@ static arm_timer_state *arm_timer_init(uint32_t freq)
     s->freq = freq;
     s->control = TIMER_CTRL_IE;
 
-    s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_DEFAULT);
+    s->timer = ptimer_init(arm_timer_tick, s, PTIMER_POLICY_LEGACY);
     vmstate_register(NULL, VMSTATE_INSTANCE_ID_ANY, &vmstate_arm_timer, s);
     return s;
 }
diff --git a/hw/timer/digic-timer.c b/hw/timer/digic-timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/digic-timer.c
+++ b/hw/timer/digic-timer.c
@@ -XXX,XX +XXX,XX @@ static void digic_timer_init(Object *obj)
 {
     DigicTimerState *s = DIGIC_TIMER(obj);
 
-    s->ptimer = ptimer_init(digic_timer_tick, NULL, PTIMER_POLICY_DEFAULT);
+    s->ptimer = ptimer_init(digic_timer_tick, NULL, PTIMER_POLICY_LEGACY);
 
     /*
      * FIXME: there is no documentation on Digic timer
diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/etraxfs_timer.c
+++ b/hw/timer/etraxfs_timer.c
@@ -XXX,XX +XXX,XX @@ static void etraxfs_timer_realize(DeviceState *dev, Error **errp)
     ETRAXTimerState *t = ETRAX_TIMER(dev);
     SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
 
-    t->ptimer_t0 = ptimer_init(timer0_hit, t, PTIMER_POLICY_DEFAULT);
-    t->ptimer_t1 = ptimer_init(timer1_hit, t, PTIMER_POLICY_DEFAULT);
-    t->ptimer_wd = ptimer_init(watchdog_hit, t, PTIMER_POLICY_DEFAULT);
+    t->ptimer_t0 = ptimer_init(timer0_hit, t, PTIMER_POLICY_LEGACY);
+    t->ptimer_t1 = ptimer_init(timer1_hit, t, PTIMER_POLICY_LEGACY);
+    t->ptimer_wd = ptimer_init(watchdog_hit, t, PTIMER_POLICY_LEGACY);
 
     sysbus_init_irq(sbd, &t->irq);
     sysbus_init_irq(sbd, &t->nmi);
diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/exynos4210_mct.c
+++ b/hw/timer/exynos4210_mct.c
@@ -XXX,XX +XXX,XX @@ static void exynos4210_mct_init(Object *obj)
 
     /* Global timer */
     s->g_timer.ptimer_frc = ptimer_init(exynos4210_gfrc_event, s,
-                                        PTIMER_POLICY_DEFAULT);
+                                        PTIMER_POLICY_LEGACY);
     memset(&s->g_timer.reg, 0, sizeof(struct gregs));
 
     /* Local timers */
     for (i = 0; i < 2; i++) {
         s->l_timer[i].tick_timer.ptimer_tick =
             ptimer_init(exynos4210_ltick_event, &s->l_timer[i],
-                        PTIMER_POLICY_DEFAULT);
+                        PTIMER_POLICY_LEGACY);
         s->l_timer[i].ptimer_frc =
             ptimer_init(exynos4210_lfrc_event, &s->l_timer[i],
-                        PTIMER_POLICY_DEFAULT);
+                        PTIMER_POLICY_LEGACY);
         s->l_timer[i].id = i;
     }
 
diff --git a/hw/timer/exynos4210_pwm.c b/hw/timer/exynos4210_pwm.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/exynos4210_pwm.c
+++ b/hw/timer/exynos4210_pwm.c
@@ -XXX,XX +XXX,XX @@ static void exynos4210_pwm_init(Object *obj)
         sysbus_init_irq(dev, &s->timer[i].irq);
         s->timer[i].ptimer = ptimer_init(exynos4210_pwm_tick,
                                          &s->timer[i],
-                                         PTIMER_POLICY_DEFAULT);
+                                         PTIMER_POLICY_LEGACY);
         s->timer[i].id = i;
         s->timer[i].parent = s;
     }
diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/grlib_gptimer.c
+++ b/hw/timer/grlib_gptimer.c
@@ -XXX,XX +XXX,XX @@ static void grlib_gptimer_realize(DeviceState *dev, Error **errp)
 
         timer->unit   = unit;
         timer->ptimer = ptimer_init(grlib_gptimer_hit, timer,
-                                    PTIMER_POLICY_DEFAULT);
+                                    PTIMER_POLICY_LEGACY);
         timer->id     = i;
 
         /* One IRQ line for each timer */
diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/imx_epit.c
+++ b/hw/timer/imx_epit.c
@@ -XXX,XX +XXX,XX @@ static void imx_epit_realize(DeviceState *dev, Error **errp)
                           0x00001000);
     sysbus_init_mmio(sbd, &s->iomem);
 
-    s->timer_reload = ptimer_init(imx_epit_reload, s, PTIMER_POLICY_DEFAULT);
+    s->timer_reload = ptimer_init(imx_epit_reload, s, PTIMER_POLICY_LEGACY);
 
-    s->timer_cmp = ptimer_init(imx_epit_cmp, s, PTIMER_POLICY_DEFAULT);
+    s->timer_cmp = ptimer_init(imx_epit_cmp, s, PTIMER_POLICY_LEGACY);
 }
 
 static void imx_epit_class_init(ObjectClass *klass, void *data)
diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/imx_gpt.c
+++ b/hw/timer/imx_gpt.c
@@ -XXX,XX +XXX,XX @@ static void imx_gpt_realize(DeviceState *dev, Error **errp)
                           0x00001000);
     sysbus_init_mmio(sbd, &s->iomem);
 
-    s->timer = ptimer_init(imx_gpt_timeout, s, PTIMER_POLICY_DEFAULT);
+    s->timer = ptimer_init(imx_gpt_timeout, s, PTIMER_POLICY_LEGACY);
 }
 
 static void imx_gpt_class_init(ObjectClass *klass, void *data)
diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/mss-timer.c
+++ b/hw/timer/mss-timer.c
@@ -XXX,XX +XXX,XX @@ static void mss_timer_init(Object *obj)
     for (i = 0; i < NUM_TIMERS; i++) {
         struct Msf2Timer *st = &t->timers[i];
 
-        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_DEFAULT);
+        st->ptimer = ptimer_init(timer_hit, st, PTIMER_POLICY_LEGACY);
         ptimer_transaction_begin(st->ptimer);
         ptimer_set_freq(st->ptimer, t->freq_hz);
         ptimer_transaction_commit(st->ptimer);
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -XXX,XX +XXX,XX @@ static void *sh_timer_init(uint32_t freq, int feat, qemu_irq irq)
     s->enabled = 0;
     s->irq = irq;
 
-    s->timer = ptimer_init(sh_timer_tick, s, PTIMER_POLICY_DEFAULT);
+    s->timer = ptimer_init(sh_timer_tick, s, PTIMER_POLICY_LEGACY);
 
     sh_timer_write(s, OFFSET_TCOR >> 2, s->tcor);
     sh_timer_write(s, OFFSET_TCNT >> 2, s->tcnt);
diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/slavio_timer.c
+++ b/hw/timer/slavio_timer.c
@@ -XXX,XX +XXX,XX @@ static void slavio_timer_init(Object *obj)
         tc->timer_index = i;
 
         s->cputimer[i].timer = ptimer_init(slavio_timer_irq, tc,
-                                           PTIMER_POLICY_DEFAULT);
+                                           PTIMER_POLICY_LEGACY);
         ptimer_transaction_begin(s->cputimer[i].timer);
         ptimer_set_period(s->cputimer[i].timer, TIMER_PERIOD);
         ptimer_transaction_commit(s->cputimer[i].timer);
diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/timer/xilinx_timer.c
+++ b/hw/timer/xilinx_timer.c
@@ -XXX,XX +XXX,XX @@ static void xilinx_timer_realize(DeviceState *dev, Error **errp)
 
         xt->parent = t;
         xt->nr = i;
-        xt->ptimer = ptimer_init(timer_hit, xt, PTIMER_POLICY_DEFAULT);
+        xt->ptimer = ptimer_init(timer_hit, xt, PTIMER_POLICY_LEGACY);
         ptimer_transaction_begin(xt->ptimer);
         ptimer_set_freq(xt->ptimer, t->freq_hz);
         ptimer_transaction_commit(xt->ptimer);
diff --git a/tests/unit/ptimer-test.c b/tests/unit/ptimer-test.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/ptimer-test.c
+++ b/tests/unit/ptimer-test.c
@@ -XXX,XX +XXX,XX @@ static void add_ptimer_tests(uint8_t policy)
     char policy_name[256] = "";
     char *tmp;
 
-    if (policy == PTIMER_POLICY_DEFAULT) {
-        g_sprintf(policy_name, "default");
+    if (policy == PTIMER_POLICY_LEGACY) {
+        g_sprintf(policy_name, "legacy");
     }
 
     if (policy & PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD) {
@@ -XXX,XX +XXX,XX @@ static void add_ptimer_tests(uint8_t policy)
 static void add_all_ptimer_policies_comb_tests(void)
 {
     int last_policy = PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT;
-    int policy = PTIMER_POLICY_DEFAULT;
+    int policy = PTIMER_POLICY_LEGACY;
 
     for (; policy < (last_policy << 1); policy++) {
         if ((policy & PTIMER_POLICY_TRIGGER_ONLY_ON_DECREMENT) &&
-- 
2.25.1

From: Florian Lugou <florian.lugou@provenrun.com>

As per the description of the HCR_EL2.APK field in the ARMv8 ARM,
Pointer Authentication keys accesses should only be trapped to Secure
EL2 if it is enabled.

Signed-off-by: Florian Lugou <florian.lugou@provenrun.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220517145242.1215271-1-florian.lugou@provenrun.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static CPAccessResult access_pauth(CPUARMState *env, const ARMCPRegInfo *ri,
     int el = arm_current_el(env);
 
     if (el < 2 &&
-        arm_feature(env, ARM_FEATURE_EL2) &&
+        arm_is_el2_enabled(env) &&
         !(arm_hcr_el2_eff(env) & HCR_APK)) {
         return CP_ACCESS_TRAP_EL2;
     }
-- 
2.25.1

From: Richard Henderson <richard.henderson@linaro.org>

This feature adds a new register, HCRX_EL2, which controls
many of the newer AArch64 features.  So far the register is
effectively RES0, because none of the new features are done.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220517054850.177016-2-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/cpu.h    | 20 ++++++++++++++++++
 target/arm/cpu64.c  |  1 +
 target/arm/helper.c | 50 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ typedef struct CPUArchState {
         uint32_t pmsav5_data_ap; /* PMSAv5 MPU data access permissions */
         uint32_t pmsav5_insn_ap; /* PMSAv5 MPU insn access permissions */
         uint64_t hcr_el2; /* Hypervisor configuration register */
+        uint64_t hcrx_el2; /* Extended Hypervisor configuration register */
         uint64_t scr_el3; /* Secure configuration register.  */
         union { /* Fault status registers.  */
             struct {
@@ -XXX,XX +XXX,XX @@ static inline void xpsr_write(CPUARMState *env, uint32_t val, uint32_t mask)
 #define HCR_TWEDEN    (1ULL << 59)
 #define HCR_TWEDEL    MAKE_64BIT_MASK(60, 4)
 
+#define HCRX_ENAS0    (1ULL << 0)
+#define HCRX_ENALS    (1ULL << 1)
+#define HCRX_ENASR    (1ULL << 2)
+#define HCRX_FNXS     (1ULL << 3)
+#define HCRX_FGTNXS   (1ULL << 4)
+#define HCRX_SMPME    (1ULL << 5)
+#define HCRX_TALLINT  (1ULL << 6)
+#define HCRX_VINMI    (1ULL << 7)
+#define HCRX_VFNMI    (1ULL << 8)
+#define HCRX_CMOW     (1ULL << 9)
+#define HCRX_MCE2     (1ULL << 10)
+#define HCRX_MSCEN    (1ULL << 11)
+
 #define HPFAR_NS      (1ULL << 63)
 
 #define SCR_NS                (1U << 0)
@@ -XXX,XX +XXX,XX @@ static inline bool arm_is_el2_enabled(CPUARMState *env)
  * Not included here is HCR_RW.
  */
 uint64_t arm_hcr_el2_eff(CPUARMState *env);
+uint64_t arm_hcrx_el2_eff(CPUARMState *env);
 
 /* Return true if the specified exception level is running in AArch64 state. */
 static inline bool arm_el_is_aa64(CPUARMState *env, int el)
@@ -XXX,XX +XXX,XX @@ static inline bool isar_feature_aa64_ats1e1(const ARMISARegisters *id)
     return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, PAN) >= 2;
 }
 
+static inline bool isar_feature_aa64_hcx(const ARMISARegisters *id)
+{
+    return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, HCX) != 0;
+}
+
 static inline bool isar_feature_aa64_uao(const ARMISARegisters *id)
 {
     return FIELD_EX64(id->id_aa64mmfr2, ID_AA64MMFR2, UAO) != 0;
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -XXX,XX +XXX,XX @@ static void aarch64_max_initfn(Object *obj)
     t = FIELD_DP64(t, ID_AA64MMFR1, LO, 1);       /* FEAT_LOR */
     t = FIELD_DP64(t, ID_AA64MMFR1, PAN, 2);      /* FEAT_PAN2 */
     t = FIELD_DP64(t, ID_AA64MMFR1, XNX, 1);      /* FEAT_XNX */
+    t = FIELD_DP64(t, ID_AA64MMFR1, HCX, 1);      /* FEAT_HCX */
     cpu->isar.id_aa64mmfr1 = t;
 
     t = cpu->isar.id_aa64mmfr2;
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ uint64_t arm_hcr_el2_eff(CPUARMState *env)
     return ret;
 }
 
+static void hcrx_write(CPUARMState *env, const ARMCPRegInfo *ri,
+                       uint64_t value)
+{
+    uint64_t valid_mask = 0;
+
+    /* No features adding bits to HCRX are implemented. */
+
+    /* Clear RES0 bits.  */
+    env->cp15.hcrx_el2 = value & valid_mask;
+}
+
+static CPAccessResult access_hxen(CPUARMState *env, const ARMCPRegInfo *ri,
+                                  bool isread)
+{
+    if (arm_current_el(env) < 3
+        && arm_feature(env, ARM_FEATURE_EL3)
+        && !(env->cp15.scr_el3 & SCR_HXEN)) {
+        return CP_ACCESS_TRAP_EL3;
+    }
+    return CP_ACCESS_OK;
+}
+
+static const ARMCPRegInfo hcrx_el2_reginfo = {
+    .name = "HCRX_EL2", .state = ARM_CP_STATE_AA64,
+    .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 2, .opc2 = 2,
+    .access = PL2_RW, .writefn = hcrx_write, .accessfn = access_hxen,
+    .fieldoffset = offsetof(CPUARMState, cp15.hcrx_el2),
+};
+
+/* Return the effective value of HCRX_EL2.  */
+uint64_t arm_hcrx_el2_eff(CPUARMState *env)
+{
+    /*
+     * The bits in this register behave as 0 for all purposes other than
+     * direct reads of the register if:
+     *   - EL2 is not enabled in the current security state,
+     *   - SCR_EL3.HXEn is 0.
+     */
+    if (!arm_is_el2_enabled(env)
+        || (arm_feature(env, ARM_FEATURE_EL3)
+            && !(env->cp15.scr_el3 & SCR_HXEN))) {
+        return 0;
+    }
+    return env->cp15.hcrx_el2;
+}
+
 static void cptr_el2_write(CPUARMState *env, const ARMCPRegInfo *ri,
                            uint64_t value)
 {
@@ -XXX,XX +XXX,XX @@ void register_cp_regs_for_features(ARMCPU *cpu)
         define_arm_cp_regs(cpu, zcr_reginfo);
     }
 
+    if (cpu_isar_feature(aa64_hcx, cpu)) {
+        define_one_arm_cp_reg(cpu, &hcrx_el2_reginfo);
+    }
+
 #ifdef TARGET_AARCH64
     if (cpu_isar_feature(aa64_pauth, cpu)) {
         define_arm_cp_regs(cpu, pauth_reginfo);
-- 
2.25.1

From: Richard Henderson <richard.henderson@linaro.org>

We had a few CPTR_* bits defined, but missed quite a few.
Complete all of the fields up to ARMv9.2.
Use FIELD_EX64 instead of manual extract32.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20220517054850.177016-3-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/cpu.h    | 44 +++++++++++++++++++++++++++++++-----
 hw/arm/boot.c       |  2 +-
 target/arm/cpu.c    | 11 ++++++---
 target/arm/helper.c | 54 ++++++++++++++++++++++-----------------------
 4 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -XXX,XX +XXX,XX @@ void pmu_init(ARMCPU *cpu);
 #define SCTLR_SPINTMASK (1ULL << 62) /* FEAT_NMI */
 #define SCTLR_TIDCP   (1ULL << 63) /* FEAT_TIDCP1 */
 
-#define CPTR_TCPAC    (1U << 31)
-#define CPTR_TTA      (1U << 20)
-#define CPTR_TFP      (1U << 10)
-#define CPTR_TZ       (1U << 8)   /* CPTR_EL2 */
-#define CPTR_EZ       (1U << 8)   /* CPTR_EL3 */
+/* Bit definitions for CPACR (AArch32 only) */
+FIELD(CPACR, CP10, 20, 2)
+FIELD(CPACR, CP11, 22, 2)
+FIELD(CPACR, TRCDIS, 28, 1)    /* matches CPACR_EL1.TTA */
+FIELD(CPACR, D32DIS, 30, 1)    /* up to v7; RAZ in v8 */
+FIELD(CPACR, ASEDIS, 31, 1)
+
+/* Bit definitions for CPACR_EL1 (AArch64 only) */
+FIELD(CPACR_EL1, ZEN, 16, 2)
+FIELD(CPACR_EL1, FPEN, 20, 2)
+FIELD(CPACR_EL1, SMEN, 24, 2)
+FIELD(CPACR_EL1, TTA, 28, 1)   /* matches CPACR.TRCDIS */
+
+/* Bit definitions for HCPTR (AArch32 only) */
+FIELD(HCPTR, TCP10, 10, 1)
+FIELD(HCPTR, TCP11, 11, 1)
+FIELD(HCPTR, TASE, 15, 1)
+FIELD(HCPTR, TTA, 20, 1)
+FIELD(HCPTR, TAM, 30, 1)       /* matches CPTR_EL2.TAM */
+FIELD(HCPTR, TCPAC, 31, 1)     /* matches CPTR_EL2.TCPAC */
+
+/* Bit definitions for CPTR_EL2 (AArch64 only) */
+FIELD(CPTR_EL2, TZ, 8, 1)      /* !E2H */
+FIELD(CPTR_EL2, TFP, 10, 1)    /* !E2H, matches HCPTR.TCP10 */
+FIELD(CPTR_EL2, TSM, 12, 1)    /* !E2H */
+FIELD(CPTR_EL2, ZEN, 16, 2)    /* E2H */
+FIELD(CPTR_EL2, FPEN, 20, 2)   /* E2H */
+FIELD(CPTR_EL2, SMEN, 24, 2)   /* E2H */
+FIELD(CPTR_EL2, TTA, 28, 1)
+FIELD(CPTR_EL2, TAM, 30, 1)    /* matches HCPTR.TAM */
+FIELD(CPTR_EL2, TCPAC, 31, 1)  /* matches HCPTR.TCPAC */
+
+/* Bit definitions for CPTR_EL3 (AArch64 only) */
+FIELD(CPTR_EL3, EZ, 8, 1)
+FIELD(CPTR_EL3, TFP, 10, 1)
+FIELD(CPTR_EL3, ESM, 12, 1)
+FIELD(CPTR_EL3, TTA, 20, 1)
+FIELD(CPTR_EL3, TAM, 30, 1)
+FIELD(CPTR_EL3, TCPAC, 31, 1)
 
 #define MDCR_EPMAD    (1U << 21)
 #define MDCR_EDAD     (1U << 20)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -XXX,XX +XXX,XX @@ static void do_cpu_reset(void *opaque)
                         env->cp15.scr_el3 |= SCR_ATA;
                     }
                     if (cpu_isar_feature(aa64_sve, cpu)) {
-                        env->cp15.cptr_el[3] |= CPTR_EZ;
+                        env->cp15.cptr_el[3] |= R_CPTR_EL3_EZ_MASK;
                     }
                     /* AArch64 kernels never boot in secure mode */
                     assert(!info->secure_boot);
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -XXX,XX +XXX,XX @@ static void arm_cpu_reset(DeviceState *dev)
         /* Trap on btype=3 for PACIxSP. */
         env->cp15.sctlr_el[1] |= SCTLR_BT0;
         /* and to the FP/Neon instructions */
-        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 2, 3);
+        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
+                                         CPACR_EL1, FPEN, 3);
         /* and to the SVE instructions */
-        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 16, 2, 3);
+        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
+                                         CPACR_EL1, ZEN, 3);
         /* with reasonable vector length */
         if (cpu_isar_feature(aa64_sve, cpu)) {
             env->vfp.zcr_el[1] =
@@ -XXX,XX +XXX,XX @@ static void arm_cpu_reset(DeviceState *dev)
     } else {
 #if defined(CONFIG_USER_ONLY)
         /* Userspace expects access to cp10 and cp11 for FP/Neon */
-        env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 4, 0xf);
+        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
+                                         CPACR, CP10, 3);
+        env->cp15.cpacr_el1 = FIELD_DP64(env->cp15.cpacr_el1,
+                                         CPACR, CP11, 3);
 #endif
     }
 
diff --git a/target/arm/helper.c b/target/arm/helper.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
          */
         if (cpu_isar_feature(aa32_vfp_simd, env_archcpu(env))) {
             /* VFP coprocessor: cp10 & cp11 [23:20] */
-            mask |= (1 << 31) | (1 << 30) | (0xf << 20);
+            mask |= R_CPACR_ASEDIS_MASK |
+                    R_CPACR_D32DIS_MASK |
+                    R_CPACR_CP11_MASK |
+                    R_CPACR_CP10_MASK;
 
             if (!arm_feature(env, ARM_FEATURE_NEON)) {
                 /* ASEDIS [31] bit is RAO/WI */
-                value |= (1 << 31);
+                value |= R_CPACR_ASEDIS_MASK;
             }
 
             /* VFPv3 and upwards with NEON implement 32 double precision
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
              */
             if (!cpu_isar_feature(aa32_simd_r32, env_archcpu(env))) {
                 /* D32DIS [30] is RAO/WI if D16-31 are not implemented. */
-                value |= (1 << 30);
+                value |= R_CPACR_D32DIS_MASK;
             }
         }
         value &= mask;
@@ -XXX,XX +XXX,XX @@ static void cpacr_write(CPUARMState *env, const ARMCPRegInfo *ri,
      */
     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
         !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
-        value &= ~(0xf << 20);
-        value |= env->cp15.cpacr_el1 & (0xf << 20);
+        mask = R_CPACR_CP11_MASK | R_CPACR_CP10_MASK;
+        value = (value & ~mask) | (env->cp15.cpacr_el1 & mask);
     }
 
     env->cp15.cpacr_el1 = value;
@@ -XXX,XX +XXX,XX @@ static uint64_t cpacr_read(CPUARMState *env, const ARMCPRegInfo *ri)
 
     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
         !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
-        value &= ~(0xf << 20);
+        value = ~(R_CPACR_CP11_MASK | R_CPACR_CP10_MASK);
     }
     return value;
 }
@@ -XXX,XX +XXX,XX @@ static CPAccessResult cpacr_access(CPUARMState *env, const ARMCPRegInfo *ri,
     if (arm_feature(env, ARM_FEATURE_V8)) {
         /* Check if CPACR accesses are to be trapped to EL2 */
         if (arm_current_el(env) == 1 && arm_is_el2_enabled(env) &&
-            (env->cp15.cptr_el[2] & CPTR_TCPAC)) {
+            FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TCPAC)) {
             return CP_ACCESS_TRAP_EL2;
         /* Check if CPACR accesses are to be trapped to EL3 */
         } else if (arm_current_el(env) < 3 &&
-                   (env->cp15.cptr_el[3] & CPTR_TCPAC)) {
+                   FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TCPAC)) {
             return CP_ACCESS_TRAP_EL3;
         }
     }
@@ -XXX,XX +XXX,XX @@ static CPAccessResult cptr_access(CPUARMState *env, const ARMCPRegInfo *ri,
                                   bool isread)
 {
     /* Check if CPTR accesses are set to trap to EL3 */
-    if (arm_current_el(env) == 2 && (env->cp15.cptr_el[3] & CPTR_TCPAC)) {
+    if (arm_current_el(env) == 2 &&
+        FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TCPAC)) {
         return CP_ACCESS_TRAP_EL3;
     }
 
@@ -XXX,XX +XXX,XX @@ static void cptr_el2_write(CPUARMState *env, const ARMCPRegInfo *ri,
      */
     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
         !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
-        value &= ~(0x3 << 10);
-        value |= env->cp15.cptr_el[2] & (0x3 << 10);
+        uint64_t mask = R_HCPTR_TCP11_MASK | R_HCPTR_TCP10_MASK;
+        value = (value & ~mask) | (env->cp15.cptr_el[2] & mask);
     }
     env->cp15.cptr_el[2] = value;
 }
@@ -XXX,XX +XXX,XX @@ static uint64_t cptr_el2_read(CPUARMState *env, const ARMCPRegInfo *ri)
 
     if (arm_feature(env, ARM_FEATURE_EL3) && !arm_el_is_aa64(env, 3) &&
         !arm_is_secure(env) && !extract32(env->cp15.nsacr, 10, 1)) {
-        value |= 0x3 << 10;
+        value |= R_HCPTR_TCP11_MASK | R_HCPTR_TCP10_MASK;
     }
     return value;
 }
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
     uint64_t hcr_el2 = arm_hcr_el2_eff(env);
 
     if (el <= 1 && (hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) {
-        /* Check CPACR.ZEN.  */
-        switch (extract32(env->cp15.cpacr_el1, 16, 2)) {
+        switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, ZEN)) {
         case 1:
             if (el != 0) {
                 break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
         }
 
         /* Check CPACR.FPEN.  */
-        switch (extract32(env->cp15.cpacr_el1, 20, 2)) {
+        switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, FPEN)) {
         case 1:
             if (el != 0) {
                 break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
      */
     if (el <= 2) {
         if (hcr_el2 & HCR_E2H) {
-            /* Check CPTR_EL2.ZEN.  */
-            switch (extract32(env->cp15.cptr_el[2], 16, 2)) {
+            switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, ZEN)) {
             case 1:
                 if (el != 0 || !(hcr_el2 & HCR_TGE)) {
                     break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
                 return 2;
             }
 
-            /* Check CPTR_EL2.FPEN.  */
-            switch (extract32(env->cp15.cptr_el[2], 20, 2)) {
+            switch (FIELD_EX32(env->cp15.cptr_el[2], CPTR_EL2, FPEN)) {
             case 1:
                 if (el == 2 || !(hcr_el2 & HCR_TGE)) {
                     break;
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
                 return 0;
             }
         } else if (arm_is_el2_enabled(env)) {
-            if (env->cp15.cptr_el[2] & CPTR_TZ) {
+            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TZ)) {
                 return 2;
             }
-            if (env->cp15.cptr_el[2] & CPTR_TFP) {
+            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TFP)) {
                 return 0;
             }
         }
@@ -XXX,XX +XXX,XX @@ int sve_exception_el(CPUARMState *env, int el)
 
     /* CPTR_EL3.  Since EZ is negative we must check for EL3.  */
     if (arm_feature(env, ARM_FEATURE_EL3)
-        && !(env->cp15.cptr_el[3] & CPTR_EZ)) {
+        && !FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, EZ)) {
         return 3;
     }
 #endif
@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
      * This register is ignored if E2H+TGE are both set.
      */
     if ((hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) {
-        int fpen = extract32(env->cp15.cpacr_el1, 20, 2);
+        int fpen = FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, FPEN);
 
         switch (fpen) {
         case 0:
@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
      */
     if (cur_el <= 2) {
         if (hcr_el2 & HCR_E2H) {
-            /* Check CPTR_EL2.FPEN.  */
-            switch (extract32(env->cp15.cptr_el[2], 20, 2)) {
+            switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, FPEN)) {
             case 1:
                 if (cur_el != 0 || !(hcr_el2 & HCR_TGE)) {
                     break;
@@ -XXX,XX +XXX,XX @@ int fp_exception_el(CPUARMState *env, int cur_el)
                 return 2;
             }
         } else if (arm_is_el2_enabled(env)) {
-            if (env->cp15.cptr_el[2] & CPTR_TFP) {
+            if (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, TFP)) {
                 return 2;
             }
         }
     }
 
     /* CPTR_EL3 : present in v8 */
-    if (env->cp15.cptr_el[3] & CPTR_TFP) {
+    if (FIELD_EX64(env->cp15.cptr_el[3], CPTR_EL3, TFP)) {
         /* Trap all FP ops to EL3 */
         return 3;
     }
-- 
2.25.1

This pullreq has:
 * two arm bug fixes which fix some "Linux fails to boot" bugs
 * a docs typo-fixing patch
 * a couple of compile failure/warning issues

I think they're all pretty safe and worth having in rc3.

thanks
-- PMM

The following changes since commit a6b1c53e79d08a99a28cc3e67a3e1a7c34102d6b:

Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-10 10:26:57 -0700)

are available in the Git repository at:

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220812

for you to fetch changes up to 4311682ea8293f720730f260e8a7601117d79e65:

cutils: Add missing dyld(3) include on macOS (2022-08-12 11:33:52 +0100)

----------------------------------------------------------------
target-arm queue:
 * Don't report Statistical Profiling Extension in ID registers
 * virt ACPI tables: Present the GICR structure properly for GICv4
 * Fix some typos in documentation
 * tests/unit: fix a -Wformat-truncation warning
 * cutils: Add missing dyld(3) include on macOS

----------------------------------------------------------------
Marc-André Lureau (1):
      tests/unit: fix a -Wformat-truncation warning

Peter Maydell (1):
      target/arm: Don't report Statistical Profiling Extension in ID registers

Philippe Mathieu-Daudé (1):
      cutils: Add missing dyld(3) include on macOS

Stefan Weil (1):
      Fix some typos in documentation (most of them found by codespell)

Zenghui Yu (1):
      hw/arm/virt-acpi-build: Present the GICR structure properly for GICv4

The newly added neoverse-n1 CPU has ID register values which indicate
the presence of the Statistical Profiling Extension, because the real
hardware has this feature.  QEMU's TCG emulation does not yet
implement SPE, though (not even as a minimal stub implementation), so
guests will crash if they try to use it because the SPE system
registers don't exist.

Force ID_AA64DFR0_EL1.PMSVer to 0 in CPU realize for TCG, so that
we don't advertise to the guest a feature that doesn't exist.

(We could alternatively do this by editing the value that
aarch64_neoverse_n1_initfn() sets for this ID register, but
suppressing the field in realize means we won't re-introduce this bug
when we add other CPUs that have SPE in hardware, such as the
Neoverse-V1.)

An example of a non-booting guest is current mainline Linux (5.19),
when booting in EL2 on the virt board (ie with -machine
virtualization=on).

Reported-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Message-id: 20220811131127.947334-1-peter.maydell@linaro.org
---
 target/arm/cpu.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
     }
 #endif
 
+    if (tcg_enabled()) {
+        /*
+         * Don't report the Statistical Profiling Extension in the ID
+         * registers, because TCG doesn't implement it yet (not even a
+         * minimal stub version) and guests will fall over when they
+         * try to access the non-existent system registers for it.
+         */
+        cpu->isar.id_aa64dfr0 =
+            FIELD_DP64(cpu->isar.id_aa64dfr0, ID_AA64DFR0, PMSVER, 0);
+    }
+
     /* MPU can be configured out of a PMSA CPU either by setting has-mpu
      * to false or by setting pmsav7-dregion to 0.
      */
-- 
2.25.1

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Hongren (Zenithal) Zheng <i@zenithal.me>
Message-id: 20220812075642.1200578-1-sw@weilnetz.de
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 docs/about/deprecated.rst       |  2 +-
 docs/specs/acpi_erst.rst        |  4 ++--
 docs/system/devices/canokey.rst |  8 ++++----
 docs/system/devices/cxl.rst     | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -XXX,XX +XXX,XX @@ by using ``-machine graphics=off``.
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In QEMU versions 6.1, 6.2 and 7.0, the ``nvme-ns`` generates an EUI-64
-identifer that is not globally unique. If an EUI-64 identifer is required, the
+identifier that is not globally unique. If an EUI-64 identifier is required, the
 user must set it explicitly using the ``nvme-ns`` device parameter ``eui64``.
 
 ``-device nvme,use-intel-id=on|off`` (since 7.1)
diff --git a/docs/specs/acpi_erst.rst b/docs/specs/acpi_erst.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/specs/acpi_erst.rst
+++ b/docs/specs/acpi_erst.rst
@@ -XXX,XX +XXX,XX @@ Slot 0 contains a backend storage header that identifies the contents
 as ERST and also facilitates efficient access to the records.
 Depending upon the size of the backend storage, additional slots will
 be designated to be a part of the slot 0 header. For example, at 8KiB,
-the slot 0 header can accomodate 1021 records. Thus a storage size
+the slot 0 header can accommodate 1021 records. Thus a storage size
 of 8MiB (8KiB * 1024) requires an additional slot for use by the
 header. In this scenario, slot 0 and slot 1 form the backend storage
 header, and records can be stored starting at slot 2.
@@ -XXX,XX +XXX,XX @@ References
 [2] "Unified Extensible Firmware Interface Specification",
     version 2.1, October 2008.
 
-[3] "Windows Hardware Error Architecture", specfically
+[3] "Windows Hardware Error Architecture", specifically
     "Error Record Persistence Mechanism".
diff --git a/docs/system/devices/canokey.rst b/docs/system/devices/canokey.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/system/devices/canokey.rst
+++ b/docs/system/devices/canokey.rst
@@ -XXX,XX +XXX,XX @@ With the same software configuration as a hardware key,
 the guest OS can use all the functionalities of a secure key as if
 there was actually an hardware key plugged in.
 
-CanoKey QEMU provides much convenience for debuging:
+CanoKey QEMU provides much convenience for debugging:
 
-* libcanokey-qemu supports debuging output thus developers can
+* libcanokey-qemu supports debugging output thus developers can
   inspect what happens inside a secure key
 * CanoKey QEMU supports trace event thus event
 * QEMU USB stack supports pcap thus USB packet between the guest
@@ -XXX,XX +XXX,XX @@ and find CanoKey QEMU there:
 
 You may setup the key as guided in [6]_. The console for the key is at [7]_.
 
-Debuging
-========
+Debugging
+=========
 
 CanoKey QEMU consists of two parts, ``libcanokey-qemu.so`` and ``canokey.c``,
 the latter of which resides in QEMU. The former provides core functionality
diff --git a/docs/system/devices/cxl.rst b/docs/system/devices/cxl.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/system/devices/cxl.rst
+++ b/docs/system/devices/cxl.rst
@@ -XXX,XX +XXX,XX @@ CXL Fixed Memory Windows (CFMW)
 A CFMW consists of a particular range of Host Physical Address space
 which is routed to particular CXL Host Bridges.  At time of generic
 software initialization it will have a particularly interleaving
-configuration and associated Quality of Serice Throtling Group (QTG).
+configuration and associated Quality of Service Throttling Group (QTG).
 This information is available to system software, when making
 decisions about how to configure interleave across available CXL
 memory devices.  It is provide as CFMW Structures (CFMWS) in
@@ -XXX,XX +XXX,XX @@ specification defined register interface called CXL Host Bridge
 Component Registers (CHBCR). The location of this CHBCR MMIO
 space is described to system software via a CXL Host Bridge
 Structure (CHBS) in the CEDT ACPI table.  The actual interfaces
-are identical to those used for other parts of the CXL heirarchy
+are identical to those used for other parts of the CXL hierarchy
 as CXL Component Registers in PCI BARs.
 
 Interfaces provided include:
@@ -XXX,XX +XXX,XX @@ CXL Memory Devices - Type 3
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 CXL type 3 devices use a PCI class code and are intended to be supported
 by a generic operating system driver. They have HDM decoders
-though in these EP devices, the decoder is reponsible not for
+though in these EP devices, the decoder is responsible not for
 routing but for translation of the incoming host physical address (HPA)
 into a Device Physical Address (DPA).
 
@@ -XXX,XX +XXX,XX @@ Notes:
     ranges of the system physical address map.  Each CFMW has
     particular interleave setup across the CXL Host Bridges (HB)
     CFMW0 provides uninterleaved access to HB0, CFW2 provides
-    uninterleaved acess to HB1. CFW1 provides interleaved memory access
+    uninterleaved access to HB1. CFW1 provides interleaved memory access
     across HB0 and HB1.
 
 (2) **Two CXL Host Bridges**. Each of these has 2 CXL Root Ports and
@@ -XXX,XX +XXX,XX @@ Example topology involving a switch::
             ---------------------------------------------------
            |    Switch 0  USP as PCI 0d:00.0                   |
            |    USP has HDM decoder which direct traffic to    |
-           |    appropiate downstream port                     |
+           |    appropriate downstream port                    |
            |    Switch BUS appears as 0e                       |
            |x__________________________________________________|
             |                  |               |              |
@@ -XXX,XX +XXX,XX @@ An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave::
 Kernel Configuration Options
 ----------------------------
 
-In Linux 5.18 the followings options are necessary to make use of
+In Linux 5.18 the following options are necessary to make use of
 OS management of CXL memory devices as described here.
 
 * CONFIG_CXL_BUS
-- 
2.25.1

From: Marc-André Lureau <marcandre.lureau@redhat.com>

../tests/test-qobject-input-visitor.c: In function ‘test_visitor_in_list’:
../tests/test-qobject-input-visitor.c:454:49: warning: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Wformat-truncation=]
  454 |         snprintf(string, sizeof(string), "string%d", i);
      |                                                 ^~
../tests/test-qobject-input-visitor.c:454:42: note: directive argument in the range [0, 2147483606]
  454 |         snprintf(string, sizeof(string), "string%d", i);
      |                                          ^~~~~~~~~~
../tests/test-qobject-input-visitor.c:454:9: note: ‘snprintf’ output between 8 and 17 bytes into a destination of size 12
  454 |         snprintf(string, sizeof(string), "string%d", i);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Rather than trying to be clever, since this is called 3 times during
tests, let's simply use g_strdup_printf().

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-id: 20220810121513.1356081-1-marcandre.lureau@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[PMM: fixed commit message typos]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 tests/unit/test-qobject-input-visitor.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/unit/test-qobject-input-visitor.c
+++ b/tests/unit/test-qobject-input-visitor.c
@@ -XXX,XX +XXX,XX @@ static void test_visitor_in_list(TestInputVisitorData *data,
     g_assert(head != NULL);
 
     for (i = 0, item = head; item; item = item->next, i++) {
-        char string[12];
+        g_autofree char *string = g_strdup_printf("string%d", i);
 
-        snprintf(string, sizeof(string), "string%d", i);
         g_assert_cmpstr(item->value->string, ==, string);
         g_assert_cmpint(item->value->integer, ==, 42 + i);
     }
-- 
2.25.1

From: Zenghui Yu <yuzenghui@huawei.com>

With the introduction of the new TCG GICv4, build_madt() is badly broken
as we do not present any GIC Redistributor structure in MADT for GICv4
guests, so that they have no idea about where the Redistributor
register frames are. This fixes a Linux guest crash at boot time with
ACPI enabled and '-machine gic-version=4'.

While at it, let's convert the remaining hard coded gic_version into
enumeration VIRT_GIC_VERSION_2 for consistency.

Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Message-id: 20220812022018.1069-1-yuzenghui@huawei.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm/virt-acpi-build.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         uint32_t pmu_interrupt = arm_feature(&armcpu->env, ARM_FEATURE_PMU) ?
                                              PPI(VIRTUAL_PMU_IRQ) : 0;
 
-        if (vms->gic_version == 2) {
+        if (vms->gic_version == VIRT_GIC_VERSION_2) {
             physical_base_address = memmap[VIRT_GIC_CPU].base;
             gicv = memmap[VIRT_GIC_VCPU].base;
             gich = memmap[VIRT_GIC_HYP].base;
@@ -XXX,XX +XXX,XX @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
         build_append_int_noprefix(table_data, armcpu->mp_affinity, 8);
     }
 
-    if (vms->gic_version == 3) {
+    if (vms->gic_version != VIRT_GIC_VERSION_2) {
         build_append_gicr(table_data, memmap[VIRT_GIC_REDIST].base,
                                       memmap[VIRT_GIC_REDIST].size);
         if (virt_gicv3_redist_region_count(vms) == 2) {
-- 
2.25.1

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Commit 06680b15b4 moved qemu_*_exec_dir() to cutils but forgot
to move the macOS dyld(3) include, resulting in the following
error (when building with Homebrew GCC on macOS Monterey 12.4):

[313/1197] Compiling C object libqemuutil.a.p/util_cutils.c.o
  FAILED: libqemuutil.a.p/util_cutils.c.o
  ../../util/cutils.c:1039:13: error: implicit declaration of function '_NSGetExecutablePath' [-Werror=implicit-function-declaration]
   1039 |         if (_NSGetExecutablePath(fpath, &len) == 0) {
        |             ^~~~~~~~~~~~~~~~~~~~
  ../../util/cutils.c:1039:13: error: nested extern declaration of '_NSGetExecutablePath' [-Werror=nested-externs]

Fix by moving the include line to cutils.

Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20220809222046.30812-1-f4bug@amsat.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 util/cutils.c      | 4 ++++
 util/oslib-posix.c | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/cutils.c b/util/cutils.c
index XXXXXXX..XXXXXXX 100644
--- a/util/cutils.c
+++ b/util/cutils.c
@@ -XXX,XX +XXX,XX @@
 #include <kernel/image.h>
 #endif
 
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
+#endif
+
 #ifdef G_OS_WIN32
 #include <pathcch.h>
 #include <wchar.h>
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -XXX,XX +XXX,XX @@
 #include <lwp.h>
 #endif
 
-#ifdef __APPLE__
-#include <mach-o/dyld.h>
-#endif
-
 #include "qemu/mmap-alloc.h"
 
 #ifdef CONFIG_DEBUG_STACK_USAGE
-- 
2.25.1