Commit 5ac8c724 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Heiko Carstens
Browse files

s390/zcrypt: remove CEX2 and CEX3 device drivers 



Remove the legacy device driver code for CEX2 and CEX3 cards.

The last machines which are able to handle CEX2 crypto cards
are z10 EC first available 2008 and z10 BC first available 2009.
The last machines able to handle a CEX3 crypto card are
z196 first available 2010 and z114 first available 2011.

Please note that this does not imply to drop CEX2 and CEX3
support in general. With older kernels on hardware up to the
aforementioned machine models these crypto cards will get
support by IBM.

The removal of the CEX2 and CEX3 device drivers code opens up
some simplifications, for example support for crypto cards
without rng support can be removed also.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 86e74965

drivers/crypto/Kconfig

+3 −4
Original line number Diff line number Diff line
@@ -70,10 +70,9 @@ config ZCRYPT 
	select HW_RANDOM

	help

	  Select this option if you want to enable support for

	  s390 cryptographic adapters like:

	  + Crypto Express 2 up to 7 Coprocessor (CEXxC)

	  + Crypto Express 2 up to 7 Accelerator (CEXxA)

	  + Crypto Express 4 up to 7 EP11 Coprocessor (CEXxP)

	  s390 cryptographic adapters like Crypto Express 4 up

	  to 8 in Coprocessor (CEXxC), EP11 Coprocessor (CEXxP)

	  or Accelerator (CEXxA) mode.



config ZCRYPT_DEBUG

	bool "Enable debug features for s390 cryptographic adapters"

drivers/s390/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ zcrypt-objs += zcrypt_msgtype6.o zcrypt_msgtype50.o 
zcrypt-objs += zcrypt_ccamisc.o zcrypt_ep11misc.o

obj-$(CONFIG_ZCRYPT) += zcrypt.o

# adapter drivers depend on ap.o and zcrypt.o

obj-$(CONFIG_ZCRYPT) += zcrypt_cex2c.o zcrypt_cex2a.o zcrypt_cex4.o

obj-$(CONFIG_ZCRYPT) += zcrypt_cex4.o



# pkey kernel module

pkey-objs := pkey_api.o

drivers/s390/crypto/ap_bus.c

+4 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright IBM Corp. 2006, 2021

 * Copyright IBM Corp. 2006, 2023

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *	      Martin Schwidefsky <schwidefsky@de.ibm.com>

 *	      Ralph Wuerthner <rwuerthn@de.ibm.com>
@@ -387,23 +387,6 @@ static int ap_queue_info(ap_qid_t qid, int *q_type, unsigned int *q_fac, 
		*q_ml = tapq_info.ml;

		*q_decfg = status.response_code == AP_RESPONSE_DECONFIGURED;

		*q_cstop = status.response_code == AP_RESPONSE_CHECKSTOPPED;

		switch (*q_type) {

			/* For CEX2 and CEX3 the available functions

			 * are not reflected by the facilities bits.

			 * Instead it is coded into the type. So here

			 * modify the function bits based on the type.

			 */

		case AP_DEVICE_TYPE_CEX2A:

		case AP_DEVICE_TYPE_CEX3A:

			*q_fac |= 0x08000000;

			break;

		case AP_DEVICE_TYPE_CEX2C:

		case AP_DEVICE_TYPE_CEX3C:

			*q_fac |= 0x10000000;

			break;

		default:

			break;

		}

		return 1;

	default:

		/*
@@ -1678,8 +1661,8 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func) 
{

	int comp_type = 0;



	/* < CEX2A is not supported */

	if (rawtype < AP_DEVICE_TYPE_CEX2A) {

	/* < CEX4 is not supported */

	if (rawtype < AP_DEVICE_TYPE_CEX4) {

		AP_DBF_WARN("%s queue=%02x.%04x unsupported type %d\n",

			    __func__, AP_QID_CARD(qid),

			    AP_QID_QUEUE(qid), rawtype);
@@ -1701,7 +1684,7 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func) 
		apinfo.cat = AP_DEVICE_TYPE_CEX8;

		status = ap_qact(qid, 0, &apinfo);

		if (status.response_code == AP_RESPONSE_NORMAL &&

		    apinfo.cat >= AP_DEVICE_TYPE_CEX2A &&

		    apinfo.cat >= AP_DEVICE_TYPE_CEX4 &&

		    apinfo.cat <= AP_DEVICE_TYPE_CEX8)

			comp_type = apinfo.cat;

	}

drivers/s390/crypto/ap_bus.h

+2 −17
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright IBM Corp. 2006, 2019

 * Copyright IBM Corp. 2006, 2023

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *	      Martin Schwidefsky <schwidefsky@de.ibm.com>

 *	      Ralph Wuerthner <rwuerthn@de.ibm.com>
@@ -67,15 +67,8 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr) 
#define AP_RESPONSE_INVALID_DOMAIN	     0x42



/*

 * Known device types

 * Supported AP device types

 */

#define AP_DEVICE_TYPE_PCICC	3

#define AP_DEVICE_TYPE_PCICA	4

#define AP_DEVICE_TYPE_PCIXCC	5

#define AP_DEVICE_TYPE_CEX2A	6

#define AP_DEVICE_TYPE_CEX2C	7

#define AP_DEVICE_TYPE_CEX3A	8

#define AP_DEVICE_TYPE_CEX3C	9

#define AP_DEVICE_TYPE_CEX4	10

#define AP_DEVICE_TYPE_CEX5	11

#define AP_DEVICE_TYPE_CEX6	12
@@ -272,14 +265,6 @@ static inline void ap_release_message(struct ap_message *ap_msg) 
	kfree_sensitive(ap_msg->private);

}



/*

 * Note: don't use ap_send/ap_recv after using ap_queue_message

 * for the first time. Otherwise the ap message queue will get

 * confused.

 */

int ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t msglen);

int ap_recv(ap_qid_t qid, unsigned long *psmid, void *msg, size_t msglen);



enum ap_sm_wait ap_sm_event(struct ap_queue *aq, enum ap_sm_event event);

enum ap_sm_wait ap_sm_event_loop(struct ap_queue *aq, enum ap_sm_event event);

drivers/s390/crypto/ap_queue.c

+1 −46
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright IBM Corp. 2016

 * Copyright IBM Corp. 2016, 2023

 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 *

 * Adjunct processor bus, queue related code.
@@ -93,51 +93,6 @@ __ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t msglen, 
	return ap_nqap(qid, psmid, msg, msglen);

}



int ap_send(ap_qid_t qid, unsigned long psmid, void *msg, size_t msglen)

{

	struct ap_queue_status status;



	status = __ap_send(qid, psmid, msg, msglen, 0);

	if (status.async)

		return -EPERM;

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		return 0;

	case AP_RESPONSE_Q_FULL:

	case AP_RESPONSE_RESET_IN_PROGRESS:

		return -EBUSY;

	case AP_RESPONSE_REQ_FAC_NOT_INST:

		return -EINVAL;

	default:	/* Device is gone. */

		return -ENODEV;

	}

}

EXPORT_SYMBOL(ap_send);



int ap_recv(ap_qid_t qid, unsigned long *psmid, void *msg, size_t msglen)

{

	struct ap_queue_status status;



	if (!msg)

		return -EINVAL;

	status = ap_dqap(qid, psmid, msg, msglen, NULL, NULL, NULL);

	if (status.async)

		return -EPERM;

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		return 0;

	case AP_RESPONSE_NO_PENDING_REPLY:

		if (status.queue_empty)

			return -ENOENT;

		return -EBUSY;

	case AP_RESPONSE_RESET_IN_PROGRESS:

		return -EBUSY;

	default:

		return -ENODEV;

	}

}

EXPORT_SYMBOL(ap_recv);



/* State machine definitions and helpers */



static enum ap_sm_wait ap_sm_nop(struct ap_queue *aq)