ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/pci: fix pcistb length 

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>
This commit is contained in:
Matthew Rosato 2020-12-17 17:16:36 -05:00 committed by Cornelia Huck
parent d986bc4a1c
commit 704d7a2304
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/s390x/s390-pci-inst.c
View File

@ -755,7 +755,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,
int i; int i;
uint32_t fh; uint32_t fh;
uint8_t pcias; uint8_t pcias;
uint8_t len; uint16_t len;
uint8_t buffer[128]; uint8_t buffer[128];
if (env->psw.mask & PSW_MASK_PSTATE) { 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; fh = env->regs[r1] >> 32;
pcias = (env->regs[r1] >> 16) & 0xf; pcias = (env->regs[r1] >> 16) & 0xf;
len = env->regs[r1] & 0xff; len = env->regs[r1] & 0x1fff;
offset = env->regs[r3]; offset = env->regs[r3];
if (!(fh & FH_MASK_ENABLE)) { if (!(fh & FH_MASK_ENABLE)) {