s390/sclp: detect storage-key facility

Let's correctly 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 99a0150..2ad9c20 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -32,7 +32,8 @@ struct sclp_core_entry {
        u8 reserved0;
        u8 : 4;
        u8 sief2 : 1;
-       u8 : 3;
+       u8 skey : 1;
+       u8 : 2;
        u8 : 2;
        u8 gpere : 1;
        u8 siif : 1;
@@ -73,6 +74,7 @@ struct sclp_info {
        unsigned char has_cei : 1;
        unsigned char has_pfmfi : 1;
        unsigned char has_ibs : 1;
+       unsigned char has_skey : 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 d5b873c..c71df0c 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -154,6 +154,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
                sclp.has_gpere = cpue->gpere;
                sclp.has_ib = cpue->ib;
                sclp.has_cei = cpue->cei;
+               sclp.has_skey = cpue->skey;
                break;
        }