39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From adee899fc239f9eca87881a7f6c6e1dae346922e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Farhan Ali <alifm@linux.vnet.ibm.com>
|
||
|
|
Date: Fri, 25 Aug 2017 09:24:46 -0400
|
||
|
|
Subject: [PATCH] s390-ccw: Fix alignment for CCW1
|
||
|
|
|
||
|
|
The commit 198c0d1f9df8c4 s390x/css: check ccw address validity
|
||
|
|
exposes an alignment issue in ccw bios.
|
||
|
|
|
||
|
|
According to PoP the CCW must be doubleword aligned. Let's fix
|
||
|
|
this in the bios.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Farhan Ali <alifm@linux.vnet.ibm.com>
|
||
|
|
Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com>
|
||
|
|
Reviewed-by: Eric Farman <farman@linux.vnet.ibm.com>
|
||
|
|
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Message-Id: <3ed8b810b6592daee6a775037ce21f850e40647d.1503667215.git.alifm@linux.vnet.ibm.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit 3a1e4561ad63b303b092387ae006bd41468ece63)
|
||
|
|
[BR: BSC#1056680]
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
pc-bios/s390-ccw/cio.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h
|
||
|
|
index f5b4549ea3..55eaeee4b6 100644
|
||
|
|
--- a/pc-bios/s390-ccw/cio.h
|
||
|
|
+++ b/pc-bios/s390-ccw/cio.h
|
||
|
|
@@ -133,7 +133,7 @@ struct ccw1 {
|
||
|
|
__u8 flags;
|
||
|
|
__u16 count;
|
||
|
|
__u32 cda;
|
||
|
|
-} __attribute__ ((packed));
|
||
|
|
+} __attribute__ ((packed, aligned(8)));
|
||
|
|
|
||
|
|
#define CCW_FLAG_DC 0x80
|
||
|
|
#define CCW_FLAG_CC 0x40
|