Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71cb1bf6 authored by Farhan Ali's avatar Farhan Ali Committed by Christian Borntraeger
Browse files

s390/sclp: Detect KSS facility 



Let's detect the keyless subset facility.

Signed-off-by: default avatarFarhan Ali <alifm@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 80248559

arch/s390/include/asm/sclp.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ struct sclp_info { 
	unsigned char has_pfmfi : 1;

	unsigned char has_pfmfi : 1;

	unsigned char has_ibs : 1;

	unsigned char has_ibs : 1;

	unsigned char has_skey : 1;

	unsigned char has_skey : 1;

	unsigned char has_kss : 1;

	unsigned int ibc;

	unsigned int ibc;

	unsigned int mtid;

	unsigned int mtid;

	unsigned int mtid_cp;

	unsigned int mtid_cp;

drivers/s390/char/sclp_early.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,8 @@ struct read_info_sccb { 
	u8	fac85;			/* 85 */

	u8	fac85;			/* 85 */

	u8	_pad_86[91 - 86];	/* 86-90 */

	u8	_pad_86[91 - 86];	/* 86-90 */

	u8	flags;			/* 91 */

	u8	flags;			/* 91 */

	u8	_pad_92[99 - 92];	/* 92-98 */

	u8	_pad_92[98 - 92];	/* 92-97 */

	u8	fac98;			/* 98 */

	u8	hamaxpow;		/* 99 */

	u8	hamaxpow;		/* 99 */

	u32	rnsize2;		/* 100-103 */

	u32	rnsize2;		/* 100-103 */

	u64	rnmax2;			/* 104-111 */

	u64	rnmax2;			/* 104-111 */
@@ -99,6 +100,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb) 
	sclp.has_pfmfi = !!(sccb->fac117 & 0x40);

	sclp.has_pfmfi = !!(sccb->fac117 & 0x40);

	sclp.has_ibs = !!(sccb->fac117 & 0x20);

	sclp.has_ibs = !!(sccb->fac117 & 0x20);

	sclp.has_hvs = !!(sccb->fac119 & 0x80);

	sclp.has_hvs = !!(sccb->fac119 & 0x80);

	sclp.has_kss = !!(sccb->fac98 & 0x01);

	if (sccb->fac85 & 0x02)

	if (sccb->fac85 & 0x02)

		S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;

		S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;

	sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;

	sclp.rnmax = sccb->rnmax ? sccb->rnmax : sccb->rnmax2;