Commit 8cbd6aab authored by Pierre Morel's avatar Pierre Morel Committed by Cornelia Huck
Browse files

s390x/pci: rework PCI LOAD 



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-4-git-send-email-pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 7645b9a7

hw/s390x/s390-pci-inst.c

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