summaryrefslogtreecommitdiffstats
path: root/pc-bios/s390-ccw
diff options
context:
space:
mode:
authorEric Farman2020-11-20 17:01:16 +0100
committerThomas Huth2020-11-23 09:48:44 +0100
commitd8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558 (patch)
tree23c36ba5bc312f817000fdd2081ff4082d95a3d8 /pc-bios/s390-ccw
parentMerge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20201122' into... (diff)
downloadqemu-d8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558.tar.gz
qemu-d8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558.tar.xz
qemu-d8e5bbdd0d6fa8d9b5ac15de62c87105d92ff558.zip
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>
Diffstat (limited to 'pc-bios/s390-ccw')
-rw-r--r--pc-bios/s390-ccw/dasd-ipl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/pc-bios/s390-ccw/dasd-ipl.c b/pc-bios/s390-ccw/dasd-ipl.c
index 0fc879bb8e..71cbae2f16 100644
--- a/pc-bios/s390-ccw/dasd-ipl.c
+++ b/pc-bios/s390-ccw/dasd-ipl.c
@@ -100,6 +100,9 @@ static void make_readipl(void)
{
Ccw0 *ccwIplRead = (Ccw0 *)0x00;
+ /* Clear out any existing data */
+ memset(ccwIplRead, 0, sizeof(Ccw0));
+
/* Create Read IPL ccw at address 0 */
ccwIplRead->cmd_code = CCW_CMD_READ_IPL;
ccwIplRead->cda = 0x00; /* Read into address 0x00 in main memory */