From: Chenguangli chenguangli2@huawei.com
driver inclusion category: bug bugzilla: NA
------------------------------------------------------------------
Resolved the issue that the system is suspended due to log screen flushing during the pressure test.
Signed-off-by: Chenguangli chenguangli2@huawei.com Reviewed-by: Zengweiliang zengweiliang.zengweiliang@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- drivers/scsi/huawei/hifc/unf_common.h | 2 +- drivers/scsi/huawei/hifc/unf_log.h | 2 +- drivers/scsi/huawei/hifc/unf_service.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/huawei/hifc/unf_common.h b/drivers/scsi/huawei/hifc/unf_common.h index c338ef1c7e4e..2793acb5dea7 100644 --- a/drivers/scsi/huawei/hifc/unf_common.h +++ b/drivers/scsi/huawei/hifc/unf_common.h @@ -13,7 +13,7 @@ /* B version, B0XX Corresponding x.x */ #define UNF_B_VERSION "5.0" /* Indicates the minor version number of the driver */ -#define UNF_DRIVER_VERSION "9" +#define UNF_DRIVER_VERSION "10" /* version num */ #define UNF_FC_VERSION UNF_MAJOR_VERSION "." UNF_B_VERSION "." UNF_DRIVER_VERSION extern unsigned int unf_dbg_level; diff --git a/drivers/scsi/huawei/hifc/unf_log.h b/drivers/scsi/huawei/hifc/unf_log.h index a46a77a42ded..1da7ab821b10 100644 --- a/drivers/scsi/huawei/hifc/unf_log.h +++ b/drivers/scsi/huawei/hifc/unf_log.h @@ -58,7 +58,7 @@ enum event_log_e { #define UNF_IO_ATT_PRINT_TIMES 2 #define UNF_LOGIN_ATT_PRINT_TIMES 100
-#define UNF_IO_ATT_PRINT_LIMIT msecs_to_jiffies(2 * 1000) +#define UNF_IO_ATT_PRINT_LIMIT msecs_to_jiffies(6 * 1000)
extern unsigned int unf_dbg_level; extern unsigned int log_print_level; diff --git a/drivers/scsi/huawei/hifc/unf_service.c b/drivers/scsi/huawei/hifc/unf_service.c index 263d5b43fc99..ec6e3fa96a47 100644 --- a/drivers/scsi/huawei/hifc/unf_service.c +++ b/drivers/scsi/huawei/hifc/unf_service.c @@ -2074,6 +2074,9 @@ unsigned int unf_send_rrq(struct unf_lport_s *v_lport, UNF_CHECK_VALID(0x3363, UNF_TRUE, v_rport, return UNF_RETURN_ERROR); UNF_CHECK_VALID(0x3364, UNF_TRUE, v_xchg, return UNF_RETURN_ERROR);
+ if (v_xchg->rport_bind_jifs != v_rport->rport_alloc_jifs || + (v_rport->nport_id == INVALID_VALUE32)) + return ret; /* Get & Set New free Exchange for RRQ */ xchg = unf_get_sfs_free_xchg_and_init(v_lport, v_rport->nport_id, v_rport, &fc_entry);