diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-10-01 11:19:40 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-01 11:19:40 +0100 |
| commit | ea2dd331bfaaeba74ba31facf437c29044f7d4cb (patch) | |
| tree | 418995a39f2052379b04d0cf6e0c9d2faa0c8e32 /drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | |
| parent | net: sched: Use struct_size() helper in kvmalloc() (diff) | |
| parent | net/mlx5e: Mutually exclude setting of TX-port-TS and MQPRIO in channel mode (diff) | |
| download | linux-dev-ea2dd331bfaaeba74ba31facf437c29044f7d4cb.tar.xz linux-dev-ea2dd331bfaaeba74ba31facf437c29044f7d4cb.zip | |
Merge tag 'mlx5-fixes-2021-09-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5 fixes 2021-09-30
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index 485f208691ea..7a97e0e21fd7 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -2034,6 +2034,17 @@ static int set_pflag_tx_port_ts(struct net_device *netdev, bool enable) } new_params = priv->channels.params; + /* Don't allow enabling TX-port-TS if MQPRIO mode channel offload is + * active, since it defines explicitly which TC accepts the packet. + * This conflicts with TX-port-TS hijacking the PTP traffic to a specific + * HW TX-queue. + */ + if (enable && new_params.mqprio.mode == TC_MQPRIO_MODE_CHANNEL) { + netdev_err(priv->netdev, + "%s: MQPRIO mode channel offload is active, cannot set the TX-port-TS\n", + __func__); + return -EINVAL; + } MLX5E_SET_PFLAG(&new_params, MLX5E_PFLAG_TX_PORT_TS, enable); /* No need to verify SQ stop room as * ptpsq.txqsq.stop_room <= generic_sq->stop_room, and both |