Two last-minute regression fixes that I thought we might as well

squeeze in before rc1.

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

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)

* 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: 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

gdbstub.c | 14 ++++++++++++--

1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gdbstub.c b/gdbstub.c

--- 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;

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

target/arm/cpu.c | 5 +++++

1 file changed, 5 insertions(+)

diff --git a/target/arm/cpu.c b/target/arm/cpu.c

--- 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;