From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Matthew Rosato <mjrosato@linux.ibm.com>,
Pierre Morel <pmorel@linux.ibm.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org
Subject: [PULL 12/14] s390x/pci: fix pcistb length
Date: Tue, 22 Dec 2020 11:45:01 +0100 [thread overview]
Message-ID: <20201222104503.224510-13-cohuck@redhat.com> (raw)
In-Reply-To: <20201222104503.224510-1-cohuck@redhat.com>
From: Matthew Rosato <mjrosato@linux.ibm.com>
In pcistb_service_call, we are grabbing 8 bits from a guest register to
indicate the length of the store operation -- but per the architecture
the length is actually defined by 13 bits of the guest register.
Fixes: 863f6f52b7 ("s390: implement pci instructions")
Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <1608243397-29428-2-git-send-email-mjrosato@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
hw/s390x/s390-pci-inst.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index d9e1e29f1e29..e23029399886 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -755,7 +755,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,
int i;
uint32_t fh;
uint8_t pcias;
- uint8_t len;
+ uint16_t len;
uint8_t buffer[128];
if (env->psw.mask & PSW_MASK_PSTATE) {
@@ -765,7 +765,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,
fh = env->regs[r1] >> 32;
pcias = (env->regs[r1] >> 16) & 0xf;
- len = env->regs[r1] & 0xff;
+ len = env->regs[r1] & 0x1fff;
offset = env->regs[r3];
if (!(fh & FH_MASK_ENABLE)) {
--
2.26.2
next prev parent reply other threads:[~2020-12-22 10:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 10:44 [PULL 00/14] s390x update Cornelia Huck
2020-12-22 10:44 ` [PULL 01/14] s390x: pv: Fence additional unavailable SCLP facilities for PV guests Cornelia Huck
2020-12-22 10:44 ` [PULL 02/14] MAINTAINERS: move my git tree to gitlab Cornelia Huck
2020-12-22 10:44 ` [PULL 03/14] qga/commands-posix: Send CCW address on s390x with the fsinfo data Cornelia Huck
2020-12-22 10:44 ` [PULL 04/14] target/s390x: Improve cc computation for ADD LOGICAL Cornelia Huck
2020-12-22 10:44 ` [PULL 05/14] target/s390x: Improve ADD LOGICAL WITH CARRY Cornelia Huck
2020-12-22 10:44 ` [PULL 06/14] target/s390x: Improve cc computation for SUBTRACT LOGICAL Cornelia Huck
2020-12-22 10:44 ` [PULL 07/14] target/s390x: Improve SUB LOGICAL WITH BORROW Cornelia Huck
2020-12-22 10:44 ` [PULL 08/14] tests/acceptance: test hot(un)plug of ccw devices Cornelia Huck
2020-12-22 10:44 ` [PULL 09/14] tests/acceptance: Extract the code to clear dmesg and wait for CRW reports Cornelia Huck
2020-12-22 10:44 ` [PULL 10/14] tests/acceptance: Test virtio-rng on s390 via /dev/hwrng Cornelia Huck
2020-12-22 10:45 ` [PULL 11/14] tests/acceptance: Test the virtio-balloon device on s390x Cornelia Huck
2020-12-22 10:45 ` Cornelia Huck [this message]
2020-12-22 10:45 ` [PULL 13/14] s390x/pci: Fix memory_region_access_valid call Cornelia Huck
2020-12-22 10:45 ` [PULL 14/14] tests/acceptance: Add a test with the Fedora 31 kernel and initrd Cornelia Huck
2021-01-01 19:57 ` [PULL 00/14] s390x update Peter Maydell
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=20201222104503.224510-13-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=mjrosato@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=pmorel@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.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).