diff options
| author | Jacob Keller <jacob.e.keller@intel.com> | 2019-11-14 10:44:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-15 12:48:32 -0800 |
| commit | e8e9c98dc3b52d77ae041baf76ff1c1fec2ad0da (patch) | |
| tree | c829a46d03c54c4aeb8782f81de390dd41e42300 /drivers/net/phy/dp83640.c | |
| parent | 7d9465ebcc5d0e5ab0d7dd36d7147d31cc76fcaf (diff) | |
| download | linux-e8e9c98dc3b52d77ae041baf76ff1c1fec2ad0da.tar.gz linux-e8e9c98dc3b52d77ae041baf76ff1c1fec2ad0da.tar.bz2 linux-e8e9c98dc3b52d77ae041baf76ff1c1fec2ad0da.zip | |
dp83640: reject unsupported external timestamp flags
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
Cc: Stefan Sørensen <stefan.sorensen@spectralink.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/dp83640.c')
| -rw-r--r-- | drivers/net/phy/dp83640.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index 04ad77758920..2781b0e2d947 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -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; |