s390/sclp: expose the GISA format facility

Web:        https://git.kernel.org/torvalds/c/9e73ea7056bd5f7e1b6e66e3d503478bb5160f07
Commit:     9e73ea7056bd5f7e1b6e66e3d503478bb5160f07
Parent:     f180bfdae024b34e71e89dcc82b037dd97f74c3a
Refname:    refs/heads/master
Author:     Michael Mueller <[email protected]>
AuthorDate: Mon Jun 12 13:49:28 2017 +0200
Committer:  Christian Borntraeger <[email protected]>
CommitDate: Fri Jan 26 14:13:57 2018 +0100

    s390/sclp: expose the GISA format facility
    
    The GISA format facility is required by the host to be able to process
    a format-1 GISA. If not available, the used GISA format will be format-0.
    All format-1 related extension will not be available in this case.
    
    Signed-off-by: Michael Mueller <[email protected]>
    Reviewed-by: Pierre Morel <[email protected]>
    Reviewed-by: Halil Pasic <[email protected]>
    Reviewed-by: Christian Borntraeger <[email protected]>
    Acked-by: David Hildenbrand <[email protected]>
    Acked-by: Martin Schwidefsky <[email protected]>
    Signed-off-by: Christian Borntraeger <[email protected]>
---
 arch/s390/include/asm/sclp.h   | 1 +
 drivers/s390/char/sclp_early.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index d3c1a8a2e3ad..3cae9168f63c 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -77,6 +77,7 @@ struct sclp_info {
 	unsigned char has_ibs : 1;
 	unsigned char has_skey : 1;
 	unsigned char has_kss : 1;
+	unsigned char has_gisaf : 1;
 	unsigned int ibc;
 	unsigned int mtid;
 	unsigned int mtid_cp;
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index d06bc5674e5f..6b1891539c84 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -49,7 +49,7 @@ struct read_info_sccb {
 	u8	_pad_112[116 - 112];	/* 112-115 */
 	u8	fac116;			/* 116 */
 	u8	fac117;			/* 117 */
-	u8	_pad_118;		/* 118 */
+	u8	fac118;			/* 118 */
 	u8	fac119;			/* 119 */
 	u16	hcpua;			/* 120-121 */
 	u8	_pad_122[124 - 122];	/* 122-123 */
@@ -100,6 +100,7 @@ static void __init sclp_early_facilities_detect(struct read_info_sccb *sccb)
 	sclp.has_esca = !!(sccb->fac116 & 0x08);
 	sclp.has_pfmfi = !!(sccb->fac117 & 0x40);
 	sclp.has_ibs = !!(sccb->fac117 & 0x20);
+	sclp.has_gisaf = !!(sccb->fac118 & 0x08);
 	sclp.has_hvs = !!(sccb->fac119 & 0x80);
 	sclp.has_kss = !!(sccb->fac98 & 0x01);
 	if (sccb->fac85 & 0x02)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html