Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1236198

[PATCH 02/12] net: stmmac: avoid using timespec

Show all headers | View raw

We want to deprecate the use of 'struct timespec' on 32-bit
architectures, as it is will overflow in 2038. The stmmac
driver uses it to read the current time, and can simply
be changed to use ktime_get_real_ts64() instead.

Because of hardware limitations, there is still an overflow
in year 2106, which we cannot really avoid, but this documents
the overflow.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Richard Cochran <richardcochran@gmail.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 925f2f8659b8..83a1db1b53f3 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -424,7 +424,7 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
 	struct hwtstamp_config config;
-	struct timespec now;
+	struct timespec64 now;
 	u64 temp = 0;
 	u32 ptp_v2 = 0;
 	u32 tstamp_all = 0;
@@ -621,8 +621,10 @@ static int stmmac_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr)
 					     priv->default_addend);
 
 		/* initialize system time */
-		getnstimeofday(&now);
-		priv->hw->ptp->init_systime(priv->ioaddr, now.tv_sec,
+		ktime_get_real_ts64(&now);
+
+		/* lower 32 bits of tv_sec are safe until y2106 */
+		priv->hw->ptp->init_systime(priv->ioaddr, (u32)now.tv_sec,
 					    now.tv_nsec);
 	}
 
-- 
2.1.0.rc2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] net: assorted y2038 changes Arnd Bergmann <arnd@arndb.de> - 2015-09-30 13:40 +0200
  [PATCH 03/12] net: igb: avoid using timespec Arnd Bergmann <arnd@arndb.de> - 2015-09-30 13:40 +0200
    Re: [PATCH 03/12] net: igb: avoid using timespec Richard Cochran <richardcochran@gmail.com> - 2015-10-01 21:20 +0200
      Re: [PATCH 03/12] net: igb: avoid using timespec Arnd Bergmann <arnd@arndb.de> - 2015-10-01 22:10 +0200
        Re: [PATCH 03/12] net: igb: avoid using timespec Richard Cochran <richardcochran@gmail.com> - 2015-10-02 09:50 +0200
  [PATCH 02/12] net: stmmac: avoid using timespec Arnd Bergmann <arnd@arndb.de> - 2015-09-30 13:40 +0200
    Re: [PATCH 02/12] net: stmmac: avoid using timespec Richard Cochran <richardcochran@gmail.com> - 2015-10-01 21:10 +0200
  [PATCH 04/12] mwifiex: use ktime_get_real for timestamping Arnd Bergmann <arnd@arndb.de> - 2015-09-30 13:40 +0200
  Re: [PATCH 00/12] net: assorted y2038 changes David Miller <davem@davemloft.net> - 2015-10-05 12:10 +0200

csiph-web