Commit c70a11ed authored by Vineeth Vijayan's avatar Vineeth Vijayan Committed by sanglipeng
Browse files

s390/cio: unregister device when the only path is gone 

stable inclusion
from stable-v5.10.186
commit 97b6c4c1d1a8483818e5fd46112409cead4ac0f7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8J4KH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=97b6c4c1d1a8483818e5fd46112409cead4ac0f7



--------------------------------

[ Upstream commit 89c0c62e ]

Currently, if the device is offline and all the channel paths are
either configured or varied offline, the associated subchannel gets
unregistered. Don't unregister the subchannel, instead unregister
offline device.

Signed-off-by: default avatarVineeth Vijayan <vneethv@linux.ibm.com>
Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 62face0f

drivers/s390/cio/device.c

+4 −1
Original line number Diff line number Diff line
@@ -1385,6 +1385,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev) 
enum io_sch_action {

	IO_SCH_UNREG,

	IO_SCH_ORPH_UNREG,

	IO_SCH_UNREG_CDEV,

	IO_SCH_ATTACH,

	IO_SCH_UNREG_ATTACH,

	IO_SCH_ORPH_ATTACH,
@@ -1417,7 +1418,7 @@ static enum io_sch_action sch_get_action(struct subchannel *sch) 
	}

	if ((sch->schib.pmcw.pam & sch->opm) == 0) {

		if (ccw_device_notify(cdev, CIO_NO_PATH) != NOTIFY_OK)

			return IO_SCH_UNREG;

			return IO_SCH_UNREG_CDEV;

		return IO_SCH_DISC;

	}

	if (device_is_disconnected(cdev))
@@ -1479,6 +1480,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process) 
	case IO_SCH_ORPH_ATTACH:

		ccw_device_set_disconnected(cdev);

		break;

	case IO_SCH_UNREG_CDEV:

	case IO_SCH_UNREG_ATTACH:

	case IO_SCH_UNREG:

		if (!cdev)
@@ -1512,6 +1514,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process) 
		if (rc)

			goto out;

		break;

	case IO_SCH_UNREG_CDEV:

	case IO_SCH_UNREG_ATTACH:

		spin_lock_irqsave(sch->lock, flags);

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