s390: zfcp host adapter.
Subsystems (2)
PATCH 8/10 s390: zfcp host adapter.
[patch 8/10] s390: zfcp host adapter.
From: Andreas Herrmann <[email protected]>
zfcp host adapter change:
- Avoid usage of unregister debug feature.
- Avoid race when unregistering debug feature.
- Corrected some log messages for WKA ports.
- Don't pass NULL pointer to debug_register_view and debug_set_level.
- Some coding style cleanup.
- Fix race between scsi_add_device and deregistration of the adapter.
- Shorten & rename zfcp_els/zfcp_els_handler.
- Remove unused code for unused ELS commands.
- Evaluate response instead of request in adisc handler.
- Allocate qdio queue structures below 2GB.
- Remove ifdefs around ioctl32.h.
- Use CONFIG_COMPAT instead of CONFIG_S390_SUPPORT.
- Use semaphore in zfcp_ccw_shutdown.
- Strip down debug_register/debug_unregister.
diffstat:
drivers/s390/scsi/zfcp_aux.c | 67 +++---- drivers/s390/scsi/zfcp_ccw.c | 4 drivers/s390/scsi/zfcp_def.h | 97 +--------- drivers/s390/scsi/zfcp_erp.c | 384 +++++++++++++++---------------------------- drivers/s390/scsi/zfcp_fsf.c | 64 +++---- 5 files changed, 217 insertions(+), 399 deletions(-)
drivers/s390/scsi/zfcp_aux.c +31 -36
@@ -29,8 +29,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* this drivers version (do not edit !!! generated and updated by cvs) */ -#define ZFCP_AUX_REVISION "$Revision: 1.135 $" +#define ZFCP_AUX_REVISION "$Revision: 1.144 $"#include "zfcp_ext.h"
@@ -61,7 +60,7 @@#define ZFCP_CFDC_IOC \ _IOWR(ZFCP_CFDC_IOC_MAGIC, 0, struct zfcp_cfdc_sense_data) -#ifdef CONFIG_S390_SUPPORT +#ifdef CONFIG_COMPAT static struct ioctl_trans zfcp_ioctl_trans = {ZFCP_CFDC_IOC , (void *) sys_ioctl};#endif
@@ -147,7 +146,7 @@int i;unsigned long flags; -write_lock_irqsave (&adapter->cmd_dbf_lock, flags); +spin_lock_irqsave (&adapter->dbf_lock, flags);if (zfcp_fsf_req_is_scsi_cmnd (fsf_req)) { scsi_cmnd = fsf_req->data.send_fcp_command_task.scsi_cmnd;debug_text_event (adapter->cmd_dbf, level,"fsferror" );
@@ -166,7 +165,7 @@ (char *) add_data + i, min(ZFCP_CMD_DBF_LENGTH, add_length - i)); } -write_unlock_irqrestore (&adapter->cmd_dbf_lock, flags); +spin_unlock_irqrestore (&adapter->dbf_lock, flags); }/* XXX additionally log unit if available */
@@ -183,7 +182,7 @@ adapter = (struct zfcp_adapter *) scsi_cmnd->device->host->hostdata[0 ]; req_data = (union zfcp_req_data *) scsi_cmnd->host_scribble; fsf_req = (req_data ? req_data->send_fcp_command_task.fsf_req :NULL ); -write_lock_irqsave (&adapter->cmd_dbf_lock, flags); +spin_lock_irqsave (&adapter->dbf_lock, flags);debug_text_event (adapter->cmd_dbf, level,"hostbyte" );debug_text_event (adapter->cmd_dbf, level, text);debug_event (adapter->cmd_dbf, level, &scsi_cmnd->result,sizeof (u32));
@@ -200,7 +199,7 @@debug_text_event (adapter->cmd_dbf, level,"" );debug_text_event (adapter->cmd_dbf, level,"" ); } -write_unlock_irqrestore (&adapter->cmd_dbf_lock, flags); +spin_unlock_irqrestore (&adapter->dbf_lock, flags); }void
@@ -280,7 +279,7 @@ goto out_unit;up (&zfcp_data.config_sema);ccw_device_set_online (adapter->ccw_device); -wait_event (unit->scsi_add_wq,atomic_read (&unit->scsi_add_work) ==0 ); +zfcp_erp_wait (adapter);down (&zfcp_data.config_sema);zfcp_unit_put (unit); out_unit:
@@ -310,14 +309,13 @@if (!zfcp_transport_template)return -ENODEV ; -#ifdef CONFIG_S390_SUPPORT retval =register_ioctl32_conversion (zfcp_ioctl_trans.cmd, zfcp_ioctl_trans.handler);if (retval !=0 ) {ZFCP_LOG_INFO ("registration of ioctl32 conversion failed\n" ); - goto out_ioctl32; + goto out; } -#endif + retval =misc_register (&zfcp_cfdc_misc);if (retval !=0 ) { ZFCP_LOG_INFO("registration of misc device "
@@ -352,11 +350,7 @@ out_ccw_register:misc_deregister (&zfcp_cfdc_misc); out_misc_register: -#ifdef CONFIG_S390_SUPPORT unregister_ioctl32_conversion (zfcp_ioctl_trans.cmd); - out_ioctl32: -#endif - out:return retval; }
@@ -868,7 +862,6 @@return NULL ;memset (unit,0 ,sizeof (struct zfcp_unit )); -init_waitqueue_head (&unit->scsi_add_wq);/* initialise reference count stuff */ atomic_set (&unit->refcount,0 );init_waitqueue_head (&unit->remove_wq);
@@ -1042,11 +1035,11 @@char dbf_name[20 ];/* debug feature area which records SCSI command failures (hostbyte) */ -rwlock_init (&adapter->cmd_dbf_lock); +spin_lock_init (&adapter->dbf_lock); +sprintf (dbf_name,ZFCP_CMD_DBF_NAME "%s" ,zfcp_get_busid_by_adapter (adapter)); - adapter->cmd_dbf =debug_register (dbf_name, -ZFCP_CMD_DBF_INDEX , + adapter->cmd_dbf =debug_register (dbf_name,ZFCP_CMD_DBF_INDEX ,ZFCP_CMD_DBF_AREAS ,ZFCP_CMD_DBF_LENGTH );debug_register_view (adapter->cmd_dbf, &debug_hex_ascii_view);
@@ -1055,40 +1048,38 @@/* debug feature area which records SCSI command aborts */ sprintf (dbf_name,ZFCP_ABORT_DBF_NAME "%s" ,zfcp_get_busid_by_adapter (adapter)); - adapter->abort_dbf =debug_register (dbf_name, -ZFCP_ABORT_DBF_INDEX , + adapter->abort_dbf =debug_register (dbf_name,ZFCP_ABORT_DBF_INDEX ,ZFCP_ABORT_DBF_AREAS ,ZFCP_ABORT_DBF_LENGTH );debug_register_view (adapter->abort_dbf, &debug_hex_ascii_view);debug_set_level (adapter->abort_dbf,ZFCP_ABORT_DBF_LEVEL ); -/* debug feature area which records SCSI command aborts */ +/* debug feature area which records incoming ELS commands */ sprintf (dbf_name,ZFCP_IN_ELS_DBF_NAME "%s" ,zfcp_get_busid_by_adapter (adapter)); - adapter->in_els_dbf =debug_register (dbf_name, -ZFCP_IN_ELS_DBF_INDEX , + adapter->in_els_dbf =debug_register (dbf_name,ZFCP_IN_ELS_DBF_INDEX ,ZFCP_IN_ELS_DBF_AREAS ,ZFCP_IN_ELS_DBF_LENGTH );debug_register_view (adapter->in_els_dbf, &debug_hex_ascii_view);debug_set_level (adapter->in_els_dbf,ZFCP_IN_ELS_DBF_LEVEL ); -/* debug feature area which records erp events */ sprintf (dbf_name,ZFCP_ERP_DBF_NAME "%s" ,zfcp_get_busid_by_adapter (adapter)); - adapter->erp_dbf =debug_register (dbf_name, -ZFCP_ERP_DBF_INDEX , + adapter->erp_dbf =debug_register (dbf_name,ZFCP_ERP_DBF_INDEX ,ZFCP_ERP_DBF_AREAS ,ZFCP_ERP_DBF_LENGTH );debug_register_view (adapter->erp_dbf, &debug_hex_ascii_view);debug_set_level (adapter->erp_dbf,ZFCP_ERP_DBF_LEVEL ); -if (adapter->cmd_dbf && adapter->abort_dbf && - adapter->in_els_dbf && adapter->erp_dbf) -return 0 ; +if (!(adapter->cmd_dbf && adapter->abort_dbf && + adapter->in_els_dbf && adapter->erp_dbf)) { +zfcp_adapter_debug_unregister (adapter); +return -ENOMEM ; + } + +return 0 ; -zfcp_adapter_debug_unregister (adapter); -return -ENOMEM ; }/**
@@ -1098,10 +1089,14 @@void zfcp_adapter_debug_unregister (struct zfcp_adapter *adapter) { -debug_unregister (adapter->erp_dbf); -debug_unregister (adapter->cmd_dbf); -debug_unregister (adapter->abort_dbf); -debug_unregister (adapter->in_els_dbf); +debug_unregister (adapter->abort_dbf); +debug_unregister (adapter->cmd_dbf); +debug_unregister (adapter->erp_dbf); +debug_unregister (adapter->in_els_dbf); + adapter->abort_dbf =NULL ; + adapter->cmd_dbf =NULL ; + adapter->erp_dbf =NULL ; + adapter->in_els_dbf =NULL ; }void
drivers/s390/scsi/zfcp_ccw.c +3 -1
@@ -27,7 +27,7 @@* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#define ZFCP_CCW_C_REVISION "$Revision: 1.57 $" +#define ZFCP_CCW_C_REVISION "$Revision: 1.58 $"#include "zfcp_ext.h"
@@ -302,9 +302,11 @@ {struct zfcp_adapter *adapter; +down (&zfcp_data.config_sema); adapter =dev_get_drvdata (dev);zfcp_erp_adapter_shutdown (adapter,0 );zfcp_erp_wait (adapter); +up (&zfcp_data.config_sema); }#undef ZFCP_LOG_AREA
drivers/s390/scsi/zfcp_def.h +16 -81
155 lines not on this page · raw message
drivers/s390/scsi/zfcp_erp.c +135 -249
497 lines not on this page · raw message
drivers/s390/scsi/zfcp_fsf.c +32 -32
177 lines not on this page · raw message