[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 3/7] s390x/pci: rework PCI LOAD
From: |
Cornelia Huck |
Subject: |
Re: [Qemu-devel] [PATCH v2 3/7] s390x/pci: rework PCI LOAD |
Date: |
Tue, 21 Nov 2017 11:39:47 +0100 |
On Thu, 16 Nov 2017 18:51:51 +0100
Pierre Morel <address@hidden> wrote:
> Enhance the fault detection, correction of the fault reporting.
>
> Signed-off-by: Pierre Morel <address@hidden>
> Reviewed-by: Yi Min Zhao <address@hidden>
> Signed-off-by: Pierre Morel <address@hidden>
Same as last patch...
> ---
> 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 df0c8f0..cbc6421 100644
> --- a/hw/s390x/s390-pci-inst.c
> +++ b/hw/s390x/s390-pci-inst.c
> @@ -373,6 +373,11 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
> r2)
> 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");
> @@ -381,12 +386,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
> r2)
> }
>
> 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);
> @@ -395,8 +395,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
> r2)
> break;
> }
>
> - if (pcias < 6) {
> - if ((8 - (offset & 0x7)) < len) {
> + switch (pcias) {
> + case 0 ... 5:
...and here...
> + if (!len || (len > (8 - (offset & 0x7)))) {
> program_interrupt(env, PGM_OPERAND, 4);
> return 0;
> }
> @@ -407,8 +408,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
> r2)
> program_interrupt(env, PGM_OPERAND, 4);
> return 0;
> }
> - } else if (pcias == 15) {
> - if ((4 - (offset & 0x3)) < len) {
> + break;
> + case 15:
> + if (!len || (len > (4 - (offset & 0x3))) || len == 3) {
> program_interrupt(env, PGM_OPERAND, 4);
> return 0;
> }
> @@ -419,8 +421,9 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t
> r2)
> program_interrupt(env, PGM_OPERAND, 4);
> 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;
...and again here :) (good other than the nits)
[Qemu-devel] [PATCH v2 7/7] s390x/pci: search for subregion inside the BARs, Pierre Morel, 2017/11/16
[Qemu-devel] [PATCH v2 3/7] s390x/pci: rework PCI LOAD, Pierre Morel, 2017/11/16
- Re: [Qemu-devel] [PATCH v2 3/7] s390x/pci: rework PCI LOAD,
Cornelia Huck <=
[Qemu-devel] [PATCH v2 5/7] s390x/pci: move the memory region read from pcilg, Pierre Morel, 2017/11/16
[Qemu-devel] [PATCH v2 1/7] s390x/pci: factor out endianess conversion, Pierre Morel, 2017/11/16
[Qemu-devel] [PATCH v2 4/7] s390x/pci: rework PCI STORE BLOCK, Pierre Morel, 2017/11/16