s390 (2/8): common i/o layer.
Subsystems (2)
PATCH 1/1 s390 (2/8): common i/o layer.
- Correctly initialize all spin_locks with spin_lock_init.
- Use subchannel lock directly instead of ccw device lock pointer in ccw_device_recognition to avoid accessing an already free structure.
- Take/release ccw device lock in ccw_device_console_enable.
diffstat:
drivers/s390/cio/cio.c | 3 ++- drivers/s390/cio/device.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-)
drivers/s390/cio/cio.c +2 -1
@@ -1,7 +1,7 @@/* * drivers/s390/cio/cio.c * S/390 common I/O routines -- low level i/o calls -* $Revision: 1.105 $ +* $Revision: 1.106 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation
@@ -512,6 +512,7 @@/* Nuke all fields. */ memset (sch,0 ,sizeof (struct subchannel )); +spin_lock_init (&sch->lock);/* * The first subchannel that is not-operational (ccode==3) * indicates that there aren't any more devices available.
drivers/s390/cio/device.c +9 -4
@@ -562,9 +562,9 @@atomic_inc (&ccw_device_init_count);/* Start async. device sensing. */ -spin_lock_irq (cdev->ccwlock); +spin_lock_irq (&sch->lock); rc =ccw_device_recognition (cdev); -spin_unlock_irq (cdev->ccwlock); +spin_unlock_irq (&sch->lock);if (rc) {if (atomic_dec_and_test (&ccw_device_init_count))wake_up (&ccw_device_init_wq);
@@ -662,15 +662,20 @@return rc;/* Now wait for the async. recognition to come to an end. */ +spin_lock_irq (cdev->ccwlock);while (!dev_fsm_final_state (cdev))wait_cons_dev (); + rc = -EIO ;if (cdev->private->state !=DEV_STATE_OFFLINE ) -return -EIO ; + goto out_unlock;ccw_device_online (cdev);while (!dev_fsm_final_state (cdev))wait_cons_dev ();if (cdev->private->state !=DEV_STATE_ONLINE ) -return -EIO ; + goto out_unlock; + rc =0 ; +out_unlock: +spin_unlock_irq (cdev->ccwlock);return 0 ; }