| From: Vasily Gorbik <gor@linux.ibm.com> |
| Date: Tue, 3 Apr 2018 16:02:15 +0200 |
| Subject: s390/ipl: ensure loadparm valid flag is set |
| |
| commit 15deb080a6087b73089139569558965750e69d67 upstream. |
| |
| When loadparm is set in reipl parm block, the kernel should also set |
| DIAG308_FLAGS_LP_VALID flag. |
| |
| This fixes loadparm ignoring during z/VM fcp -> ccw reipl and kvm direct |
| boot -> ccw reipl. |
| |
| Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/s390/kernel/ipl.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/s390/kernel/ipl.c |
| +++ b/arch/s390/kernel/ipl.c |
| @@ -825,6 +825,7 @@ static ssize_t reipl_generic_loadparm_st |
| /* copy and convert to ebcdic */ |
| memcpy(ipb->ipl_info.ccw.load_parm, buf, lp_len); |
| ASCEBC(ipb->ipl_info.ccw.load_parm, LOADPARM_LEN); |
| + ipb->hdr.flags |= DIAG308_FLAGS_LP_VALID; |
| return len; |
| } |
| |
