Skip to content

Commit 52fc70a

Browse files
davem330davem330
committed
Merge branch 'rx-sw-tstamp-for-all'
Gal Pressman says: ==================== RX software timestamp for all - round 2 Round 1 of drivers conversion was merged [1], this is round 2, more drivers to follow. [1] https://lore.kernel.org/netdev/[email protected]/ ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 2c4cec1 + 26f7415 commit 52fc70a

File tree

16 files changed

+20
-87
lines changed

16 files changed

+20
-87
lines changed

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3640,16 +3640,12 @@ static int bnx2x_get_ts_info(struct net_device *dev,
36403640

36413641
if (bp->flags & PTP_SUPPORTED) {
36423642
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
3643-
SOF_TIMESTAMPING_RX_SOFTWARE |
3644-
SOF_TIMESTAMPING_SOFTWARE |
36453643
SOF_TIMESTAMPING_TX_HARDWARE |
36463644
SOF_TIMESTAMPING_RX_HARDWARE |
36473645
SOF_TIMESTAMPING_RAW_HARDWARE;
36483646

36493647
if (bp->ptp_clock)
36503648
info->phc_index = ptp_clock_index(bp->ptp_clock);
3651-
else
3652-
info->phc_index = -1;
36533649

36543650
info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
36553651
(1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |

‎drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,12 +1556,9 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts
15561556
struct adapter *adapter = pi->adapter;
15571557

15581558
ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
1559-
SOF_TIMESTAMPING_RX_SOFTWARE |
1560-
SOF_TIMESTAMPING_SOFTWARE;
1561-
1562-
ts_info->so_timestamping |= SOF_TIMESTAMPING_RX_HARDWARE |
1563-
SOF_TIMESTAMPING_TX_HARDWARE |
1564-
SOF_TIMESTAMPING_RAW_HARDWARE;
1559+
SOF_TIMESTAMPING_RX_HARDWARE |
1560+
SOF_TIMESTAMPING_TX_HARDWARE |
1561+
SOF_TIMESTAMPING_RAW_HARDWARE;
15651562

15661563
ts_info->tx_types = (1 << HWTSTAMP_TX_OFF) |
15671564
(1 << HWTSTAMP_TX_ON);
@@ -1575,8 +1572,6 @@ static int get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *ts
15751572

15761573
if (adapter->ptp_clock)
15771574
ts_info->phc_index = ptp_clock_index(adapter->ptp_clock);
1578-
else
1579-
ts_info->phc_index = -1;
15801575

15811576
return 0;
15821577
}

‎drivers/net/ethernet/intel/i40e/i40e_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,16 +2555,12 @@ static int i40e_get_ts_info(struct net_device *dev,
25552555
return ethtool_op_get_ts_info(dev, info);
25562556

25572557
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
2558-
SOF_TIMESTAMPING_RX_SOFTWARE |
2559-
SOF_TIMESTAMPING_SOFTWARE |
25602558
SOF_TIMESTAMPING_TX_HARDWARE |
25612559
SOF_TIMESTAMPING_RX_HARDWARE |
25622560
SOF_TIMESTAMPING_RAW_HARDWARE;
25632561

25642562
if (pf->ptp_clock)
25652563
info->phc_index = ptp_clock_index(pf->ptp_clock);
2566-
else
2567-
info->phc_index = -1;
25682564

25692565
info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);
25702566

‎drivers/net/ethernet/intel/ice/ice_ethtool.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3792,8 +3792,6 @@ ice_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info *info)
37923792
return ethtool_op_get_ts_info(dev, info);
37933793

37943794
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
3795-
SOF_TIMESTAMPING_RX_SOFTWARE |
3796-
SOF_TIMESTAMPING_SOFTWARE |
37973795
SOF_TIMESTAMPING_TX_HARDWARE |
37983796
SOF_TIMESTAMPING_RX_HARDWARE |
37993797
SOF_TIMESTAMPING_RAW_HARDWARE;

‎drivers/net/ethernet/intel/igb/igb_ethtool.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2387,15 +2387,11 @@ static int igb_get_ts_info(struct net_device *dev,
23872387

23882388
if (adapter->ptp_clock)
23892389
info->phc_index = ptp_clock_index(adapter->ptp_clock);
2390-
else
2391-
info->phc_index = -1;
23922390

23932391
switch (adapter->hw.mac.type) {
23942392
case e1000_82575:
23952393
info->so_timestamping =
2396-
SOF_TIMESTAMPING_TX_SOFTWARE |
2397-
SOF_TIMESTAMPING_RX_SOFTWARE |
2398-
SOF_TIMESTAMPING_SOFTWARE;
2394+
SOF_TIMESTAMPING_TX_SOFTWARE;
23992395
return 0;
24002396
case e1000_82576:
24012397
case e1000_82580:
@@ -2405,8 +2401,6 @@ static int igb_get_ts_info(struct net_device *dev,
24052401
case e1000_i211:
24062402
info->so_timestamping =
24072403
SOF_TIMESTAMPING_TX_SOFTWARE |
2408-
SOF_TIMESTAMPING_RX_SOFTWARE |
2409-
SOF_TIMESTAMPING_SOFTWARE |
24102404
SOF_TIMESTAMPING_TX_HARDWARE |
24112405
SOF_TIMESTAMPING_RX_HARDWARE |
24122406
SOF_TIMESTAMPING_RAW_HARDWARE;

‎drivers/net/ethernet/intel/igc/igc_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1569,15 +1569,11 @@ static int igc_ethtool_get_ts_info(struct net_device *dev,
15691569

15701570
if (adapter->ptp_clock)
15711571
info->phc_index = ptp_clock_index(adapter->ptp_clock);
1572-
else
1573-
info->phc_index = -1;
15741572

15751573
switch (adapter->hw.mac.type) {
15761574
case igc_i225:
15771575
info->so_timestamping =
15781576
SOF_TIMESTAMPING_TX_SOFTWARE |
1579-
SOF_TIMESTAMPING_RX_SOFTWARE |
1580-
SOF_TIMESTAMPING_SOFTWARE |
15811577
SOF_TIMESTAMPING_TX_HARDWARE |
15821578
SOF_TIMESTAMPING_RX_HARDWARE |
15831579
SOF_TIMESTAMPING_RAW_HARDWARE;

‎drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3196,16 +3196,12 @@ static int ixgbe_get_ts_info(struct net_device *dev,
31963196

31973197
info->so_timestamping =
31983198
SOF_TIMESTAMPING_TX_SOFTWARE |
3199-
SOF_TIMESTAMPING_RX_SOFTWARE |
3200-
SOF_TIMESTAMPING_SOFTWARE |
32013199
SOF_TIMESTAMPING_TX_HARDWARE |
32023200
SOF_TIMESTAMPING_RX_HARDWARE |
32033201
SOF_TIMESTAMPING_RAW_HARDWARE;
32043202

32053203
if (adapter->ptp_clock)
32063204
info->phc_index = ptp_clock_index(adapter->ptp_clock);
3207-
else
3208-
info->phc_index = -1;
32093205

32103206
info->tx_types =
32113207
BIT(HWTSTAMP_TX_OFF) |

‎drivers/net/ethernet/mellanox/mlxsw/spectrum.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,7 +2786,9 @@ static const struct mlxsw_sp_ptp_ops mlxsw_sp1_ptp_ops = {
27862786
.hwtstamp_get = mlxsw_sp1_ptp_hwtstamp_get,
27872787
.hwtstamp_set = mlxsw_sp1_ptp_hwtstamp_set,
27882788
.shaper_work = mlxsw_sp1_ptp_shaper_work,
2789+
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
27892790
.get_ts_info = mlxsw_sp1_ptp_get_ts_info,
2791+
#endif
27902792
.get_stats_count = mlxsw_sp1_get_stats_count,
27912793
.get_stats_strings = mlxsw_sp1_get_stats_strings,
27922794
.get_stats = mlxsw_sp1_get_stats,
@@ -2803,7 +2805,9 @@ static const struct mlxsw_sp_ptp_ops mlxsw_sp2_ptp_ops = {
28032805
.hwtstamp_get = mlxsw_sp2_ptp_hwtstamp_get,
28042806
.hwtstamp_set = mlxsw_sp2_ptp_hwtstamp_set,
28052807
.shaper_work = mlxsw_sp2_ptp_shaper_work,
2808+
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
28062809
.get_ts_info = mlxsw_sp2_ptp_get_ts_info,
2810+
#endif
28072811
.get_stats_count = mlxsw_sp2_get_stats_count,
28082812
.get_stats_strings = mlxsw_sp2_get_stats_strings,
28092813
.get_stats = mlxsw_sp2_get_stats,
@@ -2820,7 +2824,9 @@ static const struct mlxsw_sp_ptp_ops mlxsw_sp4_ptp_ops = {
28202824
.hwtstamp_get = mlxsw_sp2_ptp_hwtstamp_get,
28212825
.hwtstamp_set = mlxsw_sp2_ptp_hwtstamp_set,
28222826
.shaper_work = mlxsw_sp2_ptp_shaper_work,
2827+
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
28232828
.get_ts_info = mlxsw_sp2_ptp_get_ts_info,
2829+
#endif
28242830
.get_stats_count = mlxsw_sp2_get_stats_count,
28252831
.get_stats_strings = mlxsw_sp2_get_stats_strings,
28262832
.get_stats = mlxsw_sp2_get_stats,

‎drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,6 @@ struct mlxsw_sp;
1111
struct mlxsw_sp_port;
1212
struct mlxsw_sp_ptp_clock;
1313

14-
static inline int mlxsw_sp_ptp_get_ts_info_noptp(struct kernel_ethtool_ts_info *info)
15-
{
16-
info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
17-
SOF_TIMESTAMPING_SOFTWARE;
18-
info->phc_index = -1;
19-
return 0;
20-
}
21-
2214
#if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
2315

2416
struct mlxsw_sp_ptp_clock *
@@ -151,12 +143,6 @@ static inline void mlxsw_sp1_ptp_shaper_work(struct work_struct *work)
151143
{
152144
}
153145

154-
static inline int mlxsw_sp1_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp,
155-
struct kernel_ethtool_ts_info *info)
156-
{
157-
return mlxsw_sp_ptp_get_ts_info_noptp(info);
158-
}
159-
160146
static inline int mlxsw_sp1_get_stats_count(void)
161147
{
162148
return 0;
@@ -226,12 +212,6 @@ mlxsw_sp2_ptp_hwtstamp_set(struct mlxsw_sp_port *mlxsw_sp_port,
226212
return -EOPNOTSUPP;
227213
}
228214

229-
static inline int mlxsw_sp2_ptp_get_ts_info(struct mlxsw_sp *mlxsw_sp,
230-
struct kernel_ethtool_ts_info *info)
231-
{
232-
return mlxsw_sp_ptp_get_ts_info_noptp(info);
233-
}
234-
235215
static inline int
236216
mlxsw_sp2_ptp_txhdr_construct(struct mlxsw_core *mlxsw_core,
237217
struct mlxsw_sp_port *mlxsw_sp_port,

‎drivers/net/ethernet/microchip/lan743x_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,16 +1034,12 @@ static int lan743x_ethtool_get_ts_info(struct net_device *netdev,
10341034
struct lan743x_adapter *adapter = netdev_priv(netdev);
10351035

10361036
ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
1037-
SOF_TIMESTAMPING_RX_SOFTWARE |
1038-
SOF_TIMESTAMPING_SOFTWARE |
10391037
SOF_TIMESTAMPING_TX_HARDWARE |
10401038
SOF_TIMESTAMPING_RX_HARDWARE |
10411039
SOF_TIMESTAMPING_RAW_HARDWARE;
10421040

10431041
if (adapter->ptp.ptp_clock)
10441042
ts_info->phc_index = ptp_clock_index(adapter->ptp.ptp_clock);
1045-
else
1046-
ts_info->phc_index = -1;
10471043

10481044
ts_info->tx_types = BIT(HWTSTAMP_TX_OFF) |
10491045
BIT(HWTSTAMP_TX_ON) |

0 commit comments

Comments
 (0)