Series comparison

-[Qemu-devel] [PULL 0/2] target-arm queue
+[PULL 0/1] target-arm queue
-Two last-minute regression fixes that I thought we might as well
+The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a:
 squeeze in before rc1.
-thanks
+  Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000)
 -- PMM
 The following changes since commit d37bfe142382fa8258531c47b4519387c77cd169:
   Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc1-v2' into staging (2019-03-26 10:27:20 +0000)
 are available in the Git repository at:
-  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20190326
+  https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328
-for you to fetch changes up to c99ef792dc9ec6d8a5061428faf396ea9ceb8f57:
+for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a:
-  gdbstub: fix vCont packet handling when no thread is specified (2019-03-26 12:53:26 +0000)
+  target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100)
 ----------------------------------------------------------------
 target-arm queue:
- * Set SIMDMISC and FPMISC for 32-bit -cpu max
+ * fix part of the "TCG-disabled builds are broken" issue
    (fixes regression from 3.1)
  * fix vCont packet handling when no thread is specified
 ----------------------------------------------------------------
-Luc Michel (1):
+Philippe Mathieu-Daudé (1):
-      gdbstub: fix vCont packet handling when no thread is specified
+      target/arm/gdbstub: Only advertise M-profile features if TCG available
-Richard Henderson (1):
+ target/arm/gdbstub.c | 5 +++--
-      target/arm: Set SIMDMISC and FPMISC for 32-bit -cpu max
+file changed, 3 insertions(+), 2 deletions(-)
- gdbstub.c        | 14 ++++++++++++--
- target/arm/cpu.c |  5 +++++
-files changed, 17 insertions(+), 2 deletions(-)

-[Qemu-devel] [PULL 1/2] target/arm: Set SIMDMISC and FPMISC for 32-bit -cpu max
+Deleted patch
-From: Richard Henderson <richard.henderson@linaro.org>
-Fixes: https://bugs.launchpad.net/bugs/1821430
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Message-id: 20190325161338.6536-1-richard.henderson@linaro.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- target/arm/cpu.c | 5 +++++
-file changed, 5 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_max_initfn(Object *obj)
-             t = FIELD_DP32(t, ID_ISAR6, SPECRES, 1);
-             cpu->isar.id_isar6 = t;
-+            t = cpu->isar.mvfr2;
-+            t = FIELD_DP32(t, MVFR2, SIMDMISC, 3); /* SIMD MaxNum */
-+            t = FIELD_DP32(t, MVFR2, FPMISC, 4);   /* FP MaxNum */
-+            cpu->isar.mvfr2 = t;
-+
-             t = cpu->id_mmfr4;
-             t = FIELD_DP32(t, ID_MMFR4, HPDS, 1); /* AA32HPD */
-             cpu->id_mmfr4 = t;
---
-.20.1

-[Qemu-devel] [PULL 2/2] gdbstub: fix vCont packet handling when no thread is specified
+[PULL 1/1] target/arm/gdbstub: Only advertise M-profile features if TCG available
-From: Luc Michel <luc.michel@greensocs.com>
+From: Philippe Mathieu-Daudé <philmd@linaro.org>
-The vCont packet accepts a series of actions, each being applied on a
+Cortex-M profile is only emulable from TCG accelerator. Restrict
-given thread ID. Giving no thread ID for an action is valid and means
+the GDBstub features to its availability in order to avoid a link
-"all threads".
+error when TCG is not enabled:
-This commit fixes vCont packets being incorrectly rejected when no
+  Undefined symbols for architecture arm64:
-thread ID was given for an action.
+    "_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)
-In multiprocess mode, the GDB Remote Protocol specification is unclear
+Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext")
-on what "all threads" means. We choose to apply the action on all
+Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
 threads of all attached processes.
 This commit is based on the initial fix by Lucien Murray-Pitts.
 Fixes: e40e5204af8388
 Reported-by: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
 Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
 Signed-off-by: Luc Michel <luc.michel@greensocs.com>
 Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20190325110452.6756-1-luc.michel@greensocs.com
+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>
 ---
- gdbstub.c | 14 ++++++++++++--
+ target/arm/gdbstub.c | 5 +++--
-file changed, 12 insertions(+), 2 deletions(-)
+file changed, 3 insertions(+), 2 deletions(-)
-diff --git a/gdbstub.c b/gdbstub.c
+diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
 index XXXXXXX..XXXXXXX 100644
---- a/gdbstub.c
+--- a/target/arm/gdbstub.c
-+++ b/gdbstub.c
++++ b/target/arm/gdbstub.c
-@@ -XXX,XX +XXX,XX @@ static int gdb_handle_vcont(GDBState *s, const char *p)
+@@ -XXX,XX +XXX,XX @@
-     uint32_t pid, tid;
+ #include "cpu.h"
-     GDBProcess *process;
+ #include "exec/gdbstub.h"
-     CPUState *cpu;
+ #include "gdbstub/helpers.h"
-+    GDBThreadIdKind kind;
++#include "sysemu/tcg.h"
- #ifdef CONFIG_USER_ONLY
+ #include "internals.h"
-     int max_cpus = 1; /* global variable max_cpus exists only in system mode */
+ #include "cpregs.h"
-@@ -XXX,XX +XXX,XX @@ static int gdb_handle_vcont(GDBState *s, const char *p)
+@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
-             goto out;
+, "arm-vfp-sysregs.xml", 0);
          }
+     }
--        if (*p++ != ':') {
+-    if (cpu_isar_feature(aa32_mve, cpu)) {
-+        if (*p == '\0' || *p == ';') {
++    if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) {
-+            /*
+         gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg,
-+             * No thread specifier, action is on "all threads". The
+, "arm-m-profile-mve.xml", 0);
-+             * specification is unclear regarding the process to act on. We
+     }
-+             * choose all processes.
+@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
-+             */
+                              arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs),
-+            kind = GDB_ALL_PROCESSES;
+                              "system-registers.xml", 0);
-+        } else if (*p++ == ':') {
-+            kind = read_thread_id(p, &p, &pid, &tid);
+-    if (arm_feature(env, ARM_FEATURE_M)) {
-+        } else {
++    if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) {
-             res = -ENOTSUP;
+         gdb_register_coprocessor(cs,
-             goto out;
+             arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg,
-         }
+             arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs),
 -        switch (read_thread_id(p, &p, &pid, &tid)) {
 +        switch (kind) {
          case GDB_READ_THREAD_ERR:
              res = -EINVAL;
              goto out;
 --
-.20.1
+.34.1

Two last-minute regression fixes that I thought we might as well
squeeze in before rc1.

thanks
-- PMM

The following changes since commit d37bfe142382fa8258531c47b4519387c77cd169:

Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc1-v2' into staging (2019-03-26 10:27:20 +0000)

are available in the Git repository at:

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

for you to fetch changes up to c99ef792dc9ec6d8a5061428faf396ea9ceb8f57:

gdbstub: fix vCont packet handling when no thread is specified (2019-03-26 12:53:26 +0000)

----------------------------------------------------------------
target-arm queue:
 * Set SIMDMISC and FPMISC for 32-bit -cpu max
   (fixes regression from 3.1)
 * fix vCont packet handling when no thread is specified

----------------------------------------------------------------
Luc Michel (1):
      gdbstub: fix vCont packet handling when no thread is specified

Richard Henderson (1):
      target/arm: Set SIMDMISC and FPMISC for 32-bit -cpu max

gdbstub.c        | 14 ++++++++++++--
 target/arm/cpu.c |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

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

Fixes: https://bugs.launchpad.net/bugs/1821430
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20190325161338.6536-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 target/arm/cpu.c | 5 +++++
 1 file changed, 5 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_max_initfn(Object *obj)
             t = FIELD_DP32(t, ID_ISAR6, SPECRES, 1);
             cpu->isar.id_isar6 = t;
 
+            t = cpu->isar.mvfr2;
+            t = FIELD_DP32(t, MVFR2, SIMDMISC, 3); /* SIMD MaxNum */
+            t = FIELD_DP32(t, MVFR2, FPMISC, 4);   /* FP MaxNum */
+            cpu->isar.mvfr2 = t;
+
             t = cpu->id_mmfr4;
             t = FIELD_DP32(t, ID_MMFR4, HPDS, 1); /* AA32HPD */
             cpu->id_mmfr4 = t;
-- 
2.20.1

From: Luc Michel <luc.michel@greensocs.com>

The vCont packet accepts a series of actions, each being applied on a
given thread ID. Giving no thread ID for an action is valid and means
"all threads".

This commit fixes vCont packets being incorrectly rejected when no
thread ID was given for an action.

In multiprocess mode, the GDB Remote Protocol specification is unclear
on what "all threads" means. We choose to apply the action on all
threads of all attached processes.

This commit is based on the initial fix by Lucien Murray-Pitts.

Fixes: e40e5204af8388
Reported-by: Lucien Murray-Pitts <lucienmp_antispam@yahoo.com>
Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190325110452.6756-1-luc.michel@greensocs.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 gdbstub.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gdbstub.c b/gdbstub.c
index XXXXXXX..XXXXXXX 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -XXX,XX +XXX,XX @@ static int gdb_handle_vcont(GDBState *s, const char *p)
     uint32_t pid, tid;
     GDBProcess *process;
     CPUState *cpu;
+    GDBThreadIdKind kind;
 #ifdef CONFIG_USER_ONLY
     int max_cpus = 1; /* global variable max_cpus exists only in system mode */
 
@@ -XXX,XX +XXX,XX @@ static int gdb_handle_vcont(GDBState *s, const char *p)
             goto out;
         }
 
-        if (*p++ != ':') {
+        if (*p == '\0' || *p == ';') {
+            /*
+             * No thread specifier, action is on "all threads". The
+             * specification is unclear regarding the process to act on. We
+             * choose all processes.
+             */
+            kind = GDB_ALL_PROCESSES;
+        } else if (*p++ == ':') {
+            kind = read_thread_id(p, &p, &pid, &tid);
+        } else {
             res = -ENOTSUP;
             goto out;
         }
 
-        switch (read_thread_id(p, &p, &pid, &tid)) {
+        switch (kind) {
         case GDB_READ_THREAD_ERR:
             res = -EINVAL;
             goto out;
-- 
2.20.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