From: Richard Cochran <richardcochran@gmail.com>
To: <netdev@vger.kernel.org>
Cc: linux-kernel@vger.kernel.org, "Amir Vadai" <amirv@mellanox.com>,
"Ariel Elior" <ariel.elior@qlogic.com>,
"Arnd Bergmann" <arnd@linaro.org>,
"Baolin Wang" <baolin.wang@linaro.org>,
"Ben Hutchings" <ben@decadent.org.uk>,
"Bruce Allan" <bruce.w.allan@intel.com>,
"Carolyn Wyborny" <carolyn.wyborny@intel.com>,
"Chris Metcalf" <cmetcalf@ezchip.com>,
"David Miller" <davem@davemloft.net>,
"Frank Li" <Frank.Li@freescale.com>,
"Giuseppe Cavallaro" <peppe.cavallaro@st.com>,
"Jeff Kirsher" <jeffrey.t.kirsher@intel.com>,
"John Stultz" <john.stultz@linaro.org>,
"Luwei Zhou" <b45643@freescale.com>,
"Matthew Vick" <matthew.vick@intel.com>,
"Michael Chan" <mchan@broadcom.com>,
"Prashant Sreedharan" <prashant@broadcom.com>,
"Shradha Shah" <sshah@solarflare.com>,
"Solarflare linux maintainers" <linux-net-drivers@solarflare.com>,
"Sonic Zhang" <sonic.zhang@analog.com>,
"Stefan Sørensen" <stefan.sorensen@spectralink.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Tom Lendacky" <thomas.lendacky@amd.com>
Subject: [PATCH net-next V2 14/23] ptp: ixgbe: convert to the 64 bit get/set time methods.
Date: Sat, 21 Mar 2015 22:39:32 +0100 [thread overview]
Message-ID: <7d11557c5b745bb0e2e91397cc8553ec6e237982.1426973658.git.richardcochran@gmail.com> (raw)
In-Reply-To: <cover.1426973658.git.richardcochran@gmail.com>
This driver's clock is implemented using a timecounter, and so with
this patch the driver is ready for the year 2038.
Compile tested only.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
index bd46f5d..75b9e93 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -279,7 +279,7 @@ static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
* read the timecounter and return the correct value on ns,
* after converting it into a struct timespec.
*/
-static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
+static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{
struct ixgbe_adapter *adapter =
container_of(ptp, struct ixgbe_adapter, ptp_caps);
@@ -306,7 +306,7 @@ static int ixgbe_ptp_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
* wall timer value.
*/
static int ixgbe_ptp_settime(struct ptp_clock_info *ptp,
- const struct timespec *ts)
+ const struct timespec64 *ts)
{
struct ixgbe_adapter *adapter =
container_of(ptp, struct ixgbe_adapter, ptp_caps);
@@ -407,7 +407,7 @@ void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter)
{
bool timeout = time_is_before_jiffies(adapter->last_overflow_check +
IXGBE_OVERFLOW_PERIOD);
- struct timespec ts;
+ struct timespec64 ts;
if (timeout) {
ixgbe_ptp_gettime(&adapter->ptp_caps, &ts);
@@ -874,8 +874,8 @@ static int ixgbe_ptp_create_clock(struct ixgbe_adapter *adapter)
adapter->ptp_caps.pps = 1;
adapter->ptp_caps.adjfreq = ixgbe_ptp_adjfreq;
adapter->ptp_caps.adjtime = ixgbe_ptp_adjtime;
- adapter->ptp_caps.gettime = ixgbe_ptp_gettime;
- adapter->ptp_caps.settime = ixgbe_ptp_settime;
+ adapter->ptp_caps.gettime64 = ixgbe_ptp_gettime;
+ adapter->ptp_caps.settime64 = ixgbe_ptp_settime;
adapter->ptp_caps.enable = ixgbe_ptp_feature_enable;
break;
case ixgbe_mac_82599EB:
@@ -890,8 +890,8 @@ static int ixgbe_ptp_create_clock(struct ixgbe_adapter *adapter)
adapter->ptp_caps.pps = 0;
adapter->ptp_caps.adjfreq = ixgbe_ptp_adjfreq;
adapter->ptp_caps.adjtime = ixgbe_ptp_adjtime;
- adapter->ptp_caps.gettime = ixgbe_ptp_gettime;
- adapter->ptp_caps.settime = ixgbe_ptp_settime;
+ adapter->ptp_caps.gettime64 = ixgbe_ptp_gettime;
+ adapter->ptp_caps.settime64 = ixgbe_ptp_settime;
adapter->ptp_caps.enable = ixgbe_ptp_feature_enable;
break;
default:
--
1.7.10.4
next prev parent reply other threads:[~2015-03-21 21:40 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-21 21:39 [PATCH net-next V2 00/23] ptp: get ready for 2038 Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 01/23] ptp: introduce get/set time methods with explicit 64 bit seconds Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 02/23] ptp: use the 64 bit gettime method for the SYS_OFFSET ioctl Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 03/23] ptp: use the 64 bit get/set time methods for the posix clock Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 04/23] ptp: blackfin: convert to the 64 bit get/set time methods Richard Cochran
2015-03-22 2:28 ` Arnd Bergmann
2015-03-22 7:27 ` Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 05/23] ptp: xgbe: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 06/23] ptp: bnx2x: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 07/23] ptp: tg3: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 08/23] ptp: fec: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 09/23] ptp: gianfar: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 10/23] ptp: e1000e: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 11/23] ptp: fm10k: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 12/23] ptp: i40e: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 13/23] ptp: igb: " Richard Cochran
2015-03-22 2:40 ` Arnd Bergmann
2015-03-21 21:39 ` Richard Cochran [this message]
2015-03-21 21:39 ` [PATCH net-next V2 15/23] ptp: mlx4: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 16/23] ptp: sfc: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 17/23] ptp: stmmac: " Richard Cochran
2015-03-23 15:35 ` Giuseppe CAVALLARO
2015-03-31 13:22 ` Rayagond Kokatanur
2015-03-21 21:39 ` [PATCH net-next V2 18/23] ptp: cpts: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 19/23] ptp: tilegx: " Richard Cochran
2015-03-23 16:02 ` Chris Metcalf
2015-03-23 16:58 ` Richard Cochran
2015-03-23 17:26 ` Chris Metcalf
2015-03-23 20:06 ` Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 20/23] ptp: dp83640: " Richard Cochran
2015-03-22 2:36 ` Arnd Bergmann
2015-03-22 7:29 ` Richard Cochran
2015-03-22 17:48 ` Arnd Bergmann
2015-03-23 8:10 ` Richard Cochran
2015-03-23 15:06 ` Arnd Bergmann
2015-03-21 21:39 ` [PATCH net-next V2 21/23] ptp: ixp46x: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 22/23] ptp: pch: " Richard Cochran
2015-03-21 21:39 ` [PATCH net-next V2 23/23] ptp: remove 32 bit get/set methods Richard Cochran
2015-03-22 2:43 ` [PATCH net-next V2 00/23] ptp: get ready for 2038 Arnd Bergmann
2015-03-23 10:16 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7d11557c5b745bb0e2e91397cc8553ec6e237982.1426973658.git.richardcochran@gmail.com \
--to=richardcochran@gmail.com \
--cc=Frank.Li@freescale.com \
--cc=amirv@mellanox.com \
--cc=ariel.elior@qlogic.com \
--cc=arnd@linaro.org \
--cc=b45643@freescale.com \
--cc=baolin.wang@linaro.org \
--cc=ben@decadent.org.uk \
--cc=bruce.w.allan@intel.com \
--cc=carolyn.wyborny@intel.com \
--cc=cmetcalf@ezchip.com \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-net-drivers@solarflare.com \
--cc=matthew.vick@intel.com \
--cc=mchan@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=prashant@broadcom.com \
--cc=sonic.zhang@analog.com \
--cc=sshah@solarflare.com \
--cc=stefan.sorensen@spectralink.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®