Commit 63d8b5ac authored by Cornelia Huck's avatar Cornelia Huck Committed by Thomas Huth
Browse files

s390-ccw: force diag 308 subcode to unsigned long 



We currently pass an integer as the subcode parameter. However,
the upper bits of the register containing the subcode need to
be 0, which is not guaranteed unless we explicitly specify the
subcode to be an unsigned long value.

Fixes: d046c51d ("pc-bios/s390-ccw: Get device address via diag 308/6")
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Tested-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent c4942ee9

pc-bios/s390-ccw/iplb.h

+2 −1
Original line number Diff line number Diff line
@@ -101,10 +101,11 @@ static inline bool manage_iplb(IplParameterBlock *iplb, bool store) 
{

    register unsigned long addr asm("0") = (unsigned long) iplb;

    register unsigned long rc asm("1") = 0;

    unsigned long subcode = store ? 6 : 5;



    asm volatile ("diag %0,%2,0x308\n"

                  : "+d" (addr), "+d" (rc)

                  : "d" (store ? 6 : 5)

                  : "d" (subcode)

                  : "memory", "cc");

    return rc == 0x01;

}