Commit c03b6ef7 authored by Jan Höppner's avatar Jan Höppner Committed by Heiko Carstens
Browse files

s390/tape: Remove support for 3590/3592 models 



Physical 3590/3592 tape models are not supported anymore for a very long
time. The Virtual Tape Server (VTS) emulates and presents only 3490E
models to the host. This is the only supported model and storage server.

Remove the entire code base for 3590/3592 models as it can be considered
dead code for quite some time already.

Signed-off-by: default avatarJan Höppner <hoeppner@linux.ibm.com>
Reviewed-by: default avatarJens Remus <jremus@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent f8a9c110

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

+0 −64
Original line number Diff line number Diff line
@@ -36,68 +36,4 @@ typedef struct display_struct { 
        char message2[8];

} display_struct;



/*

 * Tape encryption support

 */



struct tape390_crypt_info {

	char capability;

	char status;

	char medium_status;

} __attribute__ ((packed));





/* Macros for "capable" field */

#define TAPE390_CRYPT_SUPPORTED_MASK 0x01

#define TAPE390_CRYPT_SUPPORTED(x) \

	((x.capability & TAPE390_CRYPT_SUPPORTED_MASK))



/* Macros for "status" field */

#define TAPE390_CRYPT_ON_MASK 0x01

#define TAPE390_CRYPT_ON(x) (((x.status) & TAPE390_CRYPT_ON_MASK))



/* Macros for "medium status" field */

#define TAPE390_MEDIUM_LOADED_MASK 0x01

#define TAPE390_MEDIUM_ENCRYPTED_MASK 0x02

#define TAPE390_MEDIUM_ENCRYPTED(x) \

	(((x.medium_status) & TAPE390_MEDIUM_ENCRYPTED_MASK))

#define TAPE390_MEDIUM_LOADED(x) \

	(((x.medium_status) & TAPE390_MEDIUM_LOADED_MASK))



/*

 * The TAPE390_CRYPT_SET ioctl is used to switch on/off encryption.

 * The "encryption_capable" and "tape_status" fields are ignored for this ioctl!

 */

#define TAPE390_CRYPT_SET _IOW('d', 2, struct tape390_crypt_info)



/*

 * The TAPE390_CRYPT_QUERY ioctl is used to query the encryption state.

 */

#define TAPE390_CRYPT_QUERY _IOR('d', 3, struct tape390_crypt_info)



/* Values for "kekl1/2_type" and "kekl1/2_type_on_tape" fields */

#define TAPE390_KEKL_TYPE_NONE 0

#define TAPE390_KEKL_TYPE_LABEL 1

#define TAPE390_KEKL_TYPE_HASH 2



struct tape390_kekl {

	unsigned char type;

	unsigned char type_on_tape;

	char label[65];

} __attribute__ ((packed));



struct tape390_kekl_pair {

	struct tape390_kekl kekl[2];

} __attribute__ ((packed));



/*

 * The TAPE390_KEKL_SET ioctl is used to set Key Encrypting Key labels.

 */

#define TAPE390_KEKL_SET _IOW('d', 4, struct tape390_kekl_pair)



/*

 * The TAPE390_KEKL_QUERY ioctl is used to query Key Encrypting Key labels.

 */

#define TAPE390_KEKL_QUERY _IOR('d', 5, struct tape390_kekl_pair)



#endif

drivers/s390/char/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -130,15 +130,6 @@ config S390_TAPE_34XX 
	  tape subsystems and 100% compatibles.

	  It is safe to say "Y" here.



config S390_TAPE_3590

	def_tristate m

	prompt "Support for 3590 tape hardware"

	depends on S390_TAPE

	help

	  Select this option if you want to access IBM 3590 magnetic

	  tape subsystems and 100% compatibles.

	  It is safe to say "Y" here.



config VMLOGRDR

	def_tristate m

	prompt "Support for the z/VM recording system services (VM only)"

drivers/s390/char/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ tape-$(CONFIG_PROC_FS) += tape_proc.o 
tape-objs := tape_core.o tape_std.o tape_char.o $(tape-y)

obj-$(CONFIG_S390_TAPE) += tape.o tape_class.o

obj-$(CONFIG_S390_TAPE_34XX) += tape_34xx.o

obj-$(CONFIG_S390_TAPE_3590) += tape_3590.o

obj-$(CONFIG_MONREADER) += monreader.o

obj-$(CONFIG_MONWRITER) += monwriter.o

obj-$(CONFIG_S390_VMUR) += vmur.o

drivers/s390/char/tape.h

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

/*

 *    tape device driver for 3480/3490E/3590 tapes.

 *    tape device driver for 3480/3490E tapes.

 *

 *  S390 and zSeries version

 *    Copyright IBM Corp. 2001, 2009
@@ -98,10 +98,6 @@ enum tape_op { 
	TO_DIS,		/* Tape display */

	TO_ASSIGN,	/* Assign tape to channel path */

	TO_UNASSIGN,	/* Unassign tape from channel path */

	TO_CRYPT_ON,	/* Enable encrpytion */

	TO_CRYPT_OFF,	/* Disable encrpytion */

	TO_KEKL_SET,	/* Set KEK label */

	TO_KEKL_QUERY,	/* Query KEK label */

	TO_RDC,		/* Read device characteristics */

	TO_SIZE,	/* #entries in tape_op_t */

};

drivers/s390/char/tape_3590.c

deleted100644 → 0
+0 −1612

File deleted.

Preview size limit exceeded, changes collapsed.