scsi: smartpqi: fix time handling

Orabug: 26191021, 26447813

When we have turned off RTC support, the smartpqi driver fails to build:

ERROR: "rtc_time64_to_tm" [drivers/scsi/smartpqi/smartpqi.ko] undefined!

This is easily avoided by using the generic 'struct tm' based helper rather
than the RTC specific one. While fixing this, I noticed that even though
the driver uses time64_t for storing seconds, it gets them from the
old 32-bit struct timeval. To address this, we can simplify the code
by calling ktime_get_real_seconds() directly.

Fixes: 6c223761eb54 ("smartpqi: initial commit of Microsemi smartpqi driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit ed10858eadd4988260c6bc7d75fc25176342b5a7)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 8998db35fe4ce8cb1d980aaf3f4b6591104702c9..be10e90f239ca7cbd100bfc83b225835578cb342 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -533,8 +533,7 @@ static int pqi_write_current_time_to_host_wellness(
        size_t buffer_length;
        time64_t local_time;
        unsigned int year;
-       struct timeval time;
-       struct rtc_time tm;
+       struct tm tm;
 
        buffer_length = sizeof(*buffer);
 
@@ -551,9 +550,8 @@ static int pqi_write_current_time_to_host_wellness(
        put_unaligned_le16(sizeof(buffer->time),
                &buffer->time_length);
 
-       do_gettimeofday(&time);
-       local_time = time.tv_sec - (sys_tz.tz_minuteswest * 60);
-       rtc_time64_to_tm(local_time, &tm);
+       local_time = ktime_get_real_seconds();
+       time_to_tm(local_time, -sys_tz.tz_minuteswest * 60, &tm);
        year = tm.tm_year + 1900;
 
        buffer->time[0] = bin2bcd(tm.tm_hour);