s390/sclp: detect PFMF interpretation facility

Let's detect that facility.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index c91ad198a59c8ae45b6c01026e9d033eb2144ba9..bdb7f22d9ad44891414caf1ec354fbb4073fd0b2 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -71,6 +71,7 @@ struct sclp_info {
        unsigned char has_gsls : 1;
        unsigned char has_ib : 1;
        unsigned char has_cei : 1;
+       unsigned char has_pfmfi : 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 4b330fbd4f087fe9f89f632edfd91bd4a1d20819..500cbfd835411c9c528db42164bf77bf5671f903 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -46,7 +46,8 @@ struct read_info_sccb {
        u64     rnmax2;                 /* 104-111 */
        u8      _pad_112[116 - 112];    /* 112-115 */
        u8      fac116;                 /* 116 */
-       u8      _pad_117[119 - 117];    /* 117-118 */
+       u8      fac117;                 /* 117 */
+       u8      _pad_118;               /* 118 */
        u8      fac119;                 /* 119 */
        u16     hcpua;                  /* 120-121 */
        u8      _pad_122[124 - 122];    /* 122-123 */
@@ -118,6 +119,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
        sclp.has_64bscao = !!(sccb->fac116 & 0x80);
        sclp.has_cmma = !!(sccb->fac116 & 0x40);
        sclp.has_esca = !!(sccb->fac116 & 0x08);
+       sclp.has_pfmfi = !!(sccb->fac117 & 0x40);
        sclp.has_hvs = !!(sccb->fac119 & 0x80);
        if (sccb->fac85 & 0x02)
                S390_lowcore.machine_flags |= MACHINE_FLAG_ESOP;