Series comparison

-[PULL 0/1] target-arm queue
+[PULL v2 00/21] target-arm queue
-The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a:
+v2: fix format string error
-  Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000)
+thanks
 -- PMM
 The following changes since commit aa9bbd865502ed517624ab6fe7d4b5d89ca95e43:
   Merge tag 'pull-ppc-20230528' of https://gitlab.com/danielhb/qemu into staging (2023-05-29 14:31:52 -0700)
 are available in the Git repository at:
-  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328
+  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230530-1
-for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a:
+for you to fetch changes up to ec683110def96b16be3931ec87baba65a3dc5ad0:
-  target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100)
+  docs: sbsa: correct graphics card name (2023-05-30 15:50:17 +0100)
 ----------------------------------------------------------------
 target-arm queue:
- * fix part of the "TCG-disabled builds are broken" issue
+ * fsl-imx6: Add SNVS support for i.MX6 boards
  * smmuv3: Add support for stage 2 translations
  * hw/dma/xilinx_axidma: Check DMASR.HALTED to prevent infinite loop
  * hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number
  * cleanups for recent Kconfig changes
  * target/arm: Explicitly select short-format FSR for M-profile
  * tests/qtest: Run arm-specific tests only if the required machine is available
  * hw/arm/sbsa-ref: add GIC node into DT
  * docs: sbsa: correct graphics card name
  * Update copyright dates to 2023
 ----------------------------------------------------------------
-Philippe Mathieu-Daudé (1):
+Clément Chigot (1):
-      target/arm/gdbstub: Only advertise M-profile features if TCG available
+      hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number
- target/arm/gdbstub.c | 5 +++--
+Enze Li (1):
-file changed, 3 insertions(+), 2 deletions(-)
+      Update copyright dates to 2023
+Fabiano Rosas (3):
+      target/arm: Explain why we need to select ARM_V7M
+      arm/Kconfig: Keep Kconfig default entries in default.mak as documentation
+      arm/Kconfig: Make TCG dependence explicit
+Marcin Juszkiewicz (2):
+      hw/arm/sbsa-ref: add GIC node into DT
+      docs: sbsa: correct graphics card name
+Mostafa Saleh (10):
+      hw/arm/smmuv3: Add missing fields for IDR0
+      hw/arm/smmuv3: Update translation config to hold stage-2
+      hw/arm/smmuv3: Refactor stage-1 PTW
+      hw/arm/smmuv3: Add page table walk for stage-2
+      hw/arm/smmuv3: Parse STE config for stage-2
+      hw/arm/smmuv3: Make TLB lookup work for stage-2
+      hw/arm/smmuv3: Add VMID to TLB tagging
+      hw/arm/smmuv3: Add CMDs related to stage-2
+      hw/arm/smmuv3: Add stage-2 support in iova notifier
+      hw/arm/smmuv3: Add knob to choose translation stage and enable stage-2
+Peter Maydell (1):
+      target/arm: Explicitly select short-format FSR for M-profile
+Thomas Huth (1):
+      tests/qtest: Run arm-specific tests only if the required machine is available
+Tommy Wu (1):
+      hw/dma/xilinx_axidma: Check DMASR.HALTED to prevent infinite loop.
+Vitaly Cheptsov (1):
+      fsl-imx6: Add SNVS support for i.MX6 boards
+ docs/conf.py                                |   2 +-
+ docs/system/arm/sbsa.rst                    |   2 +-
+ configs/devices/aarch64-softmmu/default.mak |   6 +
+ configs/devices/arm-softmmu/default.mak     |  40 ++++
+ hw/arm/smmu-internal.h                      |  37 +++
+ hw/arm/smmuv3-internal.h                    |  12 +-
+ include/hw/arm/fsl-imx6.h                   |   2 +
+ include/hw/arm/smmu-common.h                |  45 +++-
+ include/hw/arm/smmuv3.h                     |   4 +
+ include/qemu/help-texts.h                   |   2 +-
+ hw/arm/fsl-imx6.c                           |   8 +
+ hw/arm/sbsa-ref.c                           |  19 +-
+ hw/arm/smmu-common.c                        | 209 ++++++++++++++--
+ hw/arm/smmuv3.c                             | 358 ++++++++++++++++++++++++----
+ hw/arm/xlnx-zynqmp.c                        |   2 +-
+ hw/dma/xilinx_axidma.c                      |  11 +-
+ target/arm/tcg/tlb_helper.c                 |  13 +-
+ hw/arm/Kconfig                              | 123 ++++++----
+ hw/arm/trace-events                         |  14 +-
+ target/arm/Kconfig                          |   3 +
+ tests/qtest/meson.build                     |   7 +-
+files changed, 774 insertions(+), 145 deletions(-)

-[PULL 1/1] target/arm/gdbstub: Only advertise M-profile features if TCG available
+Deleted patch
-From: Philippe Mathieu-Daudé <philmd@linaro.org>
-Cortex-M profile is only emulable from TCG accelerator. Restrict
-the GDBstub features to its availability in order to avoid a link
-error when TCG is not enabled:
-  Undefined symbols for architecture arm64:
-    "_arm_v7m_get_sp_ptr", referenced from:
-        _m_sysreg_get in target_arm_gdbstub.c.o
-    "_arm_v7m_mrs_control", referenced from:
-        _arm_gdb_get_m_systemreg in target_arm_gdbstub.c.o
-  ld: symbol(s) not found for architecture arm64
-  clang: error: linker command failed with exit code 1 (use -v to see invocation)
-Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext")
-Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Message-id: 20230322142902.69511-3-philmd@linaro.org
-[PMM: add #include since I cherry-picked this patch from the series]
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- target/arm/gdbstub.c | 5 +++--
-file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
-index XXXXXXX..XXXXXXX 100644
---- a/target/arm/gdbstub.c
-+++ b/target/arm/gdbstub.c
-@@ -XXX,XX +XXX,XX @@
- #include "cpu.h"
- #include "exec/gdbstub.h"
- #include "gdbstub/helpers.h"
-+#include "sysemu/tcg.h"
- #include "internals.h"
- #include "cpregs.h"
-@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
-, "arm-vfp-sysregs.xml", 0);
-         }
-     }
--    if (cpu_isar_feature(aa32_mve, cpu)) {
-+    if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) {
-         gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg,
-, "arm-m-profile-mve.xml", 0);
-     }
-@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
-                              arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs),
-                              "system-registers.xml", 0);
--    if (arm_feature(env, ARM_FEATURE_M)) {
-+    if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) {
-         gdb_register_coprocessor(cs,
-             arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg,
-             arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs),
---
-.34.1

From: Philippe Mathieu-Daudé <philmd@linaro.org>

Cortex-M profile is only emulable from TCG accelerator. Restrict
the GDBstub features to its availability in order to avoid a link
error when TCG is not enabled:

Undefined symbols for architecture arm64:
    "_arm_v7m_get_sp_ptr", referenced from:
        _m_sysreg_get in target_arm_gdbstub.c.o
    "_arm_v7m_mrs_control", referenced from:
        _arm_gdb_get_m_systemreg in target_arm_gdbstub.c.o
  ld: symbol(s) not found for architecture arm64
  clang: error: linker command failed with exit code 1 (use -v to see invocation)

Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230322142902.69511-3-philmd@linaro.org
[PMM: add #include since I cherry-picked this patch from the series]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/gdbstub.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
index XXXXXXX..XXXXXXX 100644
--- a/target/arm/gdbstub.c
+++ b/target/arm/gdbstub.c
@@ -XXX,XX +XXX,XX @@
 #include "cpu.h"
 #include "exec/gdbstub.h"
 #include "gdbstub/helpers.h"
+#include "sysemu/tcg.h"
 #include "internals.h"
 #include "cpregs.h"
 
@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
                                      2, "arm-vfp-sysregs.xml", 0);
         }
     }
-    if (cpu_isar_feature(aa32_mve, cpu)) {
+    if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) {
         gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg,
                                  1, "arm-m-profile-mve.xml", 0);
     }
@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
                              arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs),
                              "system-registers.xml", 0);
 
-    if (arm_feature(env, ARM_FEATURE_M)) {
+    if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) {
         gdb_register_coprocessor(cs,
             arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg,
             arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs),
-- 
2.34.1

v2: fix format string error

thanks
-- PMM

The following changes since commit aa9bbd865502ed517624ab6fe7d4b5d89ca95e43:

Merge tag 'pull-ppc-20230528' of https://gitlab.com/danielhb/qemu into staging (2023-05-29 14:31:52 -0700)

are available in the Git repository at:

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

for you to fetch changes up to ec683110def96b16be3931ec87baba65a3dc5ad0:

docs: sbsa: correct graphics card name (2023-05-30 15:50:17 +0100)

----------------------------------------------------------------
target-arm queue:
 * fsl-imx6: Add SNVS support for i.MX6 boards
 * smmuv3: Add support for stage 2 translations
 * hw/dma/xilinx_axidma: Check DMASR.HALTED to prevent infinite loop
 * hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number
 * cleanups for recent Kconfig changes
 * target/arm: Explicitly select short-format FSR for M-profile
 * tests/qtest: Run arm-specific tests only if the required machine is available
 * hw/arm/sbsa-ref: add GIC node into DT
 * docs: sbsa: correct graphics card name
 * Update copyright dates to 2023

----------------------------------------------------------------
Clément Chigot (1):
      hw/arm/xlnx-zynqmp: fix unsigned error when checking the RPUs number

Fabiano Rosas (3):
      target/arm: Explain why we need to select ARM_V7M
      arm/Kconfig: Keep Kconfig default entries in default.mak as documentation
      arm/Kconfig: Make TCG dependence explicit

Marcin Juszkiewicz (2):
      hw/arm/sbsa-ref: add GIC node into DT
      docs: sbsa: correct graphics card name

Mostafa Saleh (10):
      hw/arm/smmuv3: Add missing fields for IDR0
      hw/arm/smmuv3: Update translation config to hold stage-2
      hw/arm/smmuv3: Refactor stage-1 PTW
      hw/arm/smmuv3: Add page table walk for stage-2
      hw/arm/smmuv3: Parse STE config for stage-2
      hw/arm/smmuv3: Make TLB lookup work for stage-2
      hw/arm/smmuv3: Add VMID to TLB tagging
      hw/arm/smmuv3: Add CMDs related to stage-2
      hw/arm/smmuv3: Add stage-2 support in iova notifier
      hw/arm/smmuv3: Add knob to choose translation stage and enable stage-2

Peter Maydell (1):
      target/arm: Explicitly select short-format FSR for M-profile

Thomas Huth (1):
      tests/qtest: Run arm-specific tests only if the required machine is available

Tommy Wu (1):
      hw/dma/xilinx_axidma: Check DMASR.HALTED to prevent infinite loop.

Vitaly Cheptsov (1):
      fsl-imx6: Add SNVS support for i.MX6 boards