s390 (5/7): tape driver.
PATCH 1/1 s390 (5/7): tape driver.
s390 tape driver changes:
- Prevent offline while device is in use.
- Do not use bus_id string in debug feature messages.
- Check for IS_ERR(irb) error conditions in interrupt handler.
- Fix removing tape discipline modules.
diffstat:
drivers/s390/char/tape.h | 5 - drivers/s390/char/tape_34xx.c | 24 ++--- drivers/s390/char/tape_block.c | 7 + drivers/s390/char/tape_core.c | 196 +++++++++++++++++++++++++++++++++-------- drivers/s390/char/tape_std.c | 22 +++- 5 files changed, 198 insertions(+), 56 deletions(-)
drivers/s390/char/tape.h +3 -2
@@ -198,6 +198,7 @@/* entry in tape_device_list */ struct list_head node; +int cdev_id;struct ccw_device * cdev;struct tape_class_device * nt;struct tape_class_device * rt;
@@ -263,8 +264,8 @@extern int tape_mtop (struct tape_device *,int ,int );extern void tape_state_set (struct tape_device *,enum tape_state ); -extern int tape_enable_device (struct tape_device *,struct tape_discipline *); -extern void tape_disable_device (struct tape_device *device); +extern int tape_generic_online (struct tape_device *,struct tape_discipline *); +extern int tape_generic_offline (struct tape_device *device);/* Externals from tape_devmap.c */ extern int tape_generic_probe (struct ccw_device *);
drivers/s390/char/tape_34xx.c +12 -12
@@ -202,8 +202,7 @@tape_34xx_delete_sbid_from (device,0 );tape_34xx_schedule_work (device,TO_MSEN ); }else { -DBF_EVENT (3 ,"unsol.irq! dev end: %s\n" , - device->cdev->dev.bus_id); +DBF_EVENT (3 ,"unsol.irq! dev end: %08x\n" , device->cdev_id);PRINT_WARN ("Unsolicited IRQ (Device End) caught.\n" );tape_dump_sense (device,NULL , irb); }
@@ -1314,17 +1313,18 @@ };static int -tape_34xx_enable (struct ccw_device *cdev) +tape_34xx_online (struct ccw_device *cdev) { -return tape_enable_device (cdev->dev.driver_data, - &tape_discipline_34xx); +return tape_generic_online ( + cdev->dev.driver_data, + &tape_discipline_34xx + ); }static int -tape_34xx_disable (struct ccw_device *cdev) +tape_34xx_offline (struct ccw_device *cdev) { -tape_disable_device (cdev->dev.driver_data); -return 0 ; +return tape_generic_offline (cdev->dev.driver_data); }static struct ccw_driver tape_34xx_driver = {
@@ -1333,8 +1333,8 @@ .ids = tape_34xx_ids, .probe = tape_generic_probe, .remove = tape_generic_remove, - .set_online = tape_34xx_enable, - .set_offline = tape_34xx_disable, + .set_online = tape_34xx_online, + .set_offline = tape_34xx_offline, }; static int
@@ -1342,7 +1342,7 @@ {int rc; -DBF_EVENT (3 ,"34xx init: $Revision: 1.18 $\n" ); +DBF_EVENT (3 ,"34xx init: $Revision: 1.19 $\n" );/* Register driver for 3480/3490 tapes. */ rc =ccw_driver_register (&tape_34xx_driver);if (rc)
@@ -1361,7 +1361,7 @@MODULE_DEVICE_TABLE (ccw, tape_34xx_ids);MODULE_AUTHOR ("(C) 2001-2002 IBM Deutschland Entwicklung GmbH" );MODULE_DESCRIPTION ("Linux on zSeries channel attached 3480 tape " -"device driver ($Revision: 1.18 $)" ); +"device driver ($Revision: 1.19 $)" );MODULE_LICENSE ("GPL" );module_init (tape_34xx_init);
drivers/s390/char/tape_block.c +7 -0
@@ -274,12 +274,19 @@flush_scheduled_work (); device->blk_data.requeue_task.data =tape_put_device (device); +if (!device->blk_data.disk) { +PRINT_ERR ("(%s): No gendisk to clean up!\n" , + device->cdev->dev.bus_id); + goto cleanup_queue; + } +del_gendisk (device->blk_data.disk); device->blk_data.disk->private_data =tape_put_device (device->blk_data.disk->private_data);put_disk (device->blk_data.disk); device->blk_data.disk =NULL ; +cleanup_queue: device->blk_data.request_queue->queuedata =tape_put_device (device);blk_cleanup_queue (device->blk_data.request_queue);
drivers/s390/char/tape_core.c +161 -35
305 lines not on this page · raw message
drivers/s390/char/tape_std.c +15 -7
@@ -42,8 +42,8 @@spin_lock_irq (get_ccwdev_lock (device->cdev));if (request->callback !=NULL ) { -DBF_EVENT (3 ,"%s: Assignment timeout. Device busy.\n" , - device->cdev->dev.bus_id); +DBF_EVENT (3 ,"%08x: Assignment timeout. Device busy.\n" , + device->cdev_id);PRINT_ERR ("%s: Assignment timeout. Device busy.\n" , device->cdev->dev.bus_id);ccw_device_clear (device->cdev, (long ) request);
@@ -84,10 +84,10 @@if (rc !=0 ) {PRINT_WARN ("%s: assign failed - device might be busy\n" , device->cdev->dev.bus_id); -DBF_EVENT (3 ,"%s: assign failed - device might be busy\n" , - device->cdev->dev.bus_id); +DBF_EVENT (3 ,"%08x: assign failed - device might be busy\n" , + device->cdev_id); }else { -DBF_EVENT (3 ,"%s: Tape assigned\n" , device->cdev->dev.bus_id); +DBF_EVENT (3 ,"%08x: Tape assigned\n" , device->cdev_id); }tape_free_request (request);return rc;
@@ -102,6 +102,14 @@int rc;struct tape_request *request; +if (device->tape_state ==TS_NOT_OPER ) { +DBF_EVENT (3 ,"(%08x): Can't unassign device\n" , + device->cdev_id); +PRINT_WARN ("(%s): Can't unassign device - device gone\n" , + device->cdev->dev.bus_id); +return -EIO ; + } + request =tape_alloc_request (2 ,11 );if (IS_ERR (request))return PTR_ERR (request);
@@ -111,10 +119,10 @@tape_ccw_end (request->cpaddr +1 ,NOP ,0 ,NULL );if ((rc =tape_do_io (device, request)) !=0 ) { -DBF_EVENT (3 ,"%s: Unassign failed\n" , device->cdev->dev.bus_id); +DBF_EVENT (3 ,"%08x: Unassign failed\n" , device->cdev_id);PRINT_WARN ("%s: Unassign failed\n" , device->cdev->dev.bus_id); }else { -DBF_EVENT (3 ,"%s: Tape unassigned\n" , device->cdev->dev.bus_id); +DBF_EVENT (3 ,"%08x: Tape unassigned\n" , device->cdev_id); }tape_free_request (request);return rc;