Skip to content

Commit 760664b

Browse files
kuba-mookuba-moo
committed
Merge branch 'rx-software-timestamp-for-all-round-3'
Gal Pressman says: ==================== RX software timestamp for all - round 3 Rounds 1 & 2 of drivers conversion were merged [1][2], this round will complete the work. [1] https://lore.kernel.org/netdev/[email protected]/ [2] https://lore.kernel.org/netdev/[email protected]/ ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents 9e70eb4 + f8e8244 commit 760664b

File tree

16 files changed

+21
-72
lines changed

16 files changed

+21
-72
lines changed

‎drivers/net/bonding/bond_main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5886,9 +5886,6 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
58865886
if (real_dev) {
58875887
ret = ethtool_get_ts_info_by_layer(real_dev, info);
58885888
} else {
5889-
info->phc_index = -1;
5890-
info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
5891-
SOF_TIMESTAMPING_SOFTWARE;
58925889
/* Check if all slaves support software tx timestamping */
58935890
rcu_read_lock();
58945891
bond_for_each_slave_rcu(bond, slave, iter) {

‎drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,16 +582,12 @@ static int xgbe_get_ts_info(struct net_device *netdev,
582582
struct xgbe_prv_data *pdata = netdev_priv(netdev);
583583

584584
ts_info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
585-
SOF_TIMESTAMPING_RX_SOFTWARE |
586-
SOF_TIMESTAMPING_SOFTWARE |
587585
SOF_TIMESTAMPING_TX_HARDWARE |
588586
SOF_TIMESTAMPING_RX_HARDWARE |
589587
SOF_TIMESTAMPING_RAW_HARDWARE;
590588

591589
if (pdata->ptp_clock)
592590
ts_info->phc_index = ptp_clock_index(pdata->ptp_clock);
593-
else
594-
ts_info->phc_index = -1;
595591

596592
ts_info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
597593
ts_info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

‎drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5043,11 +5043,8 @@ static int bnxt_get_ts_info(struct net_device *dev,
50435043
struct bnxt_ptp_cfg *ptp;
50445044

50455045
ptp = bp->ptp_cfg;
5046-
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
5047-
SOF_TIMESTAMPING_RX_SOFTWARE |
5048-
SOF_TIMESTAMPING_SOFTWARE;
5046+
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;
50495047

5050-
info->phc_index = -1;
50515048
if (!ptp)
50525049
return 0;
50535050

‎drivers/net/ethernet/broadcom/tg3.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6145,9 +6145,7 @@ static int tg3_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info
61456145
{
61466146
struct tg3 *tp = netdev_priv(dev);
61476147

6148-
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
6149-
SOF_TIMESTAMPING_RX_SOFTWARE |
6150-
SOF_TIMESTAMPING_SOFTWARE;
6148+
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;
61516149

61526150
if (tg3_flag(tp, PTP_CAPABLE)) {
61536151
info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |
@@ -6157,8 +6155,6 @@ static int tg3_get_ts_info(struct net_device *dev, struct kernel_ethtool_ts_info
61576155

61586156
if (tp->ptp_clock)
61596157
info->phc_index = ptp_clock_index(tp->ptp_clock);
6160-
else
6161-
info->phc_index = -1;
61626158

61636159
info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
61646160

‎drivers/net/ethernet/cadence/macb_main.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3410,8 +3410,6 @@ static int gem_get_ts_info(struct net_device *dev,
34103410

34113411
info->so_timestamping =
34123412
SOF_TIMESTAMPING_TX_SOFTWARE |
3413-
SOF_TIMESTAMPING_RX_SOFTWARE |
3414-
SOF_TIMESTAMPING_SOFTWARE |
34153413
SOF_TIMESTAMPING_TX_HARDWARE |
34163414
SOF_TIMESTAMPING_RX_HARDWARE |
34173415
SOF_TIMESTAMPING_RAW_HARDWARE;
@@ -3423,7 +3421,8 @@ static int gem_get_ts_info(struct net_device *dev,
34233421
(1 << HWTSTAMP_FILTER_NONE) |
34243422
(1 << HWTSTAMP_FILTER_ALL);
34253423

3426-
info->phc_index = bp->ptp_clock ? ptp_clock_index(bp->ptp_clock) : -1;
3424+
if (bp->ptp_clock)
3425+
info->phc_index = ptp_clock_index(bp->ptp_clock);
34273426

34283427
return 0;
34293428
}

‎drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,37 +2496,31 @@ static int lio_set_intr_coalesce(struct net_device *netdev,
24962496
return ret;
24972497
}
24982498

2499+
#ifdef PTP_HARDWARE_TIMESTAMPING
24992500
static int lio_get_ts_info(struct net_device *netdev,
25002501
struct kernel_ethtool_ts_info *info)
25012502
{
25022503
struct lio *lio = GET_LIO(netdev);
25032504

25042505
info->so_timestamping =
2505-
#ifdef PTP_HARDWARE_TIMESTAMPING
25062506
SOF_TIMESTAMPING_TX_HARDWARE |
25072507
SOF_TIMESTAMPING_RX_HARDWARE |
25082508
SOF_TIMESTAMPING_RAW_HARDWARE |
2509-
SOF_TIMESTAMPING_TX_SOFTWARE |
2510-
#endif
2511-
SOF_TIMESTAMPING_RX_SOFTWARE |
2512-
SOF_TIMESTAMPING_SOFTWARE;
2509+
SOF_TIMESTAMPING_TX_SOFTWARE;
25132510

25142511
if (lio->ptp_clock)
25152512
info->phc_index = ptp_clock_index(lio->ptp_clock);
2516-
else
2517-
info->phc_index = -1;
25182513

2519-
#ifdef PTP_HARDWARE_TIMESTAMPING
25202514
info->tx_types = (1 << HWTSTAMP_TX_OFF) | (1 << HWTSTAMP_TX_ON);
25212515

25222516
info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
25232517
(1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) |
25242518
(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
25252519
(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT);
2526-
#endif
25272520

25282521
return 0;
25292522
}
2523+
#endif
25302524

25312525
/* Return register dump len. */
25322526
static int lio_get_regs_len(struct net_device *dev)
@@ -3146,7 +3140,9 @@ static const struct ethtool_ops lio_ethtool_ops = {
31463140
.set_coalesce = lio_set_intr_coalesce,
31473141
.get_priv_flags = lio_get_priv_flags,
31483142
.set_priv_flags = lio_set_priv_flags,
3143+
#ifdef PTP_HARDWARE_TIMESTAMPING
31493144
.get_ts_info = lio_get_ts_info,
3145+
#endif
31503146
};
31513147

31523148
static const struct ethtool_ops lio_vf_ethtool_ops = {
@@ -3169,7 +3165,9 @@ static const struct ethtool_ops lio_vf_ethtool_ops = {
31693165
.set_coalesce = lio_set_intr_coalesce,
31703166
.get_priv_flags = lio_get_priv_flags,
31713167
.set_priv_flags = lio_set_priv_flags,
3168+
#ifdef PTP_HARDWARE_TIMESTAMPING
31723169
.get_ts_info = lio_get_ts_info,
3170+
#endif
31733171
};
31743172

31753173
void liquidio_set_ethtool_ops(struct net_device *netdev)

‎drivers/net/ethernet/cavium/thunder/nicvf_ethtool.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,6 @@ static int nicvf_get_ts_info(struct net_device *netdev,
844844
return ethtool_op_get_ts_info(netdev, info);
845845

846846
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
847-
SOF_TIMESTAMPING_RX_SOFTWARE |
848-
SOF_TIMESTAMPING_SOFTWARE |
849847
SOF_TIMESTAMPING_TX_HARDWARE |
850848
SOF_TIMESTAMPING_RX_HARDWARE |
851849
SOF_TIMESTAMPING_RAW_HARDWARE;

‎drivers/net/ethernet/cisco/enic/enic_ethtool.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,7 @@ static int enic_set_rxfh(struct net_device *netdev,
601601
static int enic_get_ts_info(struct net_device *netdev,
602602
struct kernel_ethtool_ts_info *info)
603603
{
604-
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
605-
SOF_TIMESTAMPING_RX_SOFTWARE |
606-
SOF_TIMESTAMPING_SOFTWARE;
604+
info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE;
607605

608606
return 0;
609607
}

‎drivers/net/ethernet/fungible/funeth/funeth_ethtool.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,12 +1042,9 @@ static int fun_set_rxfh(struct net_device *netdev,
10421042
static int fun_get_ts_info(struct net_device *netdev,
10431043
struct kernel_ethtool_ts_info *info)
10441044
{
1045-
info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
1046-
SOF_TIMESTAMPING_RX_HARDWARE |
1045+
info->so_timestamping = SOF_TIMESTAMPING_RX_HARDWARE |
10471046
SOF_TIMESTAMPING_TX_SOFTWARE |
1048-
SOF_TIMESTAMPING_SOFTWARE |
10491047
SOF_TIMESTAMPING_RAW_HARDWARE;
1050-
info->phc_index = -1;
10511048
info->tx_types = BIT(HWTSTAMP_TX_OFF);
10521049
info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_ALL);
10531050
return 0;

‎drivers/net/ethernet/mscc/ocelot_ptp.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,17 +582,13 @@ EXPORT_SYMBOL(ocelot_hwstamp_set);
582582
int ocelot_get_ts_info(struct ocelot *ocelot, int port,
583583
struct kernel_ethtool_ts_info *info)
584584
{
585-
info->phc_index = ocelot->ptp_clock ?
586-
ptp_clock_index(ocelot->ptp_clock) : -1;
587-
if (info->phc_index == -1) {
588-
info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
589-
SOF_TIMESTAMPING_RX_SOFTWARE |
590-
SOF_TIMESTAMPING_SOFTWARE;
585+
if (ocelot->ptp_clock) {
586+
info->phc_index = ptp_clock_index(ocelot->ptp_clock);
587+
} else {
588+
info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE;
591589
return 0;
592590
}
593591
info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
594-
SOF_TIMESTAMPING_RX_SOFTWARE |
595-
SOF_TIMESTAMPING_SOFTWARE |
596592
SOF_TIMESTAMPING_TX_HARDWARE |
597593
SOF_TIMESTAMPING_RX_HARDWARE |
598594
SOF_TIMESTAMPING_RAW_HARDWARE;

0 commit comments

Comments
 (0)