From 4b2af6a40b7f404526618e6703d3677b447ce43f Mon Sep 17 00:00:00 2001 From: Jitendra Bhivare Date: Fri, 19 Aug 2016 15:20:20 +0530 Subject: [PATCH] scsi: be2iscsi: Add FUNCTION_RESET during driver unload Orabug: 25655127 Driver unload should call COMMON_FUNCTION_RESET. For TPE feature, this ensures that FW has knowledge about driver getting unloaded and can reset its bit vector. Signed-off-by: Jitendra Bhivare Reviewed-by: Hannes Reinecke Signed-off-by: Martin K. Petersen Signed-off-by: Ethan Zhao Signed-off-by: Dhaval Giani --- drivers/scsi/be2iscsi/be_cmds.c | 2 +- drivers/scsi/be2iscsi/be_cmds.h | 2 ++ drivers/scsi/be2iscsi/be_main.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/be2iscsi/be_cmds.c b/drivers/scsi/be2iscsi/be_cmds.c index dcc5b9afba7c..1e835a540e29 100644 --- a/drivers/scsi/be2iscsi/be_cmds.c +++ b/drivers/scsi/be2iscsi/be_cmds.c @@ -1595,7 +1595,7 @@ int beiscsi_check_fw_rdy(struct beiscsi_hba *phba) return rdy; } -static int beiscsi_cmd_function_reset(struct beiscsi_hba *phba) +int beiscsi_cmd_function_reset(struct beiscsi_hba *phba) { struct be_ctrl_info *ctrl = &phba->ctrl; struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem); diff --git a/drivers/scsi/be2iscsi/be_cmds.h b/drivers/scsi/be2iscsi/be_cmds.h index 5bfe9c52c1fa..ceb245b1ea5b 100644 --- a/drivers/scsi/be2iscsi/be_cmds.h +++ b/drivers/scsi/be2iscsi/be_cmds.h @@ -762,6 +762,8 @@ struct be_cmd_set_features { } param; } __packed; +int beiscsi_cmd_function_reset(struct beiscsi_hba *phba); + int beiscsi_cmd_special_wrb(struct be_ctrl_info *ctrl, u32 load); int beiscsi_check_fw_rdy(struct beiscsi_hba *phba); diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 774cba321e50..399ac854691d 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -3772,9 +3772,12 @@ static void hwi_cleanup_port(struct beiscsi_hba *phba) beiscsi_cmd_q_destroy(ctrl, q, QTYPE_EQ); } } + /* this ensures complete FW cleanup */ + beiscsi_cmd_function_reset(phba); /* last communication, indicate driver is unloading */ beiscsi_cmd_special_wrb(&phba->ctrl, 0); } + static int hwi_init_port(struct beiscsi_hba *phba) { struct hwi_controller *phwi_ctrlr; -- 2.50.1