|
 |
d8f823 |
From 356f9793df0411479e5b156d637c2c5bcce95935 Mon Sep 17 00:00:00 2001
|
|
|
d8f823 |
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Date: Sun, 10 May 2020 14:52:43 -0400
|
|
|
d8f823 |
Subject: [PATCH 067/312] [netdrv] mlx5: reject unsupported external timestamp
|
|
|
d8f823 |
flags
|
|
|
d8f823 |
|
|
|
d8f823 |
Message-id: <20200510145245.10054-81-ahleihel@redhat.com>
|
|
|
d8f823 |
Patchwork-id: 306621
|
|
|
d8f823 |
Patchwork-instance: patchwork
|
|
|
d8f823 |
O-Subject: [RHEL8.3 BZ 1789378 v2 80/82] mlx5: reject unsupported external timestamp flags
|
|
|
d8f823 |
Bugzilla: 1789378
|
|
|
d8f823 |
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
d8f823 |
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
|
|
d8f823 |
|
|
|
d8f823 |
Bugzilla: http://bugzilla.redhat.com/1789378
|
|
|
d8f823 |
Upstream: v5.4-rc8
|
|
|
d8f823 |
|
|
|
d8f823 |
commit 2e0645a00e25f7122cad6da57ce3cc855df49ddd
|
|
|
d8f823 |
Author: Jacob Keller <jacob.e.keller@intel.com>
|
|
|
d8f823 |
Date: Thu Nov 14 10:45:00 2019 -0800
|
|
|
d8f823 |
|
|
|
d8f823 |
mlx5: reject unsupported external timestamp flags
|
|
|
d8f823 |
|
|
|
d8f823 |
Fix the mlx5 core PTP support to explicitly reject any future flags that
|
|
|
d8f823 |
get added to the external timestamp request ioctl.
|
|
|
d8f823 |
|
|
|
d8f823 |
In order to maintain currently functioning code, this patch accepts all
|
|
|
d8f823 |
three current flags. This is because the PTP_RISING_EDGE and
|
|
|
d8f823 |
PTP_FALLING_EDGE flags have unclear semantics and each driver seems to
|
|
|
d8f823 |
have interpreted them slightly differently.
|
|
|
d8f823 |
|
|
|
d8f823 |
[ RC: I'm not 100% sure what this driver does, but if I'm not wrong it
|
|
|
d8f823 |
follows the dp83640:
|
|
|
d8f823 |
|
|
|
d8f823 |
flags Meaning
|
|
|
d8f823 |
---------------------------------------------------- --------------------------
|
|
|
d8f823 |
PTP_ENABLE_FEATURE Time stamp rising edge
|
|
|
d8f823 |
PTP_ENABLE_FEATURE|PTP_RISING_EDGE Time stamp rising edge
|
|
|
d8f823 |
PTP_ENABLE_FEATURE|PTP_FALLING_EDGE Time stamp falling edge
|
|
|
d8f823 |
PTP_ENABLE_FEATURE|PTP_RISING_EDGE|PTP_FALLING_EDGE Time stamp falling edge
|
|
|
d8f823 |
]
|
|
|
d8f823 |
|
|
|
d8f823 |
Cc: Feras Daoud <ferasda@mellanox.com>
|
|
|
d8f823 |
Cc: Eugenia Emantayev <eugenia@mellanox.com>
|
|
|
d8f823 |
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
|
d8f823 |
Reviewed-by: Richard Cochran <richardcochran@gmail.com>
|
|
|
d8f823 |
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
d8f823 |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
d8f823 |
|
|
|
d8f823 |
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
|
d8f823 |
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
|
d8f823 |
---
|
|
|
d8f823 |
drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c | 6 ++++++
|
|
|
d8f823 |
1 file changed, 6 insertions(+)
|
|
|
d8f823 |
|
|
|
d8f823 |
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
|
|
|
d8f823 |
index 9a40f24e3193..34190e888521 100644
|
|
|
d8f823 |
--- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
|
|
|
d8f823 |
+++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
|
|
|
d8f823 |
@@ -242,6 +242,12 @@ static int mlx5_extts_configure(struct ptp_clock_info *ptp,
|
|
|
d8f823 |
PTP_FALLING_EDGE))
|
|
|
d8f823 |
return -EOPNOTSUPP;
|
|
|
d8f823 |
|
|
|
d8f823 |
+ /* Reject requests with unsupported flags */
|
|
|
d8f823 |
+ if (rq->extts.flags & ~(PTP_ENABLE_FEATURE |
|
|
|
d8f823 |
+ PTP_RISING_EDGE |
|
|
|
d8f823 |
+ PTP_FALLING_EDGE))
|
|
|
d8f823 |
+ return -EOPNOTSUPP;
|
|
|
d8f823 |
+
|
|
|
d8f823 |
if (rq->extts.index >= clock->ptp_info.n_pins)
|
|
|
d8f823 |
return -EINVAL;
|
|
|
d8f823 |
|
|
|
d8f823 |
--
|
|
|
d8f823 |
2.13.6
|
|
|
d8f823 |
|