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

Commit e394b805 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller
Browse files

ptp: mlx4: convert to the 64 bit get/set time methods. 



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: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91432d18

drivers/net/ethernet/mellanox/mlx4/en_clock.c

+6 −5
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ static int mlx4_en_phc_adjtime(struct ptp_clock_info *ptp, s64 delta) 
 * Read the timecounter and return the correct value in ns after converting

 * it into a struct timespec.

 **/

static int mlx4_en_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts)

static int mlx4_en_phc_gettime(struct ptp_clock_info *ptp,

			       struct timespec64 *ts)

{

	struct mlx4_en_dev *mdev = container_of(ptp, struct mlx4_en_dev,

						ptp_clock_info);
@@ -191,11 +192,11 @@ static int mlx4_en_phc_gettime(struct ptp_clock_info *ptp, struct timespec *ts) 
 * wall timer value.

 **/

static int mlx4_en_phc_settime(struct ptp_clock_info *ptp,

			       const struct timespec *ts)

			       const struct timespec64 *ts)

{

	struct mlx4_en_dev *mdev = container_of(ptp, struct mlx4_en_dev,

						ptp_clock_info);

	u64 ns = timespec_to_ns(ts);

	u64 ns = timespec64_to_ns(ts);

	unsigned long flags;



	/* reset the timecounter */
@@ -232,8 +233,8 @@ static const struct ptp_clock_info mlx4_en_ptp_clock_info = { 
	.pps		= 0,

	.adjfreq	= mlx4_en_phc_adjfreq,

	.adjtime	= mlx4_en_phc_adjtime,

	.gettime	= mlx4_en_phc_gettime,

	.settime	= mlx4_en_phc_settime,

	.gettime64	= mlx4_en_phc_gettime,

	.settime64	= mlx4_en_phc_settime,

	.enable		= mlx4_en_phc_enable,

};