| Message ID | 20180723201748.25573-6-mdroth@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | Patch Round-up for stable 2.12.1, freeze on 2018-07-30 | expand |
Quoting Michael Roth (2018-07-23 15:16:14) > From: Cornelia Huck <cohuck@redhat.com> > > 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: d046c51dad3 ("pc-bios/s390-ccw: Get device address via diag 308/6") > Cc: qemu-stable@nongnu.org > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > Tested-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > (cherry picked from commit 63d8b5ace31c1e1f3996fe4cd551d6d377594d5a) > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Hi Cornelia, Would you be able to do an s390 BIOS build for this one as well? > --- > pc-bios/s390-ccw/iplb.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h > index 5357a36d51..ded20c834e 100644 > --- a/pc-bios/s390-ccw/iplb.h > +++ b/pc-bios/s390-ccw/iplb.h > @@ -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; > } > -- > 2.17.1 >
On Mon, 23 Jul 2018 17:14:54 -0500 Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > Quoting Michael Roth (2018-07-23 15:16:14) > > From: Cornelia Huck <cohuck@redhat.com> > > > > 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: d046c51dad3 ("pc-bios/s390-ccw: Get device address via diag 308/6") > > Cc: qemu-stable@nongnu.org > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > > Tested-by: Thomas Huth <thuth@redhat.com> > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > (cherry picked from commit 63d8b5ace31c1e1f3996fe4cd551d6d377594d5a) > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > > Hi Cornelia, > > Would you be able to do an s390 BIOS build for this one as well? Sure, will do a build for 2.12-stable.
On Tue, 24 Jul 2018 11:40:04 +0200 Cornelia Huck <cohuck@redhat.com> wrote: > On Mon, 23 Jul 2018 17:14:54 -0500 > Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > > > Quoting Michael Roth (2018-07-23 15:16:14) > > > From: Cornelia Huck <cohuck@redhat.com> > > > > > > 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: d046c51dad3 ("pc-bios/s390-ccw: Get device address via diag 308/6") > > > Cc: qemu-stable@nongnu.org > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > > > Tested-by: Thomas Huth <thuth@redhat.com> > > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > > (cherry picked from commit 63d8b5ace31c1e1f3996fe4cd551d6d377594d5a) > > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > > > > Hi Cornelia, > > > > Would you be able to do an s390 BIOS build for this one as well? > > Sure, will do a build for 2.12-stable. Here we go: The following changes since commit e8488edcb3768f08cda7c3cc00def6b1b2f6c615: tcg/i386: Mark xmm registers call-clobbered (2018-07-23 14:24:17 -0500) are available in the Git repository at: git://github.com/cohuck/qemu tags/s390x-20180724-212-stable for you to fetch changes up to c16427177a67bc86aa7560331143bfc9c885b27d: pc-bios/s390-ccw.img: update image for stable (2018-07-24 06:08:42 -0400) ---------------------------------------------------------------- update s390-ccw.img for stable ---------------------------------------------------------------- Cornelia Huck (1): pc-bios/s390-ccw.img: update image for stable pc-bios/s390-ccw.img | Bin 30520 -> 30520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (for-2.12-stable branch)
Quoting Cornelia Huck (2018-07-24 06:07:43) > On Tue, 24 Jul 2018 11:40:04 +0200 > Cornelia Huck <cohuck@redhat.com> wrote: > > > On Mon, 23 Jul 2018 17:14:54 -0500 > > Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > > > > > Quoting Michael Roth (2018-07-23 15:16:14) > > > > From: Cornelia Huck <cohuck@redhat.com> > > > > > > > > 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: d046c51dad3 ("pc-bios/s390-ccw: Get device address via diag 308/6") > > > > Cc: qemu-stable@nongnu.org > > > > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > > > > Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> > > > > Tested-by: Thomas Huth <thuth@redhat.com> > > > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > > > (cherry picked from commit 63d8b5ace31c1e1f3996fe4cd551d6d377594d5a) > > > > Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> > > > > > > Hi Cornelia, > > > > > > Would you be able to do an s390 BIOS build for this one as well? > > > > Sure, will do a build for 2.12-stable. > > Here we go: > > The following changes since commit e8488edcb3768f08cda7c3cc00def6b1b2f6c615: > > tcg/i386: Mark xmm registers call-clobbered (2018-07-23 14:24:17 -0500) > > are available in the Git repository at: > > git://github.com/cohuck/qemu tags/s390x-20180724-212-stable > > for you to fetch changes up to c16427177a67bc86aa7560331143bfc9c885b27d: > > pc-bios/s390-ccw.img: update image for stable (2018-07-24 06:08:42 -0400) > > ---------------------------------------------------------------- > update s390-ccw.img for stable > > ---------------------------------------------------------------- > Cornelia Huck (1): > pc-bios/s390-ccw.img: update image for stable > > pc-bios/s390-ccw.img | Bin 30520 -> 30520 bytes > 1 file changed, 0 insertions(+), 0 deletions(-) > > (for-2.12-stable branch) Applied, thanks!
diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h index 5357a36d51..ded20c834e 100644 --- a/pc-bios/s390-ccw/iplb.h +++ b/pc-bios/s390-ccw/iplb.h @@ -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; }