summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-11-24 12:56:43 +0100
committerChristian Borntraeger <borntraeger@de.ibm.com>2016-06-10 12:07:30 +0200
commit238614515287c9400727e4cd7aa958649dcbf05f (patch)
tree1d9ce0e22401e63b6563538c2ed4637c5bd4fa33
parent695be0e7a24a8875c347437566f2c44ba673580b (diff)
downloadop-kernel-dev-238614515287c9400727e4cd7aa958649dcbf05f.zip
op-kernel-dev-238614515287c9400727e4cd7aa958649dcbf05f.tar.gz
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>
-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 99a0150..2ad9c20 100644
--- 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
--- 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;
}
OpenPOWER on IntegriCloud