* [PULL v3 0/3] Trivial branch patches
@ 2019-11-06 16:24 Laurent Vivier
2019-11-06 16:24 ` [PULL v3 1/3] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers Laurent Vivier
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Laurent Vivier @ 2019-11-06 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Laurent Vivier
The following changes since commit 36609b4fa36f0ac934874371874416f7533a5408:
Merge remote-tracking branch 'remotes/palmer/tags/palmer-for-master-4.2-sf1' into staging (2019-11-02 17:59:03 +0000)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
for you to fetch changes up to df59feb197cda31a8b807c13bf509259db9e018f:
global: Squash 'the the' (2019-11-06 17:19:40 +0100)
----------------------------------------------------------------
Trivial fixes (20191105-v3)
v3: remove disas/libvixl/vixl/invalset.h changes
v2: remove patch from Greg that has lines with more than 80 columns
----------------------------------------------------------------
Dr. David Alan Gilbert (1):
global: Squash 'the the'
Philippe Mathieu-Daudé (2):
hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers
hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses
docs/interop/pr-helper.rst | 2 +-
docs/specs/ppc-spapr-hotplug.txt | 2 +-
docs/specs/ppc-xive.rst | 2 +-
docs/specs/tpm.txt | 2 +-
hw/misc/grlib_ahb_apb_pnp.c | 12 ++++++++++++
include/hw/xen/interface/io/blkif.h | 2 +-
scripts/dump-guest-memory.py | 2 +-
7 files changed, 18 insertions(+), 6 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL v3 1/3] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers
2019-11-06 16:24 [PULL v3 0/3] Trivial branch patches Laurent Vivier
@ 2019-11-06 16:24 ` Laurent Vivier
2019-11-06 16:24 ` [PULL v3 2/3] hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses Laurent Vivier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2019-11-06 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: KONRAD Frederic, Philippe Mathieu-Daudé, Laurent Vivier
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Guests can crash QEMU when writting to PnP registers:
$ echo 'writeb 0x800ff042 69' | qemu-system-sparc -M leon3_generic -S -bios /etc/magic -qtest stdio
[I 1571938309.932255] OPENED
[R +0.063474] writeb 0x800ff042 69
Segmentation fault (core dumped)
(gdb) bt
#0 0x0000000000000000 in ()
#1 0x0000555f4bcdf0bc in memory_region_write_with_attrs_accessor (mr=0x555f4d7be8c0, addr=66, value=0x7fff07d00f08, size=1, shift=0, mask=255, attrs=...) at memory.c:503
#2 0x0000555f4bcdf185 in access_with_adjusted_size (addr=66, value=0x7fff07d00f08, size=1, access_size_min=1, access_size_max=4, access_fn=0x555f4bcdeff4 <memory_region_write_with_attrs_accessor>, mr=0x555f4d7be8c0, attrs=...) at memory.c:539
#3 0x0000555f4bce2243 in memory_region_dispatch_write (mr=0x555f4d7be8c0, addr=66, data=69, op=MO_8, attrs=...) at memory.c:1489
#4 0x0000555f4bc80b20 in flatview_write_continue (fv=0x555f4d92c400, addr=2148528194, attrs=..., buf=0x7fff07d01120 "E", len=1, addr1=66, l=1, mr=0x555f4d7be8c0) at exec.c:3161
#5 0x0000555f4bc80c65 in flatview_write (fv=0x555f4d92c400, addr=2148528194, attrs=..., buf=0x7fff07d01120 "E", len=1) at exec.c:3201
#6 0x0000555f4bc80fb0 in address_space_write (as=0x555f4d7aa460, addr=2148528194, attrs=..., buf=0x7fff07d01120 "E", len=1) at exec.c:3291
#7 0x0000555f4bc8101d in address_space_rw (as=0x555f4d7aa460, addr=2148528194, attrs=..., buf=0x7fff07d01120 "E", len=1, is_write=true) at exec.c:3301
#8 0x0000555f4bcdb388 in qtest_process_command (chr=0x555f4c2ed7e0 <qtest_chr>, words=0x555f4db0c5d0) at qtest.c:432
Instead of crashing, log the access as unimplemented.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20191025110114.27091-2-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/misc/grlib_ahb_apb_pnp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c
index 7338461694c9..f3c015d2c35f 100644
--- a/hw/misc/grlib_ahb_apb_pnp.c
+++ b/hw/misc/grlib_ahb_apb_pnp.c
@@ -22,6 +22,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/log.h"
#include "hw/sysbus.h"
#include "hw/misc/grlib_ahb_apb_pnp.h"
@@ -231,8 +232,15 @@ static uint64_t grlib_apb_pnp_read(void *opaque, hwaddr offset, unsigned size)
return apb_pnp->regs[offset >> 2];
}
+static void grlib_apb_pnp_write(void *opaque, hwaddr addr,
+ uint64_t val, unsigned size)
+{
+ qemu_log_mask(LOG_UNIMP, "%s not implemented\n", __func__);
+}
+
static const MemoryRegionOps grlib_apb_pnp_ops = {
.read = grlib_apb_pnp_read,
+ .write = grlib_apb_pnp_write,
.endianness = DEVICE_BIG_ENDIAN,
};
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL v3 2/3] hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses
2019-11-06 16:24 [PULL v3 0/3] Trivial branch patches Laurent Vivier
2019-11-06 16:24 ` [PULL v3 1/3] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers Laurent Vivier
@ 2019-11-06 16:24 ` Laurent Vivier
2019-11-06 16:24 ` [PULL v3 3/3] global: Squash 'the the' Laurent Vivier
2019-11-07 17:13 ` [PULL v3 0/3] Trivial branch patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2019-11-06 16:24 UTC (permalink / raw)
To: qemu-devel
Cc: KONRAD Frederic, Philippe Mathieu-Daudé,
Laurent Vivier, Jiri Gaisler
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The Plug & Play region of the AHB/APB bridge can be accessed
by various word size, however the implementation is clearly
restricted to 32-bit:
static uint64_t grlib_apb_pnp_read(void *opaque, hwaddr offset, unsigned size)
{
APBPnp *apb_pnp = GRLIB_APB_PNP(opaque);
return apb_pnp->regs[offset >> 2];
}
Set the MemoryRegionOps::impl min/max fields to 32-bit, so
memory.c::access_with_adjusted_size() can adjust when the
access is not 32-bit.
This is required to run RTEMS on leon3, the grlib scanning
functions do byte accesses.
Reported-by: Jiri Gaisler <jiri@gaisler.se>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20191025110114.27091-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/misc/grlib_ahb_apb_pnp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/misc/grlib_ahb_apb_pnp.c b/hw/misc/grlib_ahb_apb_pnp.c
index f3c015d2c35f..e230e2536361 100644
--- a/hw/misc/grlib_ahb_apb_pnp.c
+++ b/hw/misc/grlib_ahb_apb_pnp.c
@@ -242,6 +242,10 @@ static const MemoryRegionOps grlib_apb_pnp_ops = {
.read = grlib_apb_pnp_read,
.write = grlib_apb_pnp_write,
.endianness = DEVICE_BIG_ENDIAN,
+ .impl = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
};
static void grlib_apb_pnp_realize(DeviceState *dev, Error **errp)
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PULL v3 3/3] global: Squash 'the the'
2019-11-06 16:24 [PULL v3 0/3] Trivial branch patches Laurent Vivier
2019-11-06 16:24 ` [PULL v3 1/3] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers Laurent Vivier
2019-11-06 16:24 ` [PULL v3 2/3] hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses Laurent Vivier
@ 2019-11-06 16:24 ` Laurent Vivier
2019-11-07 17:13 ` [PULL v3 0/3] Trivial branch patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Vivier @ 2019-11-06 16:24 UTC (permalink / raw)
To: qemu-devel
Cc: Philippe Mathieu-Daudé,
Alex Bennée, Dr. David Alan Gilbert, Laurent Vivier
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
'the' has a tendency to double up; squash them back down.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191104185202.102504-1-dgilbert@redhat.com>
[lv: removed disas/libvixl/vixl/invalset.h change]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
docs/interop/pr-helper.rst | 2 +-
docs/specs/ppc-spapr-hotplug.txt | 2 +-
docs/specs/ppc-xive.rst | 2 +-
docs/specs/tpm.txt | 2 +-
include/hw/xen/interface/io/blkif.h | 2 +-
scripts/dump-guest-memory.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/interop/pr-helper.rst b/docs/interop/pr-helper.rst
index 9f76d5bcf98f..e926f0a6c9cb 100644
--- a/docs/interop/pr-helper.rst
+++ b/docs/interop/pr-helper.rst
@@ -10,7 +10,7 @@ can delegate implementation of persistent reservations to an external
restricting access to block devices to specific initiators in a shared
storage setup.
-For a more detailed reference please refer the the SCSI Primary
+For a more detailed reference please refer to the SCSI Primary
Commands standard, specifically the section on Reservations and the
"PERSISTENT RESERVE IN" and "PERSISTENT RESERVE OUT" commands.
diff --git a/docs/specs/ppc-spapr-hotplug.txt b/docs/specs/ppc-spapr-hotplug.txt
index cc7833108e12..859d52cce6c8 100644
--- a/docs/specs/ppc-spapr-hotplug.txt
+++ b/docs/specs/ppc-spapr-hotplug.txt
@@ -385,7 +385,7 @@ Each LMB list entry consists of the following elements:
is used to retrieve the right associativity list to be used for this
LMB.
- A 32bit flags word. The bit at bit position 0x00000008 defines whether
- the LMB is assigned to the the partition as of boot time.
+ the LMB is assigned to the partition as of boot time.
ibm,dynamic-memory-v2
diff --git a/docs/specs/ppc-xive.rst b/docs/specs/ppc-xive.rst
index 148d57eb6ab2..83d43f658b90 100644
--- a/docs/specs/ppc-xive.rst
+++ b/docs/specs/ppc-xive.rst
@@ -163,7 +163,7 @@ Interrupt Priority Register (PIPR) is also updated using the IPB. This
register represent the priority of the most favored pending
notification.
-The PIPR is then compared to the the Current Processor Priority
+The PIPR is then compared to the Current Processor Priority
Register (CPPR). If it is more favored (numerically less than), the
CPU interrupt line is raised and the EO bit of the Notification Source
Register (NSR) is updated to notify the presence of an exception for
diff --git a/docs/specs/tpm.txt b/docs/specs/tpm.txt
index 5d8c26b1adba..9c8cca042da8 100644
--- a/docs/specs/tpm.txt
+++ b/docs/specs/tpm.txt
@@ -89,7 +89,7 @@ TPM upon reboot. The PPI specification defines the operation requests and the
actions the firmware has to take. The system administrator passes the operation
request number to the firmware through an ACPI interface which writes this
number to a memory location that the firmware knows. Upon reboot, the firmware
-finds the number and sends commands to the the TPM. The firmware writes the TPM
+finds the number and sends commands to the TPM. The firmware writes the TPM
result code and the operation request number to a memory location that ACPI can
read from and pass the result on to the administrator.
diff --git a/include/hw/xen/interface/io/blkif.h b/include/hw/xen/interface/io/blkif.h
index 8b1be50ce81e..d07fa1e07822 100644
--- a/include/hw/xen/interface/io/blkif.h
+++ b/include/hw/xen/interface/io/blkif.h
@@ -341,7 +341,7 @@
* access (even when it should be read-only). If the frontend hits the
* maximum number of allowed persistently mapped grants, it can fallback
* to non persistent mode. This will cause a performance degradation,
- * since the the backend driver will still try to map those grants
+ * since the backend driver will still try to map those grants
* persistently. Since the persistent grants protocol is compatible with
* the previous protocol, a frontend driver can choose to work in
* persistent mode even when the backend doesn't support it.
diff --git a/scripts/dump-guest-memory.py b/scripts/dump-guest-memory.py
index 2c587cbefc57..9371e4581308 100644
--- a/scripts/dump-guest-memory.py
+++ b/scripts/dump-guest-memory.py
@@ -170,7 +170,7 @@ class ELF(object):
self.ehdr.e_phnum += 1
def to_file(self, elf_file):
- """Writes all ELF structures to the the passed file.
+ """Writes all ELF structures to the passed file.
Structure:
Ehdr
--
2.21.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL v3 0/3] Trivial branch patches
2019-11-06 16:24 [PULL v3 0/3] Trivial branch patches Laurent Vivier
` (2 preceding siblings ...)
2019-11-06 16:24 ` [PULL v3 3/3] global: Squash 'the the' Laurent Vivier
@ 2019-11-07 17:13 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2019-11-07 17:13 UTC (permalink / raw)
To: Laurent Vivier; +Cc: QEMU Developers
On Wed, 6 Nov 2019 at 16:26, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 36609b4fa36f0ac934874371874416f7533a5408:
>
> Merge remote-tracking branch 'remotes/palmer/tags/palmer-for-master-4.2-sf1' into staging (2019-11-02 17:59:03 +0000)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-branch-pull-request
>
> for you to fetch changes up to df59feb197cda31a8b807c13bf509259db9e018f:
>
> global: Squash 'the the' (2019-11-06 17:19:40 +0100)
>
> ----------------------------------------------------------------
> Trivial fixes (20191105-v3)
>
> v3: remove disas/libvixl/vixl/invalset.h changes
> v2: remove patch from Greg that has lines with more than 80 columns
>
> ----------------------------------------------------------------
>
> Dr. David Alan Gilbert (1):
> global: Squash 'the the'
>
> Philippe Mathieu-Daudé (2):
> hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers
> hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-11-07 17:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 16:24 [PULL v3 0/3] Trivial branch patches Laurent Vivier
2019-11-06 16:24 ` [PULL v3 1/3] hw/misc/grlib_ahb_apb_pnp: Avoid crash when writing to PnP registers Laurent Vivier
2019-11-06 16:24 ` [PULL v3 2/3] hw/misc/grlib_ahb_apb_pnp: Fix 8-bit accesses Laurent Vivier
2019-11-06 16:24 ` [PULL v3 3/3] global: Squash 'the the' Laurent Vivier
2019-11-07 17:13 ` [PULL v3 0/3] Trivial branch patches Peter Maydell
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).