leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: mpt3sas: renamed _base_after_reset_handler function

Browse Source 
Renamed _base_after_reset_handler function to
_base_clear_outstanding_commands so that it can be used in multiple
scenarios with suitable name which matches with the operation it does.

Also renamed its child functions. No functional changes.

Link: https://lore.kernel.org/r/20191226111333.26131-4-sreekanth.reddy@broadcom.com
Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Sreekanth Reddy
2019-12-26 06:13:26 -05:00
committed by Martin K. Petersen
parent d3f623ae8e
commit 36c6c7f75b
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/scsi/mpt3sas/mpt3sas_base.c
View File

@@ -7277,14 +7277,14 @@ static void _base_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc)
} }
/** /**
* _base_after_reset_handler - after reset handler * _base_clear_outstanding_mpt_commands - clears outstanding mpt commands
* @ioc: per adapter object * @ioc: per adapter object
*/ */
static void _base_after_reset_handler(struct MPT3SAS_ADAPTER *ioc) static void
_base_clear_outstanding_mpt_commands(struct MPT3SAS_ADAPTER *ioc)
{ {
mpt3sas_scsih_after_reset_handler(ioc); dtmprintk(ioc,
mpt3sas_ctl_after_reset_handler(ioc); ioc_info(ioc, "%s: clear outstanding mpt cmds\n", __func__));
dtmprintk(ioc, ioc_info(ioc, "%s: MPT3_IOC_AFTER_RESET\n", __func__));
if (ioc->transport_cmds.status & MPT3_CMD_PENDING) { if (ioc->transport_cmds.status & MPT3_CMD_PENDING) {
ioc->transport_cmds.status |= MPT3_CMD_RESET; ioc->transport_cmds.status |= MPT3_CMD_RESET;
mpt3sas_base_free_smid(ioc, ioc->transport_cmds.smid); mpt3sas_base_free_smid(ioc, ioc->transport_cmds.smid);
@@ -7317,6 +7317,17 @@ static void _base_after_reset_handler(struct MPT3SAS_ADAPTER *ioc)
} }
} }
/**
* _base_clear_outstanding_commands - clear all outstanding commands
* @ioc: per adapter object
*/
static void _base_clear_outstanding_commands(struct MPT3SAS_ADAPTER *ioc)
{
mpt3sas_scsih_clear_outstanding_scsi_tm_commands(ioc);
mpt3sas_ctl_clear_outstanding_ioctls(ioc);
_base_clear_outstanding_mpt_commands(ioc);
}
/** /**
* _base_reset_done_handler - reset done handler * _base_reset_done_handler - reset done handler
* @ioc: per adapter object * @ioc: per adapter object
@@ -7484,7 +7495,7 @@ mpt3sas_base_hard_reset_handler(struct MPT3SAS_ADAPTER *ioc,
r = _base_make_ioc_ready(ioc, type); r = _base_make_ioc_ready(ioc, type);
if (r) if (r)
goto out; goto out;
_base_after_reset_handler(ioc); _base_clear_outstanding_commands(ioc);
/* If this hard reset is called while port enable is active, then /* If this hard reset is called while port enable is active, then
* there is no reason to call make_ioc_operational * there is no reason to call make_ioc_operational

5
drivers/scsi/mpt3sas/mpt3sas_base.h
View File

@@ -1567,7 +1567,8 @@ struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,
u8 mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u8 mpt3sas_scsih_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 msix_index,
u32 reply); u32 reply);
void mpt3sas_scsih_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_scsih_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc);
void mpt3sas_scsih_after_reset_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_scsih_clear_outstanding_scsi_tm_commands(
struct MPT3SAS_ADAPTER *ioc);
void mpt3sas_scsih_reset_done_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_scsih_reset_done_handler(struct MPT3SAS_ADAPTER *ioc);
int mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun, int mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, u64 lun,
@@ -1701,7 +1702,7 @@ void mpt3sas_ctl_exit(ushort hbas_to_enumerate);
u8 mpt3sas_ctl_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u8 mpt3sas_ctl_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
u32 reply); u32 reply);
void mpt3sas_ctl_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_ctl_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc);
void mpt3sas_ctl_after_reset_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_ctl_clear_outstanding_ioctls(struct MPT3SAS_ADAPTER *ioc);
void mpt3sas_ctl_reset_done_handler(struct MPT3SAS_ADAPTER *ioc); void mpt3sas_ctl_reset_done_handler(struct MPT3SAS_ADAPTER *ioc);
u8 mpt3sas_ctl_event_callback(struct MPT3SAS_ADAPTER *ioc, u8 mpt3sas_ctl_event_callback(struct MPT3SAS_ADAPTER *ioc,
u8 msix_index, u32 reply); u8 msix_index, u32 reply);

7
drivers/scsi/mpt3sas/mpt3sas_ctl.c
View File

@@ -478,14 +478,15 @@ void mpt3sas_ctl_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc)
} }
/** /**
* mpt3sas_ctl_reset_handler - reset callback handler (for ctl) * mpt3sas_ctl_reset_handler - clears outstanding ioctl cmd.
* @ioc: per adapter object * @ioc: per adapter object
* *
* The handler for doing any required cleanup or initialization. * The handler for doing any required cleanup or initialization.
*/ */
void mpt3sas_ctl_after_reset_handler(struct MPT3SAS_ADAPTER *ioc) void mpt3sas_ctl_clear_outstanding_ioctls(struct MPT3SAS_ADAPTER *ioc)
{ {
dtmprintk(ioc, ioc_info(ioc, "%s: MPT3_IOC_AFTER_RESET\n", __func__)); dtmprintk(ioc,
ioc_info(ioc, "%s: clear outstanding ioctl cmd\n", __func__));
if (ioc->ctl_cmds.status & MPT3_CMD_PENDING) { if (ioc->ctl_cmds.status & MPT3_CMD_PENDING) {
ioc->ctl_cmds.status |= MPT3_CMD_RESET; ioc->ctl_cmds.status |= MPT3_CMD_RESET;
mpt3sas_base_free_smid(ioc, ioc->ctl_cmds.smid); mpt3sas_base_free_smid(ioc, ioc->ctl_cmds.smid);

8
drivers/scsi/mpt3sas/mpt3sas_scsih.c
View File

@@ -9332,15 +9332,17 @@ void mpt3sas_scsih_pre_reset_handler(struct MPT3SAS_ADAPTER *ioc)
} }
/** /**
* mpt3sas_scsih_after_reset_handler - reset callback handler (for scsih) * mpt3sas_scsih_clear_outstanding_scsi_tm_commands - clears outstanding
* scsi & tm cmds.
* @ioc: per adapter object * @ioc: per adapter object
* *
* The handler for doing any required cleanup or initialization. * The handler for doing any required cleanup or initialization.
*/ */
void void
mpt3sas_scsih_after_reset_handler(struct MPT3SAS_ADAPTER *ioc) mpt3sas_scsih_clear_outstanding_scsi_tm_commands(struct MPT3SAS_ADAPTER *ioc)
{ {
dtmprintk(ioc, ioc_info(ioc, "%s: MPT3_IOC_AFTER_RESET\n", __func__)); dtmprintk(ioc,
ioc_info(ioc, "%s: clear outstanding scsi & tm cmds\n", __func__));
if (ioc->scsih_cmds.status & MPT3_CMD_PENDING) { if (ioc->scsih_cmds.status & MPT3_CMD_PENDING) {
ioc->scsih_cmds.status |= MPT3_CMD_RESET; ioc->scsih_cmds.status |= MPT3_CMD_RESET;
mpt3sas_base_free_smid(ioc, ioc->scsih_cmds.smid); mpt3sas_base_free_smid(ioc, ioc->scsih_cmds.smid);