[PATCHv2 next 1/3] ptp: add ptp_gettimex64any() support

From: Mahesh Bandewar
Date: Tue Oct 03 2023 - 00:17:15 EST


add support for TS sandwich of the user preferred timebase. The options
supported are PTP_TS_REAL (CLOCK_REALTIME), PTP_TS_MONO (CLOCK_MONOTONIC),
and PTP_TS_RAW (CLOCK_MONOTONIC_RAW)

Option of PTP_TS_REAL is equivalent of using ptp_gettimex64().

Signed-off-by: Mahesh Bandewar <maheshb@xxxxxxxxxx>
CC: Richard Cochran <richardcochran@xxxxxxxxx>
CC: "David S. Miller" <davem@xxxxxxxxxxxxx>
CC: netdev@xxxxxxxxxxxxxxx
---
include/linux/ptp_clock_kernel.h | 51 ++++++++++++++++++++++++++++++++
include/uapi/linux/ptp_clock.h | 7 +++++
2 files changed, 58 insertions(+)

diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index 1ef4e0f9bd2a..fd7be98e7bba 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -102,6 +102,15 @@ struct ptp_system_timestamp {
* reading the lowest bits of the PHC timestamp and the second
* reading immediately follows that.
*
+ * @gettimex64any: Reads the current time from the hardware clock and
+ optionally also any of the MONO, MONO_RAW, or SYS clock.
+ * parameter ts: Holds the PHC timestamp.
+ * parameter sts: If not NULL, it holds a pair of timestamps from
+ * the clock of choice. The first reading is made right before
+ * reading the lowest bits of the PHC timestamp and the second
+ * reading immediately follows that.
+ * parameter type: any one of the TS opt from ptp_timestamp_types.
+ *
* @getcrosststamp: Reads the current time from the hardware clock and
* system clock simultaneously.
* parameter cts: Contains timestamp (device,system) pair,
@@ -180,6 +189,9 @@ struct ptp_clock_info {
int (*gettime64)(struct ptp_clock_info *ptp, struct timespec64 *ts);
int (*gettimex64)(struct ptp_clock_info *ptp, struct timespec64 *ts,
struct ptp_system_timestamp *sts);
+ int (*gettimex64any)(struct ptp_clock_info *ptp, struct timespec64 *ts,
+ struct ptp_system_timestamp *sts,
+ enum ptp_ts_types type);
int (*getcrosststamp)(struct ptp_clock_info *ptp,
struct system_device_crosststamp *cts);
int (*settime64)(struct ptp_clock_info *p, const struct timespec64 *ts);
@@ -464,4 +476,43 @@ static inline void ptp_read_system_postts(struct ptp_system_timestamp *sts)
ktime_get_real_ts64(&sts->post_ts);
}

+static inline void ptp_read_any_prets(struct ptp_system_timestamp *sts,
+ enum ptp_ts_types type)
+{
+ if (sts) {
+ switch (type) {
+ case PTP_TS_REAL:
+ ktime_get_real_ts64(&sts->pre_ts);
+ break;
+ case PTP_TS_MONO:
+ ktime_get_ts64(&sts->pre_ts);
+ break;
+ case PTP_TS_RAW:
+ ktime_get_raw_ts64(&sts->pre_ts);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+static inline void ptp_read_any_postts(struct ptp_system_timestamp *sts,
+ enum ptp_ts_types type)
+{
+ if (sts) {
+ switch (type) {
+ case PTP_TS_REAL:
+ ktime_get_real_ts64(&sts->post_ts);
+ break;
+ case PTP_TS_MONO:
+ ktime_get_ts64(&sts->post_ts);
+ break;
+ case PTP_TS_RAW:
+ ktime_get_raw_ts64(&sts->post_ts);
+ break;
+ default:
+ break;
+ }
+ }
+}
#endif
diff --git a/include/uapi/linux/ptp_clock.h b/include/uapi/linux/ptp_clock.h
index 05cc35fc94ac..dc44e34f8146 100644
--- a/include/uapi/linux/ptp_clock.h
+++ b/include/uapi/linux/ptp_clock.h
@@ -69,6 +69,13 @@
*/
#define PTP_PEROUT_V1_VALID_FLAGS (0)

+enum ptp_ts_types {
+ PTP_TS_REAL = 0,
+ PTP_TS_MONO,
+ PTP_TS_RAW,
+ PTP_TS_MAX,
+};
+
/*
* struct ptp_clock_time - represents a time value
*
--
2.42.0.582.g8ccd20d70d-goog