[UNSTABLE,EOAN] UBUNTU: SAUCE: s390/sclp: Fix bit checked for has_sipl
diff mbox series

Message ID 20190913230002.5058-1-xnox@ubuntu.com
State New
Headers show
Series
  • [UNSTABLE,EOAN] UBUNTU: SAUCE: s390/sclp: Fix bit checked for has_sipl
Related show

Commit Message

Dimitri John Ledkov Sept. 13, 2019, 11 p.m. UTC
From: Philipp Rudo <prudo@linux.ibm.com>

BugLink: https://bugs.launchpad.net/bugs/1843960

Fixes: c9896acc7851 ("s390/ipl: Provide has_secure sysfs attribute")
Cc: stable@vger.kernel.org # 5.2+
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
(cherry picked from commit 4df9a82549cfed5b52da21e7d007b79b2ea1769a
 git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git)
Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---
 drivers/s390/char/sclp_early.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Seth Forshee Sept. 16, 2019, 12:58 p.m. UTC | #1
(Removing upstream stable Cc as this is a sauce patch for Ubuntu)

On Sat, Sep 14, 2019 at 12:00:02AM +0100, Dimitri John Ledkov wrote:
> From: Philipp Rudo <prudo@linux.ibm.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1843960
> 
> Fixes: c9896acc7851 ("s390/ipl: Provide has_secure sysfs attribute")
> Cc: stable@vger.kernel.org # 5.2+
> Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
> (cherry picked from commit 4df9a82549cfed5b52da21e7d007b79b2ea1769a
>  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git)
> Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>

Applied to eoan/master-next, thanks!

Patch
diff mbox series

diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index e71992a3c55f..cc5e84b80c69 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -40,7 +40,7 @@  static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb)
 	sclp.has_gisaf = !!(sccb->fac118 & 0x08);
 	sclp.has_hvs = !!(sccb->fac119 & 0x80);
 	sclp.has_kss = !!(sccb->fac98 & 0x01);
-	sclp.has_sipl = !!(sccb->cbl & 0x02);
+	sclp.has_sipl = !!(sccb->cbl & 0x4000);
 	if (sccb->fac85 & 0x02)
 		S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;
 	if (sccb->fac91 & 0x40)