scsi: megaraid: use ktime_get_real for firmware time

do_gettimeofday() overflows in 2038 on 32-bit architectures and is
deprecated, so convert this driver to call ktime_get_real()
directly. This also simplifies the calculation.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Orabug: 27625001
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index d5096c3ca9e4b103c1d6631ae2633f505af4396f..fd313c33cd4d112e5260b8c009c482783606e275 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -987,7 +987,7 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
        MFI_CAPABILITIES *drv_ops;
        u32 scratch_pad_2;
        unsigned long flags;
-       struct timeval tv;
+       ktime_t time;
        bool cur_fw_64bit_dma_capable;
 
        fusion = instance->ctrl_context;
@@ -1046,10 +1046,9 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
        IOCInitMessage->HostMSIxVectors = instance->msix_vectors;
        IOCInitMessage->HostPageSize = MR_DEFAULT_NVME_PAGE_SHIFT;
 
-       do_gettimeofday(&tv);
+       time = ktime_get_real();
        /* Convert to milliseconds as per FW requirement */
-       IOCInitMessage->TimeStamp = cpu_to_le64((tv.tv_sec * 1000) +
-                                               (tv.tv_usec / 1000));
+       IOCInitMessage->TimeStamp = cpu_to_le64(ktime_to_ms(time));
 
        init_frame = (struct megasas_init_frame *)cmd->frame;
        memset(init_frame, 0, IOC_INIT_FRAME_SIZE);