Skip to content

Commit a562d0c

Browse files
Wei Fangkuba-moo
authored andcommitted
net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC
Actually ENETC VFs do not support HWTSTAMP_TX_ONESTEP_SYNC because only ENETC PF can access PMa_SINGLE_STEP registers. And there will be a crash if VFs are used to test one-step timestamp, the crash log as follows. [ 129.110909] Unable to handle kernel paging request at virtual address 00000000000080c0 [ 129.287769] Call trace: [ 129.290219] enetc_port_mac_wr+0x30/0xec (P) [ 129.294504] enetc_start_xmit+0xda4/0xe74 [ 129.298525] enetc_xmit+0x70/0xec [ 129.301848] dev_hard_start_xmit+0x98/0x118 Fixes: 4151473 ("enetc: add get_ts_info interface for ethtool") Cc: [email protected] Signed-off-by: Wei Fang <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Tested-by: Vladimir Oltean <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 432a2cb commit a562d0c

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

drivers/net/ethernet/freescale/enetc/enetc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,6 +3244,9 @@ static int enetc_hwtstamp_set(struct net_device *ndev, struct ifreq *ifr)
32443244
new_offloads |= ENETC_F_TX_TSTAMP;
32453245
break;
32463246
case HWTSTAMP_TX_ONESTEP_SYNC:
3247+
if (!enetc_si_is_pf(priv->si))
3248+
return -EOPNOTSUPP;
3249+
32473250
new_offloads &= ~ENETC_F_TX_TSTAMP_MASK;
32483251
new_offloads |= ENETC_F_TX_ONESTEP_SYNC_TSTAMP;
32493252
break;

drivers/net/ethernet/freescale/enetc/enetc_ethtool.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,6 +832,7 @@ static int enetc_set_coalesce(struct net_device *ndev,
832832
static int enetc_get_ts_info(struct net_device *ndev,
833833
struct kernel_ethtool_ts_info *info)
834834
{
835+
struct enetc_ndev_priv *priv = netdev_priv(ndev);
835836
int *phc_idx;
836837

837838
phc_idx = symbol_get(enetc_phc_index);
@@ -852,8 +853,10 @@ static int enetc_get_ts_info(struct net_device *ndev,
852853
SOF_TIMESTAMPING_TX_SOFTWARE;
853854

854855
info->tx_types = (1 << HWTSTAMP_TX_OFF) |
855-
(1 << HWTSTAMP_TX_ON) |
856-
(1 << HWTSTAMP_TX_ONESTEP_SYNC);
856+
(1 << HWTSTAMP_TX_ON);
857+
858+
if (enetc_si_is_pf(priv->si))
859+
info->tx_types |= (1 << HWTSTAMP_TX_ONESTEP_SYNC);
857860

858861
info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |
859862
(1 << HWTSTAMP_FILTER_ALL);

0 commit comments

Comments
 (0)