提交 906cbf3d 编写于 作者: N Nilesh Javali 提交者: Christoph Hellwig

qla4xxx: Export sysfs DDBs from DPC handler

Issue:
modprobe qla4xxx is killed by systemd due to timeout.

Solution:
The exporting of sysfs DDBs from qla4xxx_probe_adapter added delay of
approximately 15s due to which system-udevd killed the modprobe of the
driver. Added fix to export the sysfs DDBs from the DPC handler.
Signed-off-by: NNilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: NVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: NMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: NChristoph Hellwig <hch@lst.de>
上级 d43ba46f
...@@ -601,6 +601,7 @@ struct scsi_qla_host { ...@@ -601,6 +601,7 @@ struct scsi_qla_host {
#define DPC_HA_NEED_QUIESCENT 22 /* 0x00400000 ISP-82xx only*/ #define DPC_HA_NEED_QUIESCENT 22 /* 0x00400000 ISP-82xx only*/
#define DPC_POST_IDC_ACK 23 /* 0x00800000 */ #define DPC_POST_IDC_ACK 23 /* 0x00800000 */
#define DPC_RESTORE_ACB 24 /* 0x01000000 */ #define DPC_RESTORE_ACB 24 /* 0x01000000 */
#define DPC_SYSFS_DDB_EXPORT 25 /* 0x02000000 */
struct Scsi_Host *host; /* pointer to host data */ struct Scsi_Host *host; /* pointer to host data */
uint32_t tot_ddbs; uint32_t tot_ddbs;
......
...@@ -281,6 +281,7 @@ int qla4_83xx_get_port_config(struct scsi_qla_host *ha, uint32_t *config); ...@@ -281,6 +281,7 @@ int qla4_83xx_get_port_config(struct scsi_qla_host *ha, uint32_t *config);
int qla4_83xx_set_port_config(struct scsi_qla_host *ha, uint32_t *config); int qla4_83xx_set_port_config(struct scsi_qla_host *ha, uint32_t *config);
int qla4_8xxx_check_init_adapter_retry(struct scsi_qla_host *ha); int qla4_8xxx_check_init_adapter_retry(struct scsi_qla_host *ha);
int qla4_83xx_is_detached(struct scsi_qla_host *ha); int qla4_83xx_is_detached(struct scsi_qla_host *ha);
int qla4xxx_sysfs_ddb_export(struct scsi_qla_host *ha);
extern int ql4xextended_error_logging; extern int ql4xextended_error_logging;
extern int ql4xdontresethba; extern int ql4xdontresethba;
......
...@@ -4565,6 +4565,7 @@ static void qla4xxx_timer(struct scsi_qla_host *ha) ...@@ -4565,6 +4565,7 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
test_bit(DPC_LINK_CHANGED, &ha->dpc_flags) || test_bit(DPC_LINK_CHANGED, &ha->dpc_flags) ||
test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags) || test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags) ||
test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags) || test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags) ||
test_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags) ||
test_bit(DPC_AEN, &ha->dpc_flags)) { test_bit(DPC_AEN, &ha->dpc_flags)) {
DEBUG2(printk("scsi%ld: %s: scheduling dpc routine" DEBUG2(printk("scsi%ld: %s: scheduling dpc routine"
" - dpc flags = 0x%lx\n", " - dpc flags = 0x%lx\n",
...@@ -5429,6 +5430,11 @@ static void qla4xxx_do_dpc(struct work_struct *work) ...@@ -5429,6 +5430,11 @@ static void qla4xxx_do_dpc(struct work_struct *work)
qla4xxx_relogin_all_devices(ha); qla4xxx_relogin_all_devices(ha);
} }
} }
if (test_and_clear_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags)) {
if (qla4xxx_sysfs_ddb_export(ha))
ql4_printk(KERN_ERR, ha, "%s: Error exporting ddb to sysfs\n",
__func__);
}
} }
/** /**
...@@ -8406,7 +8412,7 @@ static int qla4xxx_sysfs_ddb_delete(struct iscsi_bus_flash_session *fnode_sess) ...@@ -8406,7 +8412,7 @@ static int qla4xxx_sysfs_ddb_delete(struct iscsi_bus_flash_session *fnode_sess)
* *
* Export the firmware DDB for all send targets and normal targets to sysfs. * Export the firmware DDB for all send targets and normal targets to sysfs.
**/ **/
static int qla4xxx_sysfs_ddb_export(struct scsi_qla_host *ha) int qla4xxx_sysfs_ddb_export(struct scsi_qla_host *ha)
{ {
struct dev_db_entry *fw_ddb_entry = NULL; struct dev_db_entry *fw_ddb_entry = NULL;
dma_addr_t fw_ddb_entry_dma; dma_addr_t fw_ddb_entry_dma;
...@@ -8844,10 +8850,7 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, ...@@ -8844,10 +8850,7 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
ql4_printk(KERN_ERR, ha, ql4_printk(KERN_ERR, ha,
"%s: No iSCSI boot target configured\n", __func__); "%s: No iSCSI boot target configured\n", __func__);
if (qla4xxx_sysfs_ddb_export(ha)) set_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags);
ql4_printk(KERN_ERR, ha,
"%s: Error exporting ddb to sysfs\n", __func__);
/* Perform the build ddb list and login to each */ /* Perform the build ddb list and login to each */
qla4xxx_build_ddb_list(ha, INIT_ADAPTER); qla4xxx_build_ddb_list(ha, INIT_ADAPTER);
iscsi_host_for_each_session(ha->host, qla4xxx_login_flash_ddb); iscsi_host_for_each_session(ha->host, qla4xxx_login_flash_ddb);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册