summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-11-24 13:00:23 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2016-06-10 12:07:22 +0200
commit4a5c3e08271216891ce1b5315cec3dcadbd01cd4 (patch)
tree32b05a8ef1fca8e800a39a3f2fa52ab2c96ae19a
parentKVM: s390: enable ib only if available (diff)
downloadlinux-4a5c3e08271216891ce1b5315cec3dcadbd01cd4.tar.xz
linux-4a5c3e08271216891ce1b5315cec3dcadbd01cd4.zip
s390/sclp: detect conditional-external-interception facility
Let's detect if we have 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>
-rw-r--r--arch/s390/include/asm/sclp.h4
-rw-r--r--drivers/s390/char/sclp_early.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index ef1f427ad4d1..c91ad198a59c 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -41,7 +41,8 @@ struct sclp_core_entry {
u8 reserved2[3];
u8 : 2;
u8 ib : 1;
- u8 : 5;
+ u8 cei : 1;
+ u8 : 4;
u8 reserved3[6];
u8 type;
u8 reserved1;
@@ -69,6 +70,7 @@ struct sclp_info {
unsigned char has_cmma : 1;
unsigned char has_gsls : 1;
unsigned char has_ib : 1;
+ unsigned char has_cei : 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 2240b615131e..4b330fbd4f08 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -150,6 +150,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
sclp.has_sief2 = cpue->sief2;
sclp.has_gpere = cpue->gpere;
sclp.has_ib = cpue->ib;
+ sclp.has_cei = cpue->cei;
break;
}