diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2018-04-03 16:02:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-04-24 09:32:04 +0200 |
| commit | 93da190b72043d607803b350d947769b7b27e1ec (patch) | |
| tree | 0ddf0240875238a55b5be1bcdfea4a3e936f5590 /arch/s390 | |
| parent | 7dc2c154c1764e2d19a18380e51935cb5ccb5c66 (diff) | |
| download | linux-stable-93da190b72043d607803b350d947769b7b27e1ec.tar.gz linux-stable-93da190b72043d607803b350d947769b7b27e1ec.tar.bz2 linux-stable-93da190b72043d607803b350d947769b7b27e1ec.zip | |
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.
Cc: <stable@vger.kernel.org>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/ipl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index 42570d8fb265..e73979236659 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -798,6 +798,7 @@ static ssize_t reipl_generic_loadparm_store(struct ipl_parameter_block *ipb, /* copy and convert to ebcdic */ memcpy(ipb->hdr.loadparm, buf, lp_len); ASCEBC(ipb->hdr.loadparm, LOADPARM_LEN); + ipb->hdr.flags |= DIAG308_FLAGS_LP_VALID; return len; } |