UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: mpi3mr: Add support for timestamp sync with firmware 

This operation requests that the IOC update the TimeStamp.

When the I/O Unit is powered on it sets the TimeStamp field value to
0x0000_0000_0000_0000 and increments the current value every millisecond.
A host driver sets the TimeStamp field to the current time by using an
IOCInit request. The TimeStamp field is periodically updated by the host
driver.

Link: https://lore.kernel.org/r/20210520152545.2710479-11-kashyap.desai@broadcom.com
Cc: sathya.prakash@broadcom.com
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Kashyap Desai 2021-05-20 20:55:31 +05:30 committed by Martin K. Petersen
parent fb9b04574f
commit 54dfcffb41
2 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/mpi3mr/mpi3mr.h
View File

@ -104,6 +104,7 @@ extern struct list_head mrioc_list;
#define MPI3MR_PORTENABLE_TIMEOUT 300 #define MPI3MR_PORTENABLE_TIMEOUT 300
#define MPI3MR_RESETTM_TIMEOUT 30 #define MPI3MR_RESETTM_TIMEOUT 30
#define MPI3MR_RESET_HOST_IOWAIT_TIMEOUT 5 #define MPI3MR_RESET_HOST_IOWAIT_TIMEOUT 5
#define MPI3MR_TSUPDATE_INTERVAL 900
#define MPI3MR_DEFAULT_SHUTDOWN_TIME 120 #define MPI3MR_DEFAULT_SHUTDOWN_TIME 120
#define MPI3MR_WATCHDOG_INTERVAL 1000 /* in milli seconds */ #define MPI3MR_WATCHDOG_INTERVAL 1000 /* in milli seconds */
@ -636,6 +637,7 @@ struct scmd_priv {
* @dev_handle_bitmap_sz: Device handle bitmap size * @dev_handle_bitmap_sz: Device handle bitmap size
* @removepend_bitmap: Remove pending bitmap * @removepend_bitmap: Remove pending bitmap
* @delayed_rmhs_list: Delayed device removal list * @delayed_rmhs_list: Delayed device removal list
* @ts_update_counter: Timestamp update counter
* @fault_dbg: Fault debug flag * @fault_dbg: Fault debug flag
* @reset_in_progress: Reset in progress flag * @reset_in_progress: Reset in progress flag
* @unrecoverable: Controller unrecoverable flag * @unrecoverable: Controller unrecoverable flag
@ -758,6 +760,7 @@ struct mpi3mr_ioc {
void *removepend_bitmap; void *removepend_bitmap;
struct list_head delayed_rmhs_list; struct list_head delayed_rmhs_list;
u32 ts_update_counter;
u8 fault_dbg; u8 fault_dbg;
u8 reset_in_progress; u8 reset_in_progress;
u8 unrecoverable; u8 unrecoverable;

74
drivers/scsi/mpi3mr/mpi3mr_fw.c
View File

@ -1471,6 +1471,74 @@ out:
return retval; return retval;
} }
/**
* mpi3mr_sync_timestamp - Issue time stamp sync request
* @mrioc: Adapter reference
*
* Issue IO unit control MPI request to synchornize firmware
* timestamp with host time.
*
* Return: 0 on success, non-zero on failure.
*/
static int mpi3mr_sync_timestamp(struct mpi3mr_ioc *mrioc)
{
ktime_t current_time;
struct mpi3_iounit_control_request iou_ctrl;
int retval = 0;
memset(&iou_ctrl, 0, sizeof(iou_ctrl));
mutex_lock(&mrioc->init_cmds.mutex);
if (mrioc->init_cmds.state & MPI3MR_CMD_PENDING) {
retval = -1;
ioc_err(mrioc, "Issue IOUCTL time_stamp: command is in use\n");
mutex_unlock(&mrioc->init_cmds.mutex);
goto out;
}
mrioc->init_cmds.state = MPI3MR_CMD_PENDING;
mrioc->init_cmds.is_waiting = 1;
mrioc->init_cmds.callback = NULL;
iou_ctrl.host_tag = cpu_to_le16(MPI3MR_HOSTTAG_INITCMDS);
iou_ctrl.function = MPI3_FUNCTION_IO_UNIT_CONTROL;
iou_ctrl.operation = MPI3_CTRL_OP_UPDATE_TIMESTAMP;
current_time = ktime_get_real();
iou_ctrl.param64[0] = cpu_to_le64(ktime_to_ms(current_time));
init_completion(&mrioc->init_cmds.done);
retval = mpi3mr_admin_request_post(mrioc, &iou_ctrl,
sizeof(iou_ctrl), 0);
if (retval) {
ioc_err(mrioc, "Issue IOUCTL time_stamp: Admin Post failed\n");
goto out_unlock;
}
wait_for_completion_timeout(&mrioc->init_cmds.done,
(MPI3MR_INTADMCMD_TIMEOUT * HZ));
if (!(mrioc->init_cmds.state & MPI3MR_CMD_COMPLETE)) {
ioc_err(mrioc, "Issue IOUCTL time_stamp: command timed out\n");
mrioc->init_cmds.is_waiting = 0;
mpi3mr_soft_reset_handler(mrioc,
MPI3MR_RESET_FROM_TSU_TIMEOUT, 1);
retval = -1;
goto out_unlock;
}
if ((mrioc->init_cmds.ioc_status & MPI3_IOCSTATUS_STATUS_MASK)
!= MPI3_IOCSTATUS_SUCCESS) {
ioc_err(mrioc,
"Issue IOUCTL time_stamp: Failed ioc_status(0x%04x) Loginfo(0x%08x)\n",
(mrioc->init_cmds.ioc_status & MPI3_IOCSTATUS_STATUS_MASK),
mrioc->init_cmds.ioc_loginfo);
retval = -1;
goto out_unlock;
}
out_unlock:
mrioc->init_cmds.state = MPI3MR_CMD_NOTUSED;
mutex_unlock(&mrioc->init_cmds.mutex);
out:
return retval;
}
/** /**
* mpi3mr_watchdog_work - watchdog thread to monitor faults * mpi3mr_watchdog_work - watchdog thread to monitor faults
* @work: work struct * @work: work struct
@ -1489,6 +1557,11 @@ static void mpi3mr_watchdog_work(struct work_struct *work)
enum mpi3mr_iocstate ioc_state; enum mpi3mr_iocstate ioc_state;
u32 fault, host_diagnostic; u32 fault, host_diagnostic;
if (mrioc->ts_update_counter++ >= MPI3MR_TSUPDATE_INTERVAL) {
mrioc->ts_update_counter = 0;
mpi3mr_sync_timestamp(mrioc);
}
/*Check for fault state every one second and issue Soft reset*/ /*Check for fault state every one second and issue Soft reset*/
ioc_state = mpi3mr_get_iocstate(mrioc); ioc_state = mpi3mr_get_iocstate(mrioc);
if (ioc_state == MRIOC_STATE_FAULT) { if (ioc_state == MRIOC_STATE_FAULT) {
@ -3293,6 +3366,7 @@ out:
mrioc->reset_in_progress = 0; mrioc->reset_in_progress = 0;
scsi_unblock_requests(mrioc->shost); scsi_unblock_requests(mrioc->shost);
mpi3mr_rfresh_tgtdevs(mrioc); mpi3mr_rfresh_tgtdevs(mrioc);
mrioc->ts_update_counter = 0;
spin_lock_irqsave(&mrioc->watchdog_lock, flags); spin_lock_irqsave(&mrioc->watchdog_lock, flags);
if (mrioc->watchdog_work_q) if (mrioc->watchdog_work_q)
queue_delayed_work(mrioc->watchdog_work_q, queue_delayed_work(mrioc->watchdog_work_q,