[PULL 0/3] target-arm queue
[PULL v2 00/11] target-arm queue
1
A few last patches to go in for rc3...
1
Massively slimmed down v2: MemTag broke bsd-user, and the npcm7xx
2
ethernet device failed 'make check' on big-endian hosts.
2
3
3
The following changes since commit c1e90def01bdb8fcbdbebd9d1eaa8e4827ece620:
4
-- PMM
4
5
5
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210412' into staging (2021-04-12 12:12:09 +0100)
6
The following changes since commit 83339e21d05c824ebc9131d644f25c23d0e41ecf:
7
8
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-02-10 15:42:20 +0000)
6
9
7
are available in the Git repository at:
10
are available in the Git repository at:
8
11
9
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210413
12
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210211-1
10
13
11
for you to fetch changes up to 2d18b4ca023ca1a3aee18064251d6e6e1084f3eb:
14
for you to fetch changes up to d3c1183ffeb71ca3a783eae3d7e1c51e71e8a621:
12
15
13
sphinx: qapidoc: Wrap "If" section body in a paragraph node (2021-04-13 10:14:58 +0100)
16
target/arm: Correctly initialize MDCR_EL2.HPMN (2021-02-11 19:48:09 +0000)
14
17
15
----------------------------------------------------------------
18
----------------------------------------------------------------
16
target-arm queue:
19
target-arm queue:
17
* Fix MPC setting for AN524 SRAM block
20
* Correctly initialize MDCR_EL2.HPMN
18
* sphinx: qapidoc: Wrap "If" section body in a paragraph node
21
* versal: Use nr_apu_cpus in favor of hard coding 2
22
* accel/tcg: Add URL of clang bug to comment about our workaround
23
* Add support for FEAT_DIT, Data Independent Timing
24
* Remove GPIO from unimplemented NPCM7XX
25
* Fix SCR RES1 handling
26
* Don't migrate CPUARMState.features
19
27
20
----------------------------------------------------------------
28
----------------------------------------------------------------
21
John Snow (1):
29
Aaron Lindsay (1):
22
sphinx: qapidoc: Wrap "If" section body in a paragraph node
30
target/arm: Don't migrate CPUARMState.features
31
32
Daniel Müller (1):
33
target/arm: Correctly initialize MDCR_EL2.HPMN
34
35
Edgar E. Iglesias (1):
36
hw/arm: versal: Use nr_apu_cpus in favor of hard coding 2
37
38
Hao Wu (1):
39
hw/arm: Remove GPIO from unimplemented NPCM7XX
40
41
Mike Nawrocki (1):
42
target/arm: Fix SCR RES1 handling
23
43
24
Peter Maydell (2):
44
Peter Maydell (2):
25
hw/arm/mps2-tz: Fix MPC setting for AN524 SRAM block
45
arm: Update infocenter.arm.com URLs
26
hw/arm/mps2-tz: Assert if more than one RAM is attached to an MPC
46
accel/tcg: Add URL of clang bug to comment about our workaround
27
47
28
docs/sphinx/qapidoc.py | 4 +++-
48
Rebecca Cran (4):
29
hw/arm/mps2-tz.c | 10 +++++++---
49
target/arm: Add support for FEAT_DIT, Data Independent Timing
30
2 files changed, 10 insertions(+), 4 deletions(-)
50
target/arm: Support AA32 DIT by moving PSTATE_SS from cpsr into env->pstate
51
target/arm: Set ID_AA64PFR0.DIT and ID_PFR0.DIT to 1 for "max" AA64 CPU
52
target/arm: Set ID_PFR0.DIT to 1 for "max" 32-bit CPU
31
53
54
include/hw/dma/pl080.h | 7 ++--
55
include/hw/misc/arm_integrator_debug.h | 2 +-
56
include/hw/ssi/pl022.h | 5 ++-
57
target/arm/cpu.h | 17 ++++++++
58
target/arm/internals.h | 6 +++
59
accel/tcg/cpu-exec.c | 25 +++++++++---
60
hw/arm/aspeed_ast2600.c | 2 +-
61
hw/arm/musca.c | 4 +-
62
hw/arm/npcm7xx.c | 8 ----
63
hw/arm/xlnx-versal.c | 4 +-
64
hw/misc/arm_integrator_debug.c | 2 +-
65
hw/timer/arm_timer.c | 7 ++--
66
target/arm/cpu.c | 4 ++
67
target/arm/cpu64.c | 5 +++
68
target/arm/helper-a64.c | 27 +++++++++++--
69
target/arm/helper.c | 71 +++++++++++++++++++++++++++-------
70
target/arm/machine.c | 2 +-
71
target/arm/op_helper.c | 9 +----
72
target/arm/translate-a64.c | 12 ++++++
73
19 files changed, 164 insertions(+), 55 deletions(-)
74
diff view generated by jsdifflib
[PULL 1/3] hw/arm/mps2-tz: Fix MPC setting for AN524 SRAM block
Deleted patch
1
The AN524 has three MPCs: one for the BRAM, one for the QSPI flash,
2
and one for the DDR. We incorrectly set the .mpc field in the
3
RAMInfo struct for the SRAM block to 1, giving it the same MPC we are
4
using for the QSPI. The effect of this was that the QSPI didn't get
5
mapped into the system address space at all, via an MPC or otherwise,
6
and guest programs which tried to read from the QSPI would get a bus
7
error. Correct the SRAM RAMInfo to indicate that it does not have an
8
associated MPC.
9
1
10
Fixes: 25ff112a8cc ("hw/arm/mps2-tz: Add new mps3-an524 board")
11
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
12
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
13
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
14
Message-id: 20210409150527.15053-2-peter.maydell@linaro.org
15
---
16
hw/arm/mps2-tz.c | 2 +-
17
1 file changed, 1 insertion(+), 1 deletion(-)
18
19
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
20
index XXXXXXX..XXXXXXX 100644
21
--- a/hw/arm/mps2-tz.c
22
+++ b/hw/arm/mps2-tz.c
23
@@ -XXX,XX +XXX,XX @@ static const RAMInfo an524_raminfo[] = { {
24
.name = "sram",
25
.base = 0x20000000,
26
.size = 32 * 4 * KiB,
27
- .mpc = 1,
28
+ .mpc = -1,
29
.mrindex = 1,
30
}, {
31
/* We don't model QSPI flash yet; for now expose it as simple ROM */
32
--
33
2.20.1
34
35
diff view generated by jsdifflib
[PULL 2/3] hw/arm/mps2-tz: Assert if more than one RAM is attached to an MPC
Deleted patch
1
Each board in mps2-tz.c specifies a RAMInfo[] array providing
2
information about each RAM in the board. The .mpc field of the
3
RAMInfo struct specifies which MPC, if any, the RAM is attached to.
4
We already assert if the array doesn't have any entry for an MPC, but
5
we don't diagnose the error of using the same MPC number twice (which
6
is quite easy to do by accident if copy-and-pasting structure
7
entries).
8
1
9
Enhance find_raminfo_for_mpc() so that it detects multiple entries
10
for the MPC as well as missing entries.
11
12
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
13
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
14
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
15
Message-id: 20210409150527.15053-3-peter.maydell@linaro.org
16
---
17
hw/arm/mps2-tz.c | 8 ++++++--
18
1 file changed, 6 insertions(+), 2 deletions(-)
19
20
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
21
index XXXXXXX..XXXXXXX 100644
22
--- a/hw/arm/mps2-tz.c
23
+++ b/hw/arm/mps2-tz.c
24
@@ -XXX,XX +XXX,XX @@ static const RAMInfo *find_raminfo_for_mpc(MPS2TZMachineState *mms, int mpc)
25
{
26
MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);
27
const RAMInfo *p;
28
+ const RAMInfo *found = NULL;
29
30
for (p = mmc->raminfo; p->name; p++) {
31
if (p->mpc == mpc && !(p->flags & IS_ALIAS)) {
32
- return p;
33
+ /* There should only be one entry in the array for this MPC */
34
+ g_assert(!found);
35
+ found = p;
36
}
37
}
38
/* if raminfo array doesn't have an entry for each MPC this is a bug */
39
- g_assert_not_reached();
40
+ assert(found);
41
+ return found;
42
}
43
44
static MemoryRegion *mr_for_raminfo(MPS2TZMachineState *mms,
45
--
46
2.20.1
47
48
diff view generated by jsdifflib
[PULL 3/3] sphinx: qapidoc: Wrap "If" section body in a paragraph node
Deleted patch
1
From: John Snow <jsnow@redhat.com>
2
1
3
These sections need to be wrapped in a block-level element, such as
4
Paragraph in order for them to be rendered into Texinfo correctly.
5
6
Before (e.g.):
7
8
<section ids="qapidoc-713">
9
<title>If</title>
10
<literal>defined(CONFIG_REPLICATION)</literal>
11
</section>
12
13
became:
14
15
.SS If
16
\fBdefined(CONFIG_REPLICATION)\fP.SS \fBBlockdevOptionsReplication\fP (Object)
17
...
18
19
After:
20
21
<section ids="qapidoc-713">
22
<title>If</title>
23
<paragraph>
24
<literal>defined(CONFIG_REPLICATION)</literal>
25
</paragraph>
26
</section>
27
28
becomes:
29
30
.SS If
31
.sp
32
\fBdefined(CONFIG_REPLICATION)\fP
33
.SS \fBBlockdevOptionsReplication\fP (Object)
34
...
35
36
Reported-by: Markus Armbruster <armbru@redhat.com>
37
Tested-by: Markus Armbruster <armbru@redhat.com>
38
Signed-off-by: John Snow <jsnow@redhat.com>
39
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
40
Message-id: 20210406141909.1992225-2-jsnow@redhat.com
41
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
42
---
43
docs/sphinx/qapidoc.py | 4 +++-
44
1 file changed, 3 insertions(+), 1 deletion(-)
45
46
diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py
47
index XXXXXXX..XXXXXXX 100644
48
--- a/docs/sphinx/qapidoc.py
49
+++ b/docs/sphinx/qapidoc.py
50
@@ -XXX,XX +XXX,XX @@ def _nodes_for_if_section(self, ifcond):
51
nodelist = []
52
if ifcond:
53
snode = self._make_section('If')
54
- snode += self._nodes_for_ifcond(ifcond, with_if=False)
55
+ snode += nodes.paragraph(
56
+ '', '', *self._nodes_for_ifcond(ifcond, with_if=False)
57
+ )
58
nodelist.append(snode)
59
return nodelist
60
61
--
62
2.20.1
63
64
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.