s390/sclp: detect cmma

Let's detect the Collaborative-memory-management-interpretation facility,
aka CMM assist, so we can correctly enable cmma later.

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 076f6318b6fa5d235a53a6ea0e60df0d553ce2bd..fa40ac8056f55ff9b695101ce9f01835f0e90b4d 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -62,6 +62,7 @@ struct sclp_info {
        unsigned char has_sief2 : 1;
        unsigned char has_64bscao : 1;
        unsigned char has_gpere : 1;
+       unsigned char has_cmma : 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 a05f2d07ea02b96b24970fd5e117cbc21420e9c7..366e1a46e96d7a8992826de75a94c76b231e94b4 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -115,6 +115,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
        sclp.has_sprp = !!(sccb->fac84 & 0x02);
        sclp.has_core_type = !!(sccb->fac84 & 0x01);
        sclp.has_64bscao = !!(sccb->fac116 & 0x80);
+       sclp.has_cmma = !!(sccb->fac116 & 0x40);
        sclp.has_esca = !!(sccb->fac116 & 0x08);
        sclp.has_hvs = !!(sccb->fac119 & 0x80);
        if (sccb->fac85 & 0x02)