aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/crypto
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2015-02-12 07:08:27 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-03-25 06:49:33 -0400
commit5a79859ae0f35d25c67a03e82bf0c80592f16a39 (patch)
tree37264d49f069812f19ced94e6ae171814fb7e498 /drivers/s390/crypto
parent1833c9f647e9bda1cd24653ff8f9c207b5f5b911 (diff)
s390: remove 31 bit support
Remove the 31 bit support in order to reduce maintenance cost and effectively remove dead code. Since a couple of years there is no distribution left that comes with a 31 bit kernel. The 31 bit kernel also has been broken since more than a year before anybody noticed. In addition I added a removal warning to the kernel shown at ipl for 5 minutes: a960062e5826 ("s390: add 31 bit warning message") which let everybody know about the plan to remove 31 bit code. We didn't get any response. Given that the last 31 bit only machine was introduced in 1999 let's remove the code. Anybody with 31 bit user space code can still use the compat mode. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/crypto')
-rw-r--r--drivers/s390/crypto/ap_bus.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 3d7f19fb9a4e..33890c9850de 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -174,12 +174,10 @@ static int ap_interrupts_available(void)
174 * 174 *
175 * Returns 1 if AP configuration information is available. 175 * Returns 1 if AP configuration information is available.
176 */ 176 */
177#ifdef CONFIG_64BIT
178static int ap_configuration_available(void) 177static int ap_configuration_available(void)
179{ 178{
180 return test_facility(2) && test_facility(12); 179 return test_facility(2) && test_facility(12);
181} 180}
182#endif
183 181
184/** 182/**
185 * ap_test_queue(): Test adjunct processor queue. 183 * ap_test_queue(): Test adjunct processor queue.
@@ -239,7 +237,6 @@ static inline struct ap_queue_status ap_reset_queue(ap_qid_t qid)
239 return reg1; 237 return reg1;
240} 238}
241 239
242#ifdef CONFIG_64BIT
243/** 240/**
244 * ap_queue_interruption_control(): Enable interruption for a specific AP. 241 * ap_queue_interruption_control(): Enable interruption for a specific AP.
245 * @qid: The AP queue number 242 * @qid: The AP queue number
@@ -261,9 +258,7 @@ ap_queue_interruption_control(ap_qid_t qid, void *ind)
261 : "cc" ); 258 : "cc" );
262 return reg1_out; 259 return reg1_out;
263} 260}
264#endif
265 261
266#ifdef CONFIG_64BIT
267static inline struct ap_queue_status 262static inline struct ap_queue_status
268__ap_query_functions(ap_qid_t qid, unsigned int *functions) 263__ap_query_functions(ap_qid_t qid, unsigned int *functions)
269{ 264{
@@ -282,9 +277,7 @@ __ap_query_functions(ap_qid_t qid, unsigned int *functions)
282 *functions = (unsigned int)(reg2 >> 32); 277 *functions = (unsigned int)(reg2 >> 32);
283 return reg1; 278 return reg1;
284} 279}
285#endif
286 280
287#ifdef CONFIG_64BIT
288static inline int __ap_query_configuration(struct ap_config_info *config) 281static inline int __ap_query_configuration(struct ap_config_info *config)
289{ 282{
290 register unsigned long reg0 asm ("0") = 0x04000000UL; 283 register unsigned long reg0 asm ("0") = 0x04000000UL;
@@ -302,7 +295,6 @@ static inline int __ap_query_configuration(struct ap_config_info *config)
302 295
303 return reg1; 296 return reg1;
304} 297}
305#endif
306 298
307/** 299/**
308 * ap_query_functions(): Query supported functions. 300 * ap_query_functions(): Query supported functions.
@@ -317,7 +309,6 @@ static inline int __ap_query_configuration(struct ap_config_info *config)
317 */ 309 */
318static int ap_query_functions(ap_qid_t qid, unsigned int *functions) 310static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
319{ 311{
320#ifdef CONFIG_64BIT
321 struct ap_queue_status status; 312 struct ap_queue_status status;
322 int i; 313 int i;
323 status = __ap_query_functions(qid, functions); 314 status = __ap_query_functions(qid, functions);
@@ -348,9 +339,6 @@ static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
348 } 339 }
349 } 340 }
350 return -EBUSY; 341 return -EBUSY;
351#else
352 return -EINVAL;
353#endif
354} 342}
355 343
356/** 344/**
@@ -364,7 +352,6 @@ static int ap_query_functions(ap_qid_t qid, unsigned int *functions)
364 */ 352 */
365static int ap_queue_enable_interruption(ap_qid_t qid, void *ind) 353static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
366{ 354{
367#ifdef CONFIG_64BIT
368 struct ap_queue_status status; 355 struct ap_queue_status status;
369 int t_depth, t_device_type, rc, i; 356 int t_depth, t_device_type, rc, i;
370 357
@@ -404,9 +391,6 @@ static int ap_queue_enable_interruption(ap_qid_t qid, void *ind)
404 } 391 }
405 } 392 }
406 return rc; 393 return rc;
407#else
408 return -EINVAL;
409#endif
410} 394}
411 395
412/** 396/**
@@ -1238,7 +1222,6 @@ static struct bus_attribute *const ap_bus_attrs[] = {
1238 */ 1222 */
1239static void ap_query_configuration(void) 1223static void ap_query_configuration(void)
1240{ 1224{
1241#ifdef CONFIG_64BIT
1242 if (ap_configuration_available()) { 1225 if (ap_configuration_available()) {
1243 if (!ap_configuration) 1226 if (!ap_configuration)
1244 ap_configuration = 1227 ap_configuration =
@@ -1248,9 +1231,6 @@ static void ap_query_configuration(void)
1248 __ap_query_configuration(ap_configuration); 1231 __ap_query_configuration(ap_configuration);
1249 } else 1232 } else
1250 ap_configuration = NULL; 1233 ap_configuration = NULL;
1251#else
1252 ap_configuration = NULL;
1253#endif
1254} 1234}
1255 1235
1256/** 1236/**