Commit 9f94f84c authored by Dong Jia Shi's avatar Dong Jia Shi Committed by Cornelia Huck
Browse files

s390x/css: handle format-0 TIC CCW correctly 



For TIC CCW, bit positions 8-32 of the format-1 CCW must contain zeros;
otherwise, a program-check condition is generated. For format-0 TIC CCWs,
bits 32-63 are ignored.

To convert TIC from format-0 CCW to format-1 CCW correctly, let's clear
bits 8-32 to guarantee compatibility.

Reviewed-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: default avatarDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent f738f296

hw/s390x/css.c

+9 −6
Original line number Diff line number Diff line
@@ -368,13 +368,16 @@ static CCW1 copy_ccw_from_guest(hwaddr addr, bool fmt1) 
        ret.cda = be32_to_cpu(tmp1.cda);

    } else {

        cpu_physical_memory_read(addr, &tmp0, sizeof(tmp0));

        if ((tmp0.cmd_code & 0x0f) == CCW_CMD_TIC) {

            ret.cmd_code = CCW_CMD_TIC;

            ret.flags = 0;

            ret.count = 0;

        } else {

            ret.cmd_code = tmp0.cmd_code;

            ret.flags = tmp0.flags;

            ret.count = be16_to_cpu(tmp0.count);

        ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16);

        if ((ret.cmd_code & 0x0f) == CCW_CMD_TIC) {

            ret.cmd_code &= 0x0f;

        }

        ret.cda = be16_to_cpu(tmp0.cda1) | (tmp0.cda0 << 16);

    }

    return ret;

}