Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ed0de87ce6be92bd84858ad496ffaf60344495a3

Authored by Giridhar Malavali
Committed by James Bottomley
1 parent 0e8edb0303
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] qla2xxx: Add the ql2xdontresethba module_param. 

Also, change the ISP82xx code to only reset if this module_param is set
and reset is intended via the QLA82XX_DEV_NEED_RESET case.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

Showing 3 changed files with 10 additions and 0 deletions Side-by-side Diff

drivers/scsi/qla2xxx/qla_gbl.h
Diff comments   View file @ ed0de87
... ... @@ -102,6 +102,7 @@
102 102 extern int ql2xenabledif;
103 103 extern int ql2xenablehba_err_chk;
104 104 extern int ql2xtargetreset;
  105 +extern int ql2xdontresethba;
105 106  
106 107 extern int qla2x00_loop_reset(scsi_qla_host_t *);
107 108 extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
drivers/scsi/qla2xxx/qla_nx.c
Diff comments   View file @ ed0de87
... ... @@ -3585,6 +3585,7 @@
3585 3585 qla82xx_idc_lock(ha);
3586 3586 break;
3587 3587 case QLA82XX_DEV_NEED_RESET:
  3588 + if (!ql2xdontresethba)
3588 3589 qla82xx_need_reset_handler(vha);
3589 3590 dev_init_timeout = jiffies +
3590 3591 (ha->nx_dev_init_timeout * HZ);
drivers/scsi/qla2xxx/qla_os.c
Diff comments   View file @ ed0de87
... ... @@ -164,6 +164,14 @@
164 164 MODULE_PARM_DESC(ql2xasynctmfenable,
165 165 "Enables issue of TM IOCBs asynchronously via IOCB mechanism"
166 166 "Default is 0 - Issue TM IOCBs via mailbox mechanism.");
  167 +
  168 +int ql2xdontresethba;
  169 +module_param(ql2xdontresethba, int, S_IRUGO);
  170 +MODULE_PARM_DESC(ql2xdontresethba,
  171 + "Option to specify reset behaviour\n"
  172 + " 0 (Default) -- Reset on failure.\n"
  173 + " 1 -- Do not reset on failure.\n");
  174 +
167 175 /*
168 176 * SCSI host template entry points
169 177 */