Commit 7645b9a7 authored by Pierre Morel's avatar Pierre Morel Committed by Cornelia Huck
Browse files

s390x/pci: rework PCI STORE 



Enhance the fault detection, correction of the fault reporting.

Signed-off-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Message-Id: <1512046530-17773-3-git-send-email-pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent c748814b

hw/s390x/s390-pci-inst.c

+25 −16
Original line number Diff line number Diff line
@@ -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;

    len = env->regs[r2] & 0xf;

    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);

    if (!pbdev) {
@@ -483,12 +489,10 @@ int pcistg_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:

    /* ZPCI_FS_RESERVED, ZPCI_FS_STANDBY and ZPCI_FS_DISABLED

     * are already covered by the FH_MASK_ENABLE check above

     */

    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);
@@ -497,9 +501,13 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra) 
        break;

    }



    data = env->regs[r1];

    if (pcias < 6) {

        if ((8 - (offset & 0x7)) < len) {

    switch (pcias) {

        /* A ZPCI PCI card may use any BAR from BAR 0 to BAR 5 */

    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);

            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);

            return 0;

        }

    } else if (pcias == 15) {

        if ((4 - (offset & 0x3)) < len) {

            s390_program_interrupt(env, PGM_OPERAND, 4, ra);

            return 0;

        }

        if (zpci_endian_swap(&data, len)) {

        break;

    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);

            return 0;

        }



        /* len = 1,2,4 so we do not need to test */

        zpci_endian_swap(&data, len);

        pci_host_config_write_common(pbdev->pdev, offset,

                                     pci_config_size(pbdev->pdev),

                                     data, len);

    } else {

        break;

    default:

        DPRINTF("pcistg invalid space\n");

        setcc(cpu, ZPCI_PCI_LS_ERR);

        s390_set_status_code(env, r2, ZPCI_PCI_ST_INVAL_AS);

hw/s390x/s390-pci-inst.h

+4 −0
Original line number Diff line number Diff line
@@ -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,

                         uintptr_t ra);



#define ZPCI_IO_BAR_MIN 0

#define ZPCI_IO_BAR_MAX 5

#define ZPCI_CONFIG_BAR 15



#endif