| From 1b2be2071aca9aab22e3f902bcb0fca46a1d3b00 Mon Sep 17 00:00:00 2001 |
| From: Philipp Rudo <prudo@linux.ibm.com> |
| Date: Fri, 28 Jun 2019 17:38:05 +0200 |
| Subject: s390/ipl: Fix detection of has_secure attribute |
| |
| From: Philipp Rudo <prudo@linux.ibm.com> |
| |
| commit 1b2be2071aca9aab22e3f902bcb0fca46a1d3b00 upstream. |
| |
| Use the correct bit for detection of the machine capability associated |
| with the has_secure attribute. It is expected that the underlying |
| platform (including hypervisors) unsets the bit when they don't provide |
| secure ipl for their guests. |
| |
| Fixes: c9896acc7851 ("s390/ipl: Provide has_secure sysfs attribute") |
| Cc: stable@vger.kernel.org # 5.2 |
| Signed-off-by: Philipp Rudo <prudo@linux.ibm.com> |
| Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> |
| Reviewed-by: Peter Oberparleiter <oberpar@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/s390/include/asm/sclp.h | 1 - |
| arch/s390/kernel/ipl.c | 7 +------ |
| drivers/s390/char/sclp_early.c | 1 - |
| 3 files changed, 1 insertion(+), 8 deletions(-) |
| |
| --- a/arch/s390/include/asm/sclp.h |
| +++ b/arch/s390/include/asm/sclp.h |
| @@ -80,7 +80,6 @@ struct sclp_info { |
| unsigned char has_gisaf : 1; |
| unsigned char has_diag318 : 1; |
| unsigned char has_sipl : 1; |
| - unsigned char has_sipl_g2 : 1; |
| unsigned char has_dirq : 1; |
| unsigned int ibc; |
| unsigned int mtid; |
| --- a/arch/s390/kernel/ipl.c |
| +++ b/arch/s390/kernel/ipl.c |
| @@ -286,12 +286,7 @@ static struct kobj_attribute sys_ipl_sec |
| static ssize_t ipl_has_secure_show(struct kobject *kobj, |
| struct kobj_attribute *attr, char *page) |
| { |
| - if (MACHINE_IS_LPAR) |
| - return sprintf(page, "%i\n", !!sclp.has_sipl); |
| - else if (MACHINE_IS_VM) |
| - return sprintf(page, "%i\n", !!sclp.has_sipl_g2); |
| - else |
| - return sprintf(page, "%i\n", 0); |
| + return sprintf(page, "%i\n", !!sclp.has_sipl); |
| } |
| |
| static struct kobj_attribute sys_ipl_has_secure_attr = |
| --- a/drivers/s390/char/sclp_early.c |
| +++ b/drivers/s390/char/sclp_early.c |
| @@ -41,7 +41,6 @@ static void __init sclp_early_facilities |
| sclp.has_hvs = !!(sccb->fac119 & 0x80); |
| sclp.has_kss = !!(sccb->fac98 & 0x01); |
| sclp.has_sipl = !!(sccb->cbl & 0x02); |
| - sclp.has_sipl_g2 = !!(sccb->cbl & 0x04); |
| if (sccb->fac85 & 0x02) |
| S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP; |
| if (sccb->fac91 & 0x40) |
