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

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



This driver is 64 bit only, and so this driver and device are ready
for 2038.  This patch changes the driver to the new PHC and also
carries the timespec64 parameter on out to the gxio_mpipe_get-
set_timestamp functions, making explicit the fact that the tv_sec
field is 64 bits wide.

Not even compile tested.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Acked-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5c79c26

arch/tile/gxio/mpipe.c

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue, 
EXPORT_SYMBOL_GPL(gxio_mpipe_equeue_init);



int gxio_mpipe_set_timestamp(gxio_mpipe_context_t *context,

			     const struct timespec *ts)

			     const struct timespec64 *ts)

{

	cycles_t cycles = get_cycles();

	return gxio_mpipe_set_timestamp_aux(context, (uint64_t)ts->tv_sec,
@@ -466,7 +466,7 @@ int gxio_mpipe_set_timestamp(gxio_mpipe_context_t *context, 
EXPORT_SYMBOL_GPL(gxio_mpipe_set_timestamp);



int gxio_mpipe_get_timestamp(gxio_mpipe_context_t *context,

			     struct timespec *ts)

			     struct timespec64 *ts)

{

	int ret;

	cycles_t cycles_prev, cycles_now, clock_rate;

arch/tile/include/gxio/mpipe.h

+2 −2
Original line number Diff line number Diff line
@@ -1830,7 +1830,7 @@ extern int gxio_mpipe_link_set_attr(gxio_mpipe_link_t *link, uint32_t attr, 
 *  code.

 */

extern int gxio_mpipe_get_timestamp(gxio_mpipe_context_t *context,

				    struct timespec *ts);

				    struct timespec64 *ts);



/* Set the timestamp of mPIPE.

 *
@@ -1840,7 +1840,7 @@ extern int gxio_mpipe_get_timestamp(gxio_mpipe_context_t *context, 
 *  code.

 */

extern int gxio_mpipe_set_timestamp(gxio_mpipe_context_t *context,

				    const struct timespec *ts);

				    const struct timespec64 *ts);



/* Adjust the timestamp of mPIPE.

 *

drivers/net/ethernet/tile/tilegx.c

+5 −4
Original line number Diff line number Diff line
@@ -838,7 +838,8 @@ static int ptp_mpipe_adjtime(struct ptp_clock_info *ptp, s64 delta) 
	return ret;

}



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

static int ptp_mpipe_gettime(struct ptp_clock_info *ptp,

			     struct timespec64 *ts)

{

	int ret = 0;

	struct mpipe_data *md = container_of(ptp, struct mpipe_data, caps);
@@ -850,7 +851,7 @@ static int ptp_mpipe_gettime(struct ptp_clock_info *ptp, struct timespec *ts) 
}



static int ptp_mpipe_settime(struct ptp_clock_info *ptp,

			     const struct timespec *ts)

			     const struct timespec64 *ts)

{

	int ret = 0;

	struct mpipe_data *md = container_of(ptp, struct mpipe_data, caps);
@@ -876,8 +877,8 @@ static struct ptp_clock_info ptp_mpipe_caps = { 
	.pps		= 0,

	.adjfreq	= ptp_mpipe_adjfreq,

	.adjtime	= ptp_mpipe_adjtime,

	.gettime	= ptp_mpipe_gettime,

	.settime	= ptp_mpipe_settime,

	.gettime64	= ptp_mpipe_gettime,

	.settime64	= ptp_mpipe_settime,

	.enable		= ptp_mpipe_enable,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE