Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d030370 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

[S390] Remove P390 support. 



Most likely it is broken anyway because of the changes in memory
detection. Since we can't test it and there are probably better ways
that using a P390 card, remove support for it.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent a44008f2

arch/s390/kernel/early.c

+0 −4
Original line number Diff line number Diff line
@@ -183,10 +183,6 @@ static noinline __init void detect_machine_type(void) 
	if (cpuinfo->cpu_id.version == 0xff)

		machine_flags |= MACHINE_FLAG_VM;



	/* Running on a P/390 ? */

	if (cpuinfo->cpu_id.machine == 0x7490)

		machine_flags |= MACHINE_FLAG_P390;



	/* Running under KVM ? */

	if (cpuinfo->cpu_id.version == 0xfe)

		machine_flags |= MACHINE_FLAG_KVM;

arch/s390/kernel/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -205,12 +205,6 @@ static void __init conmode_default(void) 
			SET_CONSOLE_SCLP;

#endif

		}

        } else if (MACHINE_IS_P390) {

#if defined(CONFIG_TN3215_CONSOLE)

		SET_CONSOLE_3215;

#elif defined(CONFIG_TN3270_CONSOLE)

		SET_CONSOLE_3270;

#endif

	} else {

#if defined(CONFIG_SCLP_CONSOLE) || defined(CONFIG_SCLP_VT220_CONSOLE)

		SET_CONSOLE_SCLP;

drivers/s390/char/con3215.c

+1 −8
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) 
	struct raw3215_req *req;

	struct tty_struct *tty;

	int cstat, dstat;

	int count, slen;

	int count;



	raw = cdev->dev.driver_data;

	req = (struct raw3215_req *) intparm;
@@ -390,8 +390,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) 
			break;

		/* Attention interrupt, someone hit the enter key */

		raw3215_mk_read_req(raw);

		if (MACHINE_IS_P390)

			memset(raw->inbuf, 0, RAW3215_INBUF_SIZE);

		tasklet_schedule(&raw->tasklet);

		break;

	case 0x08:
@@ -414,11 +412,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) 


			tty = raw->tty;

			count = 160 - req->residual;

			if (MACHINE_IS_P390) {

				slen = strnlen(raw->inbuf, RAW3215_INBUF_SIZE);

				if (count > slen)

					count = slen;

			} else

			EBCASC(raw->inbuf, count);

			cchar = ctrlchar_handle(raw->inbuf, count, tty);

			switch (cchar & CTRLCHAR_MASK) {

drivers/s390/char/sclp.c

+0 −2
Original line number Diff line number Diff line
@@ -883,8 +883,6 @@ sclp_init(void) 
	unsigned long flags;

	int rc;



	if (!MACHINE_HAS_SCLP)

		return -ENODEV;

	spin_lock_irqsave(&sclp_lock, flags);

	/* Check for previous or running initialization */

	if (sclp_init_state != sclp_init_state_uninitialized) {

drivers/s390/net/cu3088.c

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ const char *cu3088_type[] = { 
	"CTC/A",

	"ESCON channel",

	"FICON channel",

	"P390 LCS card",

	"OSA LCS card",

	"CLAW channel device",

	"unknown channel type",
@@ -49,7 +48,6 @@ static struct ccw_device_id cu3088_ids[] = { 
	{ CCW_DEVICE(0x3088, 0x08), .driver_info = channel_type_parallel },

	{ CCW_DEVICE(0x3088, 0x1f), .driver_info = channel_type_escon },

	{ CCW_DEVICE(0x3088, 0x1e), .driver_info = channel_type_ficon },

	{ CCW_DEVICE(0x3088, 0x01), .driver_info = channel_type_p390 },

	{ CCW_DEVICE(0x3088, 0x60), .driver_info = channel_type_osa2 },

	{ CCW_DEVICE(0x3088, 0x61), .driver_info = channel_type_claw },

	{ /* end of list */ }