s390/sclp: detect guest-PER enhancement

Let's detect that facility, so we can correctly handle its abscence.

Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Martin Schwidefsky <schwidefsky@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 521400086e6559e78bddf80f345bce78b0509196..076f6318b6fa5d235a53a6ea0e60df0d553ce2bd 100644 (file)
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -33,7 +33,8 @@ struct sclp_core_entry {
        u8 : 4;
        u8 sief2 : 1;
        u8 : 3;
-       u8 : 3;
+       u8 : 2;
+       u8 gpere : 1;
        u8 siif : 1;
        u8 sigpif : 1;
        u8 : 3;
@@ -60,6 +61,7 @@ struct sclp_info {
        unsigned char has_esca : 1;
        unsigned char has_sief2 : 1;
        unsigned char has_64bscao : 1;
+       unsigned char has_gpere : 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 211eb86ae62d6b75c3b92fc7d748d3146cdf471e..a05f2d07ea02b96b24970fd5e117cbc21420e9c7 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -146,6 +146,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
                sclp.has_siif = cpue->siif;
                sclp.has_sigpif = cpue->sigpif;
                sclp.has_sief2 = cpue->sief2;
+               sclp.has_gpere = cpue->gpere;
                break;
        }