Skip to contentSkip to conversation

dp83640: reject unsupported external timestamp flags

PATCH In review Richard Cochran 1 participant 1 message Nov 14, 2019

Subsystems (4)
lore
Share & tools
lore

Richard Cochran

author maintainer
#0 lore raw

PATCH 4/13 dp83640: reject unsupported external timestamp flags

From: Jacob Keller <[email protected]>

Fix the dp83640 PTP support to explicitly reject any future flags that get added to the external timestamp request ioctl.

In order to maintain currently functioning code, this patch accepts all three current flags. This is because the PTP_RISING_EDGE and PTP_FALLING_EDGE flags have unclear semantics and each driver seems to have interpreted them slightly differently.

For the record, the semantics of this driver are:

  flags                                                 Meaning
  ----------------------------------------------------  --------------------------
  PTP_ENABLE_FEATURE                                    Time stamp rising edge
  PTP_ENABLE_FEATURE|PTP_RISING_EDGE                    Time stamp rising edge
  PTP_ENABLE_FEATURE|PTP_FALLING_EDGE                   Time stamp falling edge
  PTP_ENABLE_FEATURE|PTP_RISING_EDGE|PTP_FALLING_EDGE   Time stamp falling edge
---
 drivers/net/phy/dp83640.c | 5 +++++
 1 file changed, 5 insertions(+)
drivers/net/phy/dp83640.c +5 -0
index 04ad77758920..2781b0e2d947 100644
@@ -469,6 +469,11 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp,
 
 	switch (rq->type) {
 	case PTP_CLK_REQ_EXTTS:
+		/* Reject requests with unsupported flags */
+		if (rq->extts.flags & ~(PTP_ENABLE_FEATURE |
+					PTP_RISING_EDGE |
+					PTP_FALLING_EDGE))
+			return -EOPNOTSUPP;
 		index = rq->extts.index;
 		if (index >= N_EXT_TS)
 			return -EINVAL;
Signature · 1 line
2.20.1