Commit ee410de8 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Martin Schwidefsky
Browse files

s390/zcrypt: zcrypt device driver cleanup 



Some cleanup in the s390 zcrypt device driver:
- Removed fragments of pcixx crypto card code. This code
  can't be reached anymore because the hardware detection
  function does not recognize crypto cards < CEX2 since
  commit f56545430736 ("s390/zcrypt: Introduce QACT support
  for AP bus devices.")
- Rename of some files and driver names which where still
  reflecting pcixx support to cex2a/cex2c.
- Removed all the zcrypt version strings in the file headers.
  There is only one place left - the zcrypt.h header file is
  now the only place for zcrypt device driver version info.
- Zcrypt version pump up from 2.2.0 to 2.2.1.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 78333d1f

arch/s390/include/uapi/asm/zcrypt.h

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 *  include/asm-s390/zcrypt.h

 *

 *  zcrypt 2.2.0 (user-visible header)

 *  zcrypt 2.2.1 (user-visible header)

 *

 *  Copyright IBM Corp. 2001, 2018

 *  Author(s): Robert Burroughs
@@ -16,7 +16,7 @@ 


#define ZCRYPT_VERSION 2

#define ZCRYPT_RELEASE 2

#define ZCRYPT_VARIANT 0

#define ZCRYPT_VARIANT 1



#include <linux/ioctl.h>

#include <linux/compiler.h>

drivers/s390/crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ zcrypt-objs := zcrypt_api.o zcrypt_card.o zcrypt_queue.o 
zcrypt-objs += zcrypt_msgtype6.o zcrypt_msgtype50.o

obj-$(CONFIG_ZCRYPT) += zcrypt.o

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

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

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



# pkey kernel module

pkey-objs := pkey_api.o

drivers/s390/crypto/zcrypt_api.c

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

/*

 *  zcrypt 2.2.0

 *

 *  Copyright IBM Corp. 2001, 2018

 *  Author(s): Robert Burroughs

 *	       Eric Rossman (edrossma@us.ibm.com)

drivers/s390/crypto/zcrypt_api.h

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

/*

 *  zcrypt 2.1.0

 *

 *  Copyright IBM Corp. 2001, 2012

 *  Copyright IBM Corp. 2001, 2018

 *  Author(s): Robert Burroughs

 *	       Eric Rossman (edrossma@us.ibm.com)

 *	       Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -22,17 +20,8 @@ 
#include "ap_bus.h"



/**

 * device type for an actual device is either PCICA, PCICC, PCIXCC_MCL2,

 * PCIXCC_MCL3, CEX2C, or CEX2A

 *

 * NOTE: PCIXCC_MCL3 refers to a PCIXCC with May 2004 version of Licensed

 *	 Internal Code (LIC) (EC J12220 level 29).

 *	 PCIXCC_MCL2 refers to any LIC before this level.

 * Supported device types

 */

#define ZCRYPT_PCICA		1

#define ZCRYPT_PCICC		2

#define ZCRYPT_PCIXCC_MCL2	3

#define ZCRYPT_PCIXCC_MCL3	4

#define ZCRYPT_CEX2C		5

#define ZCRYPT_CEX2A		6

#define ZCRYPT_CEX3C		7

drivers/s390/crypto/zcrypt_card.c

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

/*

 *  zcrypt 2.1.0

 *

 *  Copyright IBM Corp. 2001, 2012

 *  Author(s): Robert Burroughs

 *	       Eric Rossman (edrossma@us.ibm.com)

CRA Git | Maintained and supported by SUSTech CRA and CCSE