openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bnx2x: use ktime_get_seconds() for timestamp 

commit c48f350ff5 "bnx2x: Add MFW dump support" added the
bnx2x_update_mfw_dump() function that reads the current time and stores
it in a 32-bit field that gets passed into a buffer in a fixed format.

This is potentially broken when the epoch overflows in 2038, and
otherwise overflows in 2106. As we're trying to avoid uses of
struct timeval for this reason, I noticed the addition of this
function, and tried to rewrite it in a way that is more explicit
about the overflow and that will keep working once we deprecate
struct timeval.

I assume that it is not possible to change the ABI any more, otherwise
we should try to use a 64-bit field for the seconds right away.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Yuval Mintz <Yuval.Mintz@qlogic.com>
Cc: Ariel Elior <Ariel.Elior@qlogic.com>
Acked-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2015-09-11 11:33:01 +02:00 committed by David S. Miller
parent 8e2d61e0ae
commit a19a19de83
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
View File

@ -3705,16 +3705,14 @@ void bnx2x_update_mng_version(struct bnx2x *bp)
void bnx2x_update_mfw_dump(struct bnx2x *bp) void bnx2x_update_mfw_dump(struct bnx2x *bp)
{ {
struct timeval epoc;
u32 drv_ver; u32 drv_ver;
u32 valid_dump; u32 valid_dump;
if (!SHMEM2_HAS(bp, drv_info)) if (!SHMEM2_HAS(bp, drv_info))
return; return;
/* Update Driver load time */ /* Update Driver load time, possibly broken in y2038 */
do_gettimeofday(&epoc); SHMEM2_WR(bp, drv_info.epoc, (u32)ktime_get_real_seconds());
SHMEM2_WR(bp, drv_info.epoc, epoc.tv_sec);
drv_ver = bnx2x_update_mng_version_utility(DRV_MODULE_VERSION, true); drv_ver = bnx2x_update_mng_version_utility(DRV_MODULE_VERSION, true);
SHMEM2_WR(bp, drv_info.drv_ver, drv_ver); SHMEM2_WR(bp, drv_info.drv_ver, drv_ver);