aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-02-24 09:51:55 -0500
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-11-30 06:47:11 -0500
commit8dfd523f8523779210038264259546299a8398e9 (patch)
tree26c0f198f3b744e422bb898093591dc3ed73a9f7
parent4215825eeb1f704d1bd327ca01fb753b53ea34d3 (diff)
s390/sclp: introduce check for SIE
This patch adds a way to check if the SIE with zArchitecture support is available. Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@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.h6
-rw-r--r--drivers/s390/char/sclp_early.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index 8324abbdaeaf..dea883f85d66 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -29,7 +29,10 @@ struct sclp_ipl_info {
29 29
30struct sclp_core_entry { 30struct sclp_core_entry {
31 u8 core_id; 31 u8 core_id;
32 u8 reserved0[2]; 32 u8 reserved0;
33 u8 : 4;
34 u8 sief2 : 1;
35 u8 : 3;
33 u8 : 3; 36 u8 : 3;
34 u8 siif : 1; 37 u8 siif : 1;
35 u8 sigpif : 1; 38 u8 sigpif : 1;
@@ -55,6 +58,7 @@ struct sclp_info {
55 unsigned char has_sprp : 1; 58 unsigned char has_sprp : 1;
56 unsigned char has_hvs : 1; 59 unsigned char has_hvs : 1;
57 unsigned char has_esca : 1; 60 unsigned char has_esca : 1;
61 unsigned char has_sief2 : 1;
58 unsigned int ibc; 62 unsigned int ibc;
59 unsigned int mtid; 63 unsigned int mtid;
60 unsigned int mtid_cp; 64 unsigned int mtid_cp;
diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index ff1e1bb8144d..e0a1f4eec370 100644
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -136,6 +136,7 @@ static void __init sclp_facilities_detect(struct read_info_sccb *sccb)
136 continue; 136 continue;
137 sclp.has_siif = cpue->siif; 137 sclp.has_siif = cpue->siif;
138 sclp.has_sigpif = cpue->sigpif; 138 sclp.has_sigpif = cpue->sigpif;
139 sclp.has_sief2 = cpue->sief2;
139 break; 140 break;
140 } 141 }
141 142