qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] d8e5bb: pc-bios: s390x: Ensure Read IPL memor


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] d8e5bb: pc-bios: s390x: Ensure Read IPL memory is clean
Date: Mon, 23 Nov 2020 11:19:36 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558
      
https://github.com/qemu/qemu/commit/d8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558
  Author: Eric Farman <farman@linux.ibm.com>
  Date:   2020-11-23 (Mon, 23 Nov 2020)

  Changed paths:
    M pc-bios/s390-ccw/dasd-ipl.c

  Log Message:
  -----------
  pc-bios: s390x: Ensure Read IPL memory is clean

If, for example, we boot off a virtio device and chreipl to a vfio-ccw
device, the space at lowcore will be non-zero. We build a Read IPL CCW
at address zero, but it will have leftover PSW data that will conflict
with the Format-0 CCW being generated:

0x0: 00080000 80010000
       ------ Ccw0.cda
              -- Ccw0.chainData
                -- Reserved bits

The data address will be overwritten with the correct value (0x0), but
the apparent data chain bit will cause subsequent memory to be used as
the target of the data store, which may not be where we expect (0x0).

Clear out this space when we boot from DASD, so that we know it exists
exactly as we expect.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Jason J. Herne <jjherne@linux.ibm.com>
Reviewed-by: Janosch Frank <frankja@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20201120160117.59366-2-farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3d6519968bb10260fc724c491fb4275f7c0b78ac
      
https://github.com/qemu/qemu/commit/3d6519968bb10260fc724c491fb4275f7c0b78ac
  Author: Eric Farman <farman@linux.ibm.com>
  Date:   2020-11-23 (Mon, 23 Nov 2020)

  Changed paths:
    M pc-bios/s390-ccw/jump2ipl.c
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/s390-arch.h

  Log Message:
  -----------
  pc-bios: s390x: Clear out leftover S390EP string

A Linux binary will have the string "S390EP" at address 0x10008,
which is important in getting the guest up off the ground. In the
case of a reboot (specifically chreipl going to a new device),
we should defer to the PSW at address zero for the new config,
which will re-write "S390EP" from the new image.

Let's clear it out at this point so that a reipl to, say, a DASD
passthrough device drives the IPL path from scratch without disrupting
disrupting the order of operations for other boots.

Rather than hardcoding the address of this magic (again), let's
define it somewhere so that the two users are visibly related.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Message-Id: <20201120160117.59366-3-farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 7a3d37a3f2335e18539e821d0c72abe0b22480bd
      
https://github.com/qemu/qemu/commit/7a3d37a3f2335e18539e821d0c72abe0b22480bd
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-11-23 (Mon, 23 Nov 2020)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  pc-bios/s390: Update the s390-ccw bios binaries

Update the binaries with the two reboot fixes from Eric Farman.

Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: fb764373eaf7f65fd9e85377736f83aae09817b2
      
https://github.com/qemu/qemu/commit/fb764373eaf7f65fd9e85377736f83aae09817b2
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-23 (Mon, 23 Nov 2020)

  Changed paths:
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/dasd-ipl.c
    M pc-bios/s390-ccw/jump2ipl.c
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/s390-arch.h
    M pc-bios/s390-netboot.img

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/huth-gitlab/tags/pull-request-2020-11-23' into staging

* Two reboot fixes for the s390-ccw bios

# gpg: Signature made Mon 23 Nov 2020 10:03:17 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2020-11-23:
  pc-bios/s390: Update the s390-ccw bios binaries
  pc-bios: s390x: Clear out leftover S390EP string
  pc-bios: s390x: Ensure Read IPL memory is clean

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/272fa7491ff7...fb764373eaf7



reply via email to

[Prev in Thread] Current Thread [Next in Thread]