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

Commit 31370f75 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/cio: suppress 2nd path verification during resume 



Do not trigger a path verification in the subchannel event
function during resume from hibernate. This will be started
by the pm_restore callback later.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2ab3f29d

drivers/s390/cio/device.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -1424,7 +1424,7 @@ static enum io_sch_action sch_get_action(struct subchannel *sch) 
	}

	}

	if (device_is_disconnected(cdev))

	if (device_is_disconnected(cdev))

		return IO_SCH_REPROBE;

		return IO_SCH_REPROBE;

	if (cdev->online)

	if (cdev->online && !cdev->private->flags.resuming)

		return IO_SCH_VERIFY;

		return IO_SCH_VERIFY;

	if (cdev->private->state == DEV_STATE_NOT_OPER)

	if (cdev->private->state == DEV_STATE_NOT_OPER)

		return IO_SCH_UNREG_ATTACH;

		return IO_SCH_UNREG_ATTACH;
@@ -1469,12 +1469,6 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process) 
		rc = 0;

		rc = 0;

		goto out_unlock;

		goto out_unlock;

	case IO_SCH_VERIFY:

	case IO_SCH_VERIFY:

		if (cdev->private->flags.resuming == 1) {

			if (cio_enable_subchannel(sch, (u32)(addr_t)sch)) {

				ccw_device_set_notoper(cdev);

				break;

			}

		}

		/* Trigger path verification. */

		/* Trigger path verification. */

		io_subchannel_verify(sch);

		io_subchannel_verify(sch);

		rc = 0;

		rc = 0;