mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/pci: rework PCI STORE

Browse Source 
Enhance the fault detection, correction of the fault reporting.

Signed-off-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Message-Id: <1512046530-17773-3-git-send-email-pmorel@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Pierre Morel 2017-11-30 13:55:25 +01:00 committed by Cornelia Huck
parent c748814b20
commit 7645b9a794
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,6 +474,12 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
pcias = (env->regs[r2] >> 16) & 0xf; pcias = (env->regs[r2] >> 16) & 0xf;
len = env->regs[r2] & 0xf; len = env->regs[r2] & 0xf;
offset = env->regs[r2 + 1]; offset = env->regs[r2 + 1];
data = env->regs[r1];
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); pbdev = s390_pci_find_dev_by_fh(s390_get_phb(), fh);
if (!pbdev) { if (!pbdev) {
@ -483,12 +489,10 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
} }
switch (pbdev->state) { switch (pbdev->state) {
case ZPCI_FS_RESERVED: /* ZPCI_FS_RESERVED, ZPCI_FS_STANDBY and ZPCI_FS_DISABLED
case ZPCI_FS_STANDBY: * are already covered by the FH_MASK_ENABLE check above
case ZPCI_FS_DISABLED: */
case ZPCI_FS_PERMANENT_ERROR: case ZPCI_FS_PERMANENT_ERROR:
setcc(cpu, ZPCI_PCI_LS_INVAL_HANDLE);
return 0;
case ZPCI_FS_ERROR: case ZPCI_FS_ERROR:
setcc(cpu, ZPCI_PCI_LS_ERR); setcc(cpu, ZPCI_PCI_LS_ERR);
s390_set_status_code(env, r2, ZPCI_PCI_ST_BLOCKED); s390_set_status_code(env, r2, ZPCI_PCI_ST_BLOCKED);
@ -497,9 +501,13 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
break; break;
} }
data = env->regs[r1]; switch (pcias) {
if (pcias < 6) { /* A ZPCI PCI card may use any BAR from BAR 0 to BAR 5 */
if ((8 - (offset & 0x7)) < len) { case ZPCI_IO_BAR_MIN...ZPCI_IO_BAR_MAX:
/* Check length:
* A length of 0 is invalid and length should not cross a double word
*/
if (!len || (len > (8 - (offset & 0x7)))) {
s390_program_interrupt(env, PGM_OPERAND, 4, ra); s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0; return 0;
} }
@ -517,20 +525,21 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra)
s390_program_interrupt(env, PGM_OPERAND, 4, ra); s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0; return 0;
} }
} else if (pcias == 15) { break;
if ((4 - (offset & 0x3)) < len) { case ZPCI_CONFIG_BAR:
/* ZPCI uses the pseudo BAR number 15 as configuration space */
/* possible access lengths are 1,2,4 and must not cross a word */
if (!len || (len > (4 - (offset & 0x3))) || len == 3) {
s390_program_interrupt(env, PGM_OPERAND, 4, ra); s390_program_interrupt(env, PGM_OPERAND, 4, ra);
return 0; return 0;
} }
if (zpci_endian_swap(&data, len)) { /* len = 1,2,4 so we do not need to test */
s390_program_interrupt(env, PGM_OPERAND, 4, ra); zpci_endian_swap(&data, len);
return 0;
}
pci_host_config_write_common(pbdev->pdev, offset, pci_host_config_write_common(pbdev->pdev, offset,
pci_config_size(pbdev->pdev), pci_config_size(pbdev->pdev),
data, len); data, len);
} else { break;
default:
DPRINTF("pcistg invalid space\n"); DPRINTF("pcistg invalid space\n");
setcc(cpu, ZPCI_PCI_LS_ERR); setcc(cpu, ZPCI_PCI_LS_ERR);
s390_set_status_code(env, r2, ZPCI_PCI_ST_INVAL_AS); s390_set_status_code(env, r2, ZPCI_PCI_ST_INVAL_AS);

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

@ -304,4 +304,8 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar, int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar,
uintptr_t ra); uintptr_t ra);
#define ZPCI_IO_BAR_MIN 0
#define ZPCI_IO_BAR_MAX 5
#define ZPCI_CONFIG_BAR 15
#endif #endif