[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 24/46] s390x/pci: rework PCI LOAD
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL 24/46] s390x/pci: rework PCI LOAD |
Date: |
Thu, 14 Dec 2017 18:09:42 +0100 |
From: Pierre Morel <address@hidden>
Enhance the fault detection, correction of the fault reporting.
Signed-off-by: Pierre Morel <address@hidden>
Reviewed-by: Yi Min Zhao <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-inst.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 66d191f57f..48ccf2289e 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -377,6 +377,11 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
r2, uintptr_t ra)
len = env->regs[r2] & 0xf;
offset = env->regs[r2 + 1];
+ if (!(fh & FH_MASK_ENABLE)) {
+ setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);
+ return 0;
+ }
+
pbdev = s390_pci_find_dev_by_fh(s390_get_phb(), fh);
if (!pbdev) {
DPRINTF("pcilg no pci dev\n");
@@ -385,12 +390,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
r2, uintptr_t ra)
}
switch (pbdev->state) {
- case ZPCI_FS_RESERVED:
- case ZPCI_FS_STANDBY:
- case ZPCI_FS_DISABLED:
case ZPCI_FS_PERMANENT_ERROR:
- setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);
- return 0;
case ZPCI_FS_ERROR:
setcc(cpu, ZPCI_PCI_LS_ERR);
s390_set_status_code(env, r2, ZPCI_PCI_ST_BLOCKED);
@@ -399,8 +399,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
r2, uintptr_t ra)
break;
}
- if (pcias < 6) {
- if ((8 - (offset & 0x7)) < len) {
+ switch (pcias) {
+ case ZPCI_IO_BAR_MIN...ZPCI_IO_BAR_MAX:
+ if (!len || (len > (8 - (offset & 0x7)))) {
s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0;
}
@@ -411,8 +412,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
r2, uintptr_t ra)
s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0;
}
- } else if (pcias == 15) {
- if ((4 - (offset & 0x3)) < len) {
+ break;
+ case ZPCI_CONFIG_BAR:
+ if (!len || (len > (4 - (offset & 0x3))) || len == 3) {
s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0;
}
@@ -423,8 +425,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
r2, uintptr_t ra)
s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0;
}
- } else {
- DPRINTF("invalid space\n");
+ break;
+ default:
+ DPRINTF("pcilg invalid space\n");
setcc(cpu, ZPCI_PCI_LS_ERR);
s390_set_status_code(env, r2, ZPCI_PCI_ST_INVAL_AS);
return 0;
--
2.13.6
- [qemu-s390x] [PULL 14/46] s390x/tcg: io instructions don't need potential_page_fault(), (continued)
- [qemu-s390x] [PULL 14/46] s390x/tcg: io instructions don't need potential_page_fault(), Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 15/46] s390x/tcg: use s390_program_interrupt() in SCLP Service Call, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 16/46] s390x/tcg: use s390_program_interrupt() in DIAG, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 17/46] s390x/tcg: use s390_program_interrupt() in per_check_exception(), Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 18/46] s390x/tcg: use s390_program_interrupt() in SACF, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 19/46] s390x/tcg: use s390_program_interrupt() in STSI, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 20/46] s390x/tcg: drop program_interrupt(), Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 21/46] s390x/tcg: drop potential_page_fault(), Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 22/46] s390x/pci: factor out endianess conversion, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 23/46] s390x/pci: rework PCI STORE, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 24/46] s390x/pci: rework PCI LOAD,
Cornelia Huck <=
- [qemu-s390x] [PULL 25/46] s390x/pci: rework PCI STORE BLOCK, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 26/46] s390x/pci: move the memory region read from pcilg, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 27/46] s390x/pci: move the memory region write from pcistg, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 28/46] s390x/pci: search for subregion inside the BARs, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 29/46] s390x/css: unrestrict cssids, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 30/46] s390x: deprecate s390-squash-mcss machine prop, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 31/46] s390x/css: attach css bridge, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 32/46] s390x/kvm: factor out build_channel_report_mcic() into cpu.h, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 33/46] s390x/tcg: fix and cleanup mcck injection, Cornelia Huck, 2017/12/14
- [qemu-s390x] [PULL 34/46] s390x/tcg: implement SET CLOCK PROGRAMMABLE FIELD, Cornelia Huck, 2017/12/14