From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Andrew Jeffery" <andrew@aj.id.au>,
"Helge Deller" <deller@gmx.de>, "Paul Durrant" <paul@xen.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-trivial@nongnu.org, qemu-arm@nongnu.org,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Joel Stanley" <joel@jms.id.au>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Anthony Perard" <anthony.perard@citrix.com>,
xen-devel@lists.xenproject.org,
"Richard Henderson" <rth@twiddle.net>,
qemu-ppc@nongnu.org, "Cédric Le Goater" <clg@kaod.org>
Subject: [PATCH v2 3/8] hw/pci/pci_bridge: Correct pci_bridge_io memory region size
Date: Mon, 1 Jun 2020 16:29:25 +0200 [thread overview]
Message-ID: <20200601142930.29408-4-f4bug@amsat.org> (raw)
In-Reply-To: <20200601142930.29408-1-f4bug@amsat.org>
memory_region_set_size() handle the 16 Exabytes limit by
special-casing the UINT64_MAX value. This is not a problem
for the 32-bit maximum, 4 GiB.
By using the UINT32_MAX value, the pci_bridge_io MemoryRegion
ends up missing 1 byte:
(qemu) info mtree
memory-region: pci_bridge_io
0000000000000000-00000000fffffffe (prio 0, i/o): pci_bridge_io
0000000000000060-0000000000000060 (prio 0, i/o): i8042-data
0000000000000064-0000000000000064 (prio 0, i/o): i8042-cmd
00000000000001ce-00000000000001d1 (prio 0, i/o): vbe
0000000000000378-000000000000037f (prio 0, i/o): parallel
00000000000003b4-00000000000003b5 (prio 0, i/o): vga
...
Fix by using the correct value. We now have:
memory-region: pci_bridge_io
0000000000000000-00000000ffffffff (prio 0, i/o): pci_bridge_io
0000000000000060-0000000000000060 (prio 0, i/o): i8042-data
0000000000000064-0000000000000064 (prio 0, i/o): i8042-cmd
...
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/pci/pci_bridge.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c
index 97967d12eb..3ba3203f72 100644
--- a/hw/pci/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
@@ -30,6 +30,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/units.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
#include "qemu/module.h"
@@ -381,7 +382,7 @@ void pci_bridge_initfn(PCIDevice *dev, const char *typename)
memory_region_init(&br->address_space_mem, OBJECT(br), "pci_bridge_pci", UINT64_MAX);
sec_bus->address_space_io = &br->address_space_io;
memory_region_init(&br->address_space_io, OBJECT(br), "pci_bridge_io",
- UINT32_MAX);
+ 4 * GiB);
br->windows = pci_bridge_region_init(br);
QLIST_INIT(&sec_bus->child);
QLIST_INSERT_HEAD(&parent->child, sec_bus, sibling);
--
2.21.3
next prev parent reply other threads:[~2020-06-01 14:31 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 14:29 [PATCH v2 0/8] hw: Fix some incomplete memory region size Philippe Mathieu-Daudé
2020-06-01 14:29 ` [PATCH v2 1/8] hw/arm/aspeed: Correct DRAM container " Philippe Mathieu-Daudé
2020-06-01 16:06 ` Cédric Le Goater
2020-06-01 23:34 ` Richard Henderson
2020-06-09 17:29 ` Laurent Vivier
2020-06-01 14:29 ` [PATCH v2 2/8] hw/pci-host/prep: Correct RAVEN bus bridge memory " Philippe Mathieu-Daudé
2020-06-01 23:35 ` Richard Henderson
2020-06-01 14:29 ` Philippe Mathieu-Daudé [this message]
2020-06-01 23:35 ` [PATCH v2 3/8] hw/pci/pci_bridge: Correct pci_bridge_io " Richard Henderson
2020-06-01 14:29 ` [PATCH v2 4/8] hw/pci/pci_bridge: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2020-06-01 23:36 ` Richard Henderson
2020-06-01 14:29 ` [PATCH v2 5/8] hw/pci-host: " Philippe Mathieu-Daudé
2020-06-01 23:36 ` Richard Henderson
2020-06-01 14:29 ` [PATCH v2 6/8] hw/hppa/dino: " Philippe Mathieu-Daudé
2020-06-01 23:37 ` Richard Henderson
2020-06-09 17:30 ` Laurent Vivier
2020-06-01 14:29 ` [PATCH v2 7/8] hw/i386/xen/xen-hvm: " Philippe Mathieu-Daudé
2020-06-01 15:24 ` Paul Durrant
2020-06-01 23:37 ` Richard Henderson
2020-06-09 17:31 ` Laurent Vivier
2020-06-01 14:29 ` [PATCH v2 8/8] target/i386/cpu: " Philippe Mathieu-Daudé
2020-06-01 23:37 ` Richard Henderson
2020-06-09 17:33 ` Laurent Vivier
2020-06-02 3:49 ` [PATCH v2 0/8] hw: Fix some incomplete memory region size Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200601142930.29408-4-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=andrew@aj.id.au \
--cc=anthony.perard@citrix.com \
--cc=clg@kaod.org \
--cc=deller@gmx.de \
--cc=ehabkost@redhat.com \
--cc=hpoussin@reactos.org \
--cc=joel@jms.id.au \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=rth@twiddle.net \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).