Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77946de5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-y2038' 



Arnd Bergmann says:

====================
net: assorted y2038 changes

This is a set of changes for network drivers and core code to
get rid of the use of time_t and derived data structures.

I have a longer set of patches that enables me to build kernels
with the time_t definition removed completely as a help to find
y2038 overflow issues. This is the subset for networking that
contains all code that has a reasonable way of fixing at the
moment and that is either commonly used (in one of the defconfigs)
or that blocks building a whole subsystem.

Most of the patches in this series should be noncontroversial,
but the last two that I marked [RFC] are a bit tricky and
need input from people that are more familiar with the code than
I am. All 12 patches are independent of one another and can
be applied in any order, so feel free to pick all that look
good.

Patches that are not included here are:

 - disabling less common device drivers that I don't have a fix
   for yet, this includes
	drivers/net/ethernet/brocade/bna/bfa_ioc.c
	drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c
	drivers/net/ethernet/tile/tilegx.c
	drivers/net/hamradio/baycom_ser_fdx.c
	drivers/net/wireless/ath/ath10k/core.h
	drivers/net/wireless/ath/ath9k/
	drivers/net/wireless/ath/ath9k/
	drivers/net/wireless/atmel.c
	drivers/net/wireless/prism54/isl_38xx.c
	drivers/net/wireless/rt2x00/rt2x00debug.c
	drivers/net/wireless/rtlwifi/
	drivers/net/wireless/ti/wlcore/
	drivers/staging/ozwpan/
	net/atm/mpoa_caches.c
	net/atm/mpoa_proc.c
	net/dccp/probe.c
	net/ipv4/tcp_probe.c
	net/netfilter/nfnetlink_queue_core.c
	net/netfilter/nfnetlink_queue_core.c
	net/netfilter/xt_time.c
	net/openvswitch/flow.c
	net/sctp/probe.c
	net/sunrpc/auth_gss/
	net/sunrpc/svcauth_unix.c
	net/vmw_vsock/af_vsock.c
   We'll get there eventually, or we an add a dependency to ensure
   they are not built on 32-bit kernels that need to survive
   beyond 2038. Most of these should be really easy to fix.

 - recvmmsg/sendmmsg system calls: patches have been sent out
   as part of the syscall series, need a little more work and
   review

 - SIOCGSTAMP/SIOCGSTAMPNS/ ioctl calls: tricky, need to discuss
   with some folks at kernel summit

 - SO_RCVTIMEO/SO_SNDTIMEO/SO_TIMESTAMP/SO_TIMESTAMPNS socket
   opt: similar and related to the ioctl

 - mmapped packet socket: need to create v4 of the API, nontrivial

 - pktgen: sends 32-bit timestamps over network, need to find out
   if using unsigned stamps is good enough

 - af_rxpc: similar to pktgen, uses 32-bit times for deadlines

 - ppp ioctl: patch is being worked on, nontrivial but doable
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 07355737 3ef0a25b

drivers/net/ethernet/freescale/fec_ptp.c

+2 −4
Original line number Diff line number Diff line
@@ -112,9 +112,8 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) 
	unsigned long flags;

	u32 val, tempval;

	int inc;

	struct timespec ts;

	struct timespec64 ts;

	u64 ns;

	u32 remainder;

	val = 0;



	if (!(fep->hwts_tx_en || fep->hwts_rx_en)) {
@@ -163,8 +162,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) 
		tempval = readl(fep->hwp + FEC_ATIME);

		/* Convert the ptp local counter to 1588 timestamp */

		ns = timecounter_cyc2time(&fep->tc, tempval);

		ts.tv_sec = div_u64_rem(ns, 1000000000ULL, &remainder);

		ts.tv_nsec = remainder;

		ts = ns_to_timespec64(ns);



		/* The tempval is  less than 3 seconds, and  so val is less than

		 * 4 seconds. No overflow for 32bit calculation.

drivers/net/ethernet/intel/igb/igb.h

+2 −2
Original line number Diff line number Diff line
@@ -444,8 +444,8 @@ struct igb_adapter { 


	struct ptp_pin_desc sdp_config[IGB_N_SDP];

	struct {

		struct timespec start;

		struct timespec period;

		struct timespec64 start;

		struct timespec64 period;

	} perout[IGB_N_PEROUT];



	char fw_version[32];

drivers/net/ethernet/intel/igb/igb_main.c

+8 −7
Original line number Diff line number Diff line
@@ -5392,7 +5392,7 @@ static void igb_tsync_interrupt(struct igb_adapter *adapter) 
{

	struct e1000_hw *hw = &adapter->hw;

	struct ptp_clock_event event;

	struct timespec ts;

	struct timespec64 ts;

	u32 ack = 0, tsauxc, sec, nsec, tsicr = rd32(E1000_TSICR);



	if (tsicr & TSINTR_SYS_WRAP) {
@@ -5412,10 +5412,11 @@ static void igb_tsync_interrupt(struct igb_adapter *adapter) 


	if (tsicr & TSINTR_TT0) {

		spin_lock(&adapter->tmreg_lock);

		ts = timespec_add(adapter->perout[0].start,

		ts = timespec64_add(adapter->perout[0].start,

				    adapter->perout[0].period);

		/* u32 conversion of tv_sec is safe until y2106 */

		wr32(E1000_TRGTTIML0, ts.tv_nsec);

		wr32(E1000_TRGTTIMH0, ts.tv_sec);

		wr32(E1000_TRGTTIMH0, (u32)ts.tv_sec);

		tsauxc = rd32(E1000_TSAUXC);

		tsauxc |= TSAUXC_EN_TT0;

		wr32(E1000_TSAUXC, tsauxc);
@@ -5426,10 +5427,10 @@ static void igb_tsync_interrupt(struct igb_adapter *adapter) 


	if (tsicr & TSINTR_TT1) {

		spin_lock(&adapter->tmreg_lock);

		ts = timespec_add(adapter->perout[1].start,

		ts = timespec64_add(adapter->perout[1].start,

				    adapter->perout[1].period);

		wr32(E1000_TRGTTIML1, ts.tv_nsec);

		wr32(E1000_TRGTTIMH1, ts.tv_sec);

		wr32(E1000_TRGTTIMH1, (u32)ts.tv_sec);

		tsauxc = rd32(E1000_TSAUXC);

		tsauxc |= TSAUXC_EN_TT1;

		wr32(E1000_TSAUXC, tsauxc);

drivers/net/ethernet/intel/igb/igb_ptp.c

+4 −4
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static void igb_ptp_write_i210(struct igb_adapter *adapter, 
	 * sub-nanosecond resolution.

	 */

	wr32(E1000_SYSTIML, ts->tv_nsec);

	wr32(E1000_SYSTIMH, ts->tv_sec);

	wr32(E1000_SYSTIMH, (u32)ts->tv_sec);

}



/**
@@ -479,7 +479,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 
	struct e1000_hw *hw = &igb->hw;

	u32 tsauxc, tsim, tsauxc_mask, tsim_mask, trgttiml, trgttimh, freqout;

	unsigned long flags;

	struct timespec ts;

	struct timespec64 ts;

	int use_freq = 0, pin = -1;

	s64 ns;
@@ -523,14 +523,14 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, 
		}

		ts.tv_sec = rq->perout.period.sec;

		ts.tv_nsec = rq->perout.period.nsec;

		ns = timespec_to_ns(&ts);

		ns = timespec64_to_ns(&ts);

		ns = ns >> 1;

		if (on && ns <= 70000000LL) {

			if (ns < 8LL)

				return -EINVAL;

			use_freq = 1;

		}

		ts = ns_to_timespec(ns);

		ts = ns_to_timespec64(ns);

		if (rq->perout.index == 1) {

			if (use_freq) {

				tsauxc_mask = TSAUXC_EN_CLK1 | TSAUXC_ST1;

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+5 −3
Original line number Diff line number Diff line
@@ -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);

	}