A few last patches to go in for rc3...

The following changes since commit c1e90def01bdb8fcbdbebd9d1eaa8e4827ece620:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210412' into staging (2021-04-12 12:12:09 +0100)

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

for you to fetch changes up to 2d18b4ca023ca1a3aee18064251d6e6e1084f3eb:

sphinx: qapidoc: Wrap "If" section body in a paragraph node (2021-04-13 10:14:58 +0100)

* Fix MPC setting for AN524 SRAM block

* sphinx: qapidoc: Wrap "If" section body in a paragraph node

John Snow (1):

sphinx: qapidoc: Wrap "If" section body in a paragraph node

Peter Maydell (2):

hw/arm/mps2-tz: Fix MPC setting for AN524 SRAM block

hw/arm/mps2-tz: Assert if more than one RAM is attached to an MPC

docs/sphinx/qapidoc.py | 4 +++-

hw/arm/mps2-tz.c | 10 +++++++---

2 files changed, 10 insertions(+), 4 deletions(-)

The AN524 has three MPCs: one for the BRAM, one for the QSPI flash,

and one for the DDR. We incorrectly set the .mpc field in the

RAMInfo struct for the SRAM block to 1, giving it the same MPC we are

using for the QSPI. The effect of this was that the QSPI didn't get

mapped into the system address space at all, via an MPC or otherwise,

and guest programs which tried to read from the QSPI would get a bus

error. Correct the SRAM RAMInfo to indicate that it does not have an

associated MPC.

Fixes: 25ff112a8cc ("hw/arm/mps2-tz: Add new mps3-an524 board")

hw/arm/mps2-tz.c | 2 +-

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c

--- a/hw/arm/mps2-tz.c

+++ b/hw/arm/mps2-tz.c

@@ -XXX,XX +XXX,XX @@ static const RAMInfo an524_raminfo[] = { {

.name = "sram",

.base = 0x20000000,

.size = 32 * 4 * KiB,

- .mpc = 1,

+ .mpc = -1,

.mrindex = 1,

}, {

/* We don't model QSPI flash yet; for now expose it as simple ROM */

2.20.1

Each board in mps2-tz.c specifies a RAMInfo[] array providing

information about each RAM in the board. The .mpc field of the

RAMInfo struct specifies which MPC, if any, the RAM is attached to.

We already assert if the array doesn't have any entry for an MPC, but

we don't diagnose the error of using the same MPC number twice (which

is quite easy to do by accident if copy-and-pasting structure

entries).

Enhance find_raminfo_for_mpc() so that it detects multiple entries

for the MPC as well as missing entries.

hw/arm/mps2-tz.c | 8 ++++++--

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

diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c

--- a/hw/arm/mps2-tz.c

+++ b/hw/arm/mps2-tz.c

@@ -XXX,XX +XXX,XX @@ static const RAMInfo *find_raminfo_for_mpc(MPS2TZMachineState *mms, int mpc)

{

MPS2TZMachineClass *mmc = MPS2TZ_MACHINE_GET_CLASS(mms);

const RAMInfo *p;

+ const RAMInfo *found = NULL;

for (p = mmc->raminfo; p->name; p++) {

if (p->mpc == mpc && !(p->flags & IS_ALIAS)) {

- return p;

+ /* There should only be one entry in the array for this MPC */

+ g_assert(!found);

+ found = p;

/* if raminfo array doesn't have an entry for each MPC this is a bug */

- g_assert_not_reached();

+ assert(found);

+ return found;

}

static MemoryRegion *mr_for_raminfo(MPS2TZMachineState *mms,

2.20.1

From: John Snow <jsnow@redhat.com>

These sections need to be wrapped in a block-level element, such as

Paragraph in order for them to be rendered into Texinfo correctly.

Before (e.g.):

<section ids="qapidoc-713">

<title>If</title>

<literal>defined(CONFIG_REPLICATION)</literal>

</section>

became:

.SS If

\fBdefined(CONFIG_REPLICATION)\fP.SS \fBBlockdevOptionsReplication\fP (Object)

...

After:

<section ids="qapidoc-713">

<title>If</title>

<paragraph>

<literal>defined(CONFIG_REPLICATION)</literal>

</paragraph>

</section>

becomes:

.SS If

.sp

\fBdefined(CONFIG_REPLICATION)\fP

.SS \fBBlockdevOptionsReplication\fP (Object)

...

Reported-by: Markus Armbruster <armbru@redhat.com>

Tested-by: Markus Armbruster <armbru@redhat.com>

Signed-off-by: John Snow <jsnow@redhat.com>

docs/sphinx/qapidoc.py | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/sphinx/qapidoc.py b/docs/sphinx/qapidoc.py

--- a/docs/sphinx/qapidoc.py

+++ b/docs/sphinx/qapidoc.py

@@ -XXX,XX +XXX,XX @@ def _nodes_for_if_section(self, ifcond):

nodelist = []

if ifcond:

snode = self._make_section('If')

- snode += self._nodes_for_ifcond(ifcond, with_if=False)

+ snode += nodes.paragraph(

+ '', '', *self._nodes_for_ifcond(ifcond, with_if=False)

+ )

nodelist.append(snode)

return nodelist

2.20.1