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: [RFC net-next 15/22] ptp: sfc: convert to the 64 bit get/set time methods.
Date: Sat, 21 Mar 2015 21:59:45 +0100 [thread overview]
Message-ID: <050616911b4ce1f899147f8fb2d69fcd53034cd4.1426970294.git.richardcochran@gmail.com> (raw)
In-Reply-To: <cover.1426970294.git.richardcochran@gmail.com>
This patch changes the driver to use the newer API.
Depending on how the hardware represents a time value, this driver may
or may not yet be ready for the year 2038.
Compile tested only.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
---
drivers/net/ethernet/sfc/ptp.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
index 6b861e3..a2e9aee 100644
--- a/drivers/net/ethernet/sfc/ptp.c
+++ b/drivers/net/ethernet/sfc/ptp.c
@@ -323,9 +323,9 @@ struct efx_ptp_data {
static int efx_phc_adjfreq(struct ptp_clock_info *ptp, s32 delta);
static int efx_phc_adjtime(struct ptp_clock_info *ptp, s64 delta);
-static int efx_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts);
+static int efx_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts);
static int efx_phc_settime(struct ptp_clock_info *ptp,
- const struct timespec *e_ts);
+ const struct timespec64 *e_ts);
static int efx_phc_enable(struct ptp_clock_info *ptp,
struct ptp_clock_request *request, int on);
@@ -1198,8 +1198,8 @@ static const struct ptp_clock_info efx_phc_clock_info = {
.pps = 1,
.adjfreq = efx_phc_adjfreq,
.adjtime = efx_phc_adjtime,
- .gettime = efx_phc_gettime,
- .settime = efx_phc_settime,
+ .gettime64 = efx_phc_gettime,
+ .settime64 = efx_phc_settime,
.enable = efx_phc_enable,
};
@@ -1837,7 +1837,7 @@ static int efx_phc_adjtime(struct ptp_clock_info *ptp, s64 delta)
NULL, 0, NULL);
}
-static int efx_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
+static int efx_phc_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)
{
struct efx_ptp_data *ptp_data = container_of(ptp,
struct efx_ptp_data,
@@ -1859,28 +1859,28 @@ static int efx_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)
kt = ptp_data->nic_to_kernel_time(
MCDI_DWORD(outbuf, PTP_OUT_READ_NIC_TIME_MAJOR),
MCDI_DWORD(outbuf, PTP_OUT_READ_NIC_TIME_MINOR), 0);
- *ts = ktime_to_timespec(kt);
+ *ts = ktime_to_timespec64(kt);
return 0;
}
static int efx_phc_settime(struct ptp_clock_info *ptp,
- const struct timespec *e_ts)
+ const struct timespec64 *e_ts)
{
/* Get the current NIC time, efx_phc_gettime.
* Subtract from the desired time to get the offset
* call efx_phc_adjtime with the offset
*/
int rc;
- struct timespec time_now;
- struct timespec delta;
+ struct timespec64 time_now;
+ struct timespec64 delta;
rc = efx_phc_gettime(ptp, &time_now);
if (rc != 0)
return rc;
- delta = timespec_sub(*e_ts, time_now);
+ delta = timespec64_sub(*e_ts, time_now);
- rc = efx_phc_adjtime(ptp, timespec_to_ns(&delta));
+ rc = efx_phc_adjtime(ptp, timespec64_to_ns(&delta));
if (rc != 0)
return rc;
--
1.7.10.4
next prev parent reply other threads:[~2015-03-21 21:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-21 20:59 [RFC net-next 00/22] ptp: get ready for 2038 Richard Cochran
2015-03-21 20:59 ` [RFC net-next 01/22] ptp: introduce get/set time methods with explicit 64 bit seconds Richard Cochran
2015-03-21 20:59 ` [RFC net-next 02/22] ptp: use the 64 bit gettime method for the SYS_OFFSET ioctl Richard Cochran
2015-03-21 20:59 ` [RFC net-next 03/22] ptp: blackfin: convert to the 64 bit get/set time methods Richard Cochran
2015-03-21 20:59 ` [RFC net-next 04/22] ptp: xgbe: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 05/22] ptp: bnx2x: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 06/22] ptp: tg3: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 07/22] ptp: fec: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 08/22] ptp: gianfar: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 09/22] ptp: e1000e: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 10/22] ptp: fm10k: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 11/22] ptp: i40e: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 12/22] ptp: igb: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 13/22] ptp: ixgbe: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 14/22] ptp: mlx4: " Richard Cochran
2015-03-21 20:59 ` Richard Cochran [this message]
2015-03-21 20:59 ` [RFC net-next 16/22] ptp: stmmac: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 17/22] ptp: cpts: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 18/22] ptp: tilegx: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 19/22] ptp: dp83640: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 20/22] ptp: ixp46x: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 21/22] ptp: pch: " Richard Cochran
2015-03-21 20:59 ` [RFC net-next 22/22] ptp: remove 32 bit get/set methods Richard Cochran
2015-03-21 21:19 ` Richard Cochran
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=050616911b4ce1f899147f8fb2d69fcd53034cd4.1426970294.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®