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

s390/tape: Remove tape load display support 



The LOAD_DISPLAY (LDD) X'9F' is still accepted by the Virtual Tape
Server (VTS) but does not perform any action.

Remove all functions and definitions related to this command.

The tape_34xx_ioctl() function is also removed as it was mainly used to
handle additional ioctl functionality. LOAD_DISPLAY was the only left
case. All other ioctls are handled in tapechar_ioctl().

With LOAD_DISPLAY, the remaining definitions in asm/tape390.h are gone.
Delete the file.

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 c03b6ef7

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

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*************************************************************************

 *

 *	   enables user programs to display messages and control encryption

 *	   on s390 tape devices

 *

 *	   Copyright IBM Corp. 2001, 2006

 *	   Author(s): Michael Holzheu <holzheu@de.ibm.com>

 *

 *************************************************************************/



#ifndef _TAPE390_H

#define _TAPE390_H



#define TAPE390_DISPLAY _IOW('d', 1, struct display_struct)



/*

 * The TAPE390_DISPLAY ioctl calls the Load Display command

 * which transfers 17 bytes of data from the channel to the subsystem:

 *     - 1 format control byte, and

 *     - two 8-byte messages

 *

 * Format control byte:

 *   0-2: New Message Overlay

 *     3: Alternate Messages

 *     4: Blink Message

 *     5: Display Low/High Message

 *     6: Reserved

 *     7: Automatic Load Request

 *

 */



typedef struct display_struct {

        char cntrl;

        char message1[8];

        char message2[8];

} display_struct;



#endif

drivers/s390/char/tape.h

+0 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ struct tape_discipline { 
	struct tape_request *(*read_block)(struct tape_device *);

	struct tape_request *(*write_block)(struct tape_device *);

	void (*process_eov)(struct tape_device*);

	/* ioctl function for additional ioctls. */

	int (*ioctl_fn)(struct tape_device *, unsigned int, unsigned long);

	/* Array of tape commands with TAPE_NR_MTOPS entries */

	tape_mtop_fn *mtop_array;

};

drivers/s390/char/tape_34xx.c

+0 −18
Original line number Diff line number Diff line
@@ -835,23 +835,6 @@ tape_34xx_irq(struct tape_device *device, struct tape_request *request, 
	return TAPE_IO_STOP;

}



/*

 * ioctl_overload

 */

static int

tape_34xx_ioctl(struct tape_device *device, unsigned int cmd, unsigned long arg)

{

	if (cmd == TAPE390_DISPLAY) {

		struct display_struct disp;



		if (copy_from_user(&disp, (char __user *) arg, sizeof(disp)) != 0)

			return -EFAULT;



		return tape_std_display(device, &disp);

	} else

		return -EINVAL;

}



static inline void

tape_34xx_append_new_sbid(struct tape_34xx_block_id bid, struct list_head *l)

{
@@ -1134,7 +1117,6 @@ static struct tape_discipline tape_discipline_34xx = { 
	.irq = tape_34xx_irq,

	.read_block = tape_std_read_block,

	.write_block = tape_std_write_block,

	.ioctl_fn = tape_34xx_ioctl,

	.mtop_array = tape_34xx_mtop

};

drivers/s390/char/tape_char.c

+1 −4
Original line number Diff line number Diff line
@@ -412,10 +412,7 @@ __tapechar_ioctl(struct tape_device *device, 


		return put_user_mtget(data, &get);

	}

	/* Try the discipline ioctl function. */

	if (device->discipline->ioctl_fn == NULL)

	return -EINVAL;

	return device->discipline->ioctl_fn(device, no, (unsigned long)data);

}



static long

drivers/s390/char/tape_std.c

+0 −32
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <asm/types.h>

#include <asm/idals.h>

#include <asm/ebcdic.h>

#include <asm/tape390.h>



#define TAPE_DBF_AREA	tape_core_dbf
@@ -118,36 +117,6 @@ tape_std_unassign (struct tape_device *device) 
	return rc;

}



/*

 * TAPE390_DISPLAY: Show a string on the tape display.

 */

int

tape_std_display(struct tape_device *device, struct display_struct *disp)

{

	struct tape_request *request;

	int rc;



	request = tape_alloc_request(2, 17);

	if (IS_ERR(request)) {

		DBF_EVENT(3, "TAPE: load display failed\n");

		return PTR_ERR(request);

	}

	request->op = TO_DIS;



	*(unsigned char *) request->cpdata = disp->cntrl;

	DBF_EVENT(5, "TAPE: display cntrl=%04x\n", disp->cntrl);

	memcpy(((unsigned char *) request->cpdata) + 1, disp->message1, 8);

	memcpy(((unsigned char *) request->cpdata) + 9, disp->message2, 8);

	ASCEBC(((unsigned char*) request->cpdata) + 1, 16);



	tape_ccw_cc(request->cpaddr, LOAD_DISPLAY, 17, request->cpdata);

	tape_ccw_end(request->cpaddr + 1, NOP, 0, NULL);



	rc = tape_do_io_interruptible(device, request);

	tape_free_request(request);

	return rc;

}



/*

 * Read block id.

 */
@@ -696,7 +665,6 @@ tape_std_process_eov(struct tape_device *device) 


EXPORT_SYMBOL(tape_std_assign);

EXPORT_SYMBOL(tape_std_unassign);

EXPORT_SYMBOL(tape_std_display);

EXPORT_SYMBOL(tape_std_read_block_id);

EXPORT_SYMBOL(tape_std_mtload);

EXPORT_SYMBOL(tape_std_mtsetblk);