[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/2] s390x/pci: fix pcistb length
From: |
Matthew Rosato |
Subject: |
[PATCH v2 1/2] s390x/pci: fix pcistb length |
Date: |
Thu, 17 Dec 2020 17:16:36 -0500 |
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>
---
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 d9e1e29..e230293 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)) {
--
1.8.3.1
- [PATCH v2 0/2] s390x/pci: some pcistb fixes, Matthew Rosato, 2020/12/17
- [PATCH v2 1/2] s390x/pci: fix pcistb length,
Matthew Rosato <=
- [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Matthew Rosato, 2020/12/17
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Thomas Huth, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Pierre Morel, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Cornelia Huck, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Pierre Morel, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Cornelia Huck, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Pierre Morel, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Cornelia Huck, 2020/12/18
- Re: [PATCH v2 2/2] s390x/pci: Fix memory_region_access_valid call, Pierre Morel, 2020/12/18