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

Commit 156013ff authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

[S390] cio: wake up on failed recognition 



Wake up even on failed device recognition, since this may be triggered
from a user trying to force a device online. With this patch a write
to the online sysfs attribute will not block for ever but return with
-EAGAIN in this case.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 33b26d79

drivers/s390/cio/device.c

+8 −2
Original line number Diff line number Diff line
@@ -482,17 +482,21 @@ static int online_store_recog_and_online(struct ccw_device *cdev) 
		}

		wait_event(cdev->private->wait_q,

			   cdev->private->flags.recog_done);

		if (cdev->private->state != DEV_STATE_OFFLINE)

			/* recognition failed */

			return -EAGAIN;

	}

	if (cdev->drv && cdev->drv->set_online)

		ccw_device_set_online(cdev);

	return 0;

}



static int online_store_handle_online(struct ccw_device *cdev, int force)

{

	int ret;



	ret = online_store_recog_and_online(cdev);

	if (ret)

	if (ret && !force)

		return ret;

	if (force && cdev->private->state == DEV_STATE_BOXED) {

		ret = ccw_device_stlck(cdev);
@@ -500,7 +504,9 @@ static int online_store_handle_online(struct ccw_device *cdev, int force) 
			return ret;

		if (cdev->id.cu_type == 0)

			cdev->private->state = DEV_STATE_NOT_OPER;

		online_store_recog_and_online(cdev);

		ret = online_store_recog_and_online(cdev);

		if (ret)

			return ret;

	}

	return 0;

}

drivers/s390/cio/device_fsm.c

+2 −2
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) 
		if (state == DEV_STATE_NOT_OPER) {

			cdev->private->flags.recog_done = 1;

			cdev->private->state = DEV_STATE_DISCONNECTED;

			wake_up(&cdev->private->wait_q);

			return;

		}

		/* Boxed devices don't need extra treatment. */
@@ -311,7 +312,6 @@ ccw_device_recog_done(struct ccw_device *cdev, int state) 
	}

	cdev->private->state = state;

	io_subchannel_recog_done(cdev);

	if (state != DEV_STATE_NOT_OPER)

	wake_up(&cdev->private->wait_q);

}