Skip to content

Commit

Permalink
Revert "mlx5 updates 2023-12-20"
Browse files Browse the repository at this point in the history 
Revert "net/mlx5: Implement management PF Ethernet profile"
This reverts commit 22c4640.
Revert "net/mlx5: Enable SD feature"
This reverts commit c88c49a.
Revert "net/mlx5e: Block TLS device offload on combined SD netdev"
This reverts commit 83a59ce.
Revert "net/mlx5e: Support per-mdev queue counter"
This reverts commit d72bace.
Revert "net/mlx5e: Support cross-vhca RSS"
This reverts commit c73a3ab.
Revert "net/mlx5e: Let channels be SD-aware"
This reverts commit e4f9686.
Revert "net/mlx5e: Create EN core HW resources for all secondary devices"
This reverts commit c4fb94a.
Revert "net/mlx5e: Create single netdev per SD group"
This reverts commit e2578b4.
Revert "net/mlx5: SD, Add informative prints in kernel log"
This reverts commit c82d360.
Revert "net/mlx5: SD, Implement steering for primary and secondaries"
This reverts commit 605fcce.
Revert "net/mlx5: SD, Implement devcom communication and primary election"
This reverts commit a45af9a.
Revert "net/mlx5: SD, Implement basic query and instantiation"
This reverts commit 63b9ce9.
Revert "net/mlx5: SD, Introduce SD lib"
This reverts commit 4a04a31.
Revert "net/mlx5: Fix query of sd_group field"
This reverts commit e04984a.
Revert "net/mlx5e: Use the correct lag ports number when creating TISes"
This reverts commit a7e7b40.

There are some unanswered questions on the list, and we don't
have any docs. Given the lack of replies so far and the fact
that v6.8 merge window has started - let's revert this and
revisit for v6.9.

Link: https://lore.kernel.org/all/20231221005721.186607-1-saeed@kernel.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
@kuba-moo
kuba-moo committed Jan 8, 2024
1 parent e9ee910 commit 3fbf612
Show file tree
Hide file tree
Showing 40 changed files with 192 additions and 1,320 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/mellanox/mlx5/core/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en/rqt.o en/tir.o en/rss.o en/rx_res.o \
en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/pool.o \
en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o en/ptp.o \
en/qos.o en/htb.o en/trap.o en/fs_tt_redirect.o en/selq.o \
en/mgmt_pf.o lib/crypto.o lib/sd.o
lib/crypto.o

#
# Netdev extra
Expand Down
3 changes: 0 additions & 3 deletions drivers/net/ethernet/mellanox/mlx5/core/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,6 @@ bool mlx5_rdma_supported(struct mlx5_core_dev *dev)
if (is_mp_supported(dev))
return false;

if (mlx5_core_is_mgmt_pf(dev))
return false;

return true;
}

Expand Down
6 changes: 0 additions & 6 deletions drivers/net/ethernet/mellanox/mlx5/core/ecpf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ int mlx5_ec_init(struct mlx5_core_dev *dev)
if (!mlx5_core_is_ecpf(dev))
return 0;

if (mlx5_core_is_mgmt_pf(dev))
return 0;

return mlx5_host_pf_init(dev);
}

Expand All @@ -88,9 +85,6 @@ void mlx5_ec_cleanup(struct mlx5_core_dev *dev)
if (!mlx5_core_is_ecpf(dev))
return;

if (mlx5_core_is_mgmt_pf(dev))
return;

mlx5_host_pf_cleanup(dev);

err = mlx5_wait_for_pages(dev, &dev->priv.page_counters[MLX5_HOST_PF]);
Expand Down
15 changes: 4 additions & 11 deletions drivers/net/ethernet/mellanox/mlx5/core/en.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,8 @@
#include "lib/clock.h"
#include "en/rx_res.h"
#include "en/selq.h"
#include "lib/sd.h"

extern const struct net_device_ops mlx5e_netdev_ops;
extern const struct net_device_ops mlx5e_mgmt_netdev_ops;
struct page_pool;

#define MLX5E_METADATA_ETHER_TYPE (0x8CE4)
Expand Down Expand Up @@ -793,8 +791,6 @@ struct mlx5e_channel {
struct hwtstamp_config *tstamp;
DECLARE_BITMAP(state, MLX5E_CHANNEL_NUM_STATES);
int ix;
int vec_ix;
int sd_ix;
int cpu;
/* Sync between icosq recovery and XSK enable/disable. */
struct mutex icosq_recovery_lock;
Expand Down Expand Up @@ -918,7 +914,7 @@ struct mlx5e_priv {
bool tx_ptp_opened;
bool rx_ptp_opened;
struct hwtstamp_config tstamp;
u16 q_counter[MLX5_SD_MAX_GROUP_SZ];
u16 q_counter;
u16 drop_rq_q_counter;
struct notifier_block events_nb;
struct notifier_block blocking_events_nb;
Expand Down Expand Up @@ -1033,12 +1029,12 @@ struct mlx5e_xsk_param;

struct mlx5e_rq_param;
int mlx5e_open_rq(struct mlx5e_params *params, struct mlx5e_rq_param *param,
struct mlx5e_xsk_param *xsk, int node, u16 q_counter,
struct mlx5e_xsk_param *xsk, int node,
struct mlx5e_rq *rq);
#define MLX5E_RQ_WQES_TIMEOUT 20000 /* msecs */
int mlx5e_wait_for_min_rx_wqes(struct mlx5e_rq *rq, int wait_time);
void mlx5e_close_rq(struct mlx5e_rq *rq);
int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param, u16 q_counter);
int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param);
void mlx5e_destroy_rq(struct mlx5e_rq *rq);

struct mlx5e_sq_param;
Expand Down Expand Up @@ -1126,10 +1122,9 @@ static inline bool mlx5_tx_swp_supported(struct mlx5_core_dev *mdev)
}

extern const struct ethtool_ops mlx5e_ethtool_ops;
extern const struct mlx5e_profile mlx5e_mgmt_pf_nic_profile;

int mlx5e_create_mkey(struct mlx5_core_dev *mdev, u32 pdn, u32 *mkey);
int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev, bool create_tises);
int mlx5e_create_mdev_resources(struct mlx5_core_dev *mdev);
void mlx5e_destroy_mdev_resources(struct mlx5_core_dev *mdev);
int mlx5e_refresh_tirs(struct mlx5e_priv *priv, bool enable_uc_lb,
bool enable_mc_lb);
Expand Down Expand Up @@ -1232,8 +1227,6 @@ netdev_features_t mlx5e_features_check(struct sk_buff *skb,
struct net_device *netdev,
netdev_features_t features);
int mlx5e_set_features(struct net_device *netdev, netdev_features_t features);
void mlx5e_nic_set_rx_mode(struct mlx5e_priv *priv);

#ifdef CONFIG_MLX5_ESWITCH
int mlx5e_set_vf_mac(struct net_device *dev, int vf, u8 *mac);
int mlx5e_set_vf_rate(struct net_device *dev, int vf, int min_tx_rate, int max_tx_rate);
Expand Down
10 changes: 2 additions & 8 deletions drivers/net/ethernet/mellanox/mlx5/core/en/channels.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,20 @@ bool mlx5e_channels_is_xsk(struct mlx5e_channels *chs, unsigned int ix)
return test_bit(MLX5E_CHANNEL_STATE_XSK, c->state);
}

void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,
u32 *vhca_id)
void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)
{
struct mlx5e_channel *c = mlx5e_channels_get(chs, ix);

*rqn = c->rq.rqn;
if (vhca_id)
*vhca_id = MLX5_CAP_GEN(c->mdev, vhca_id);
}

void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,
u32 *vhca_id)
void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)
{
struct mlx5e_channel *c = mlx5e_channels_get(chs, ix);

WARN_ON_ONCE(!test_bit(MLX5E_CHANNEL_STATE_XSK, c->state));

*rqn = c->xskrq.rqn;
if (vhca_id)
*vhca_id = MLX5_CAP_GEN(c->mdev, vhca_id);
}

bool mlx5e_channels_get_ptp_rqn(struct mlx5e_channels *chs, u32 *rqn)
Expand Down
6 changes: 2 additions & 4 deletions drivers/net/ethernet/mellanox/mlx5/core/en/channels.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ struct mlx5e_channels;

unsigned int mlx5e_channels_get_num(struct mlx5e_channels *chs);
bool mlx5e_channels_is_xsk(struct mlx5e_channels *chs, unsigned int ix);
void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,
u32 *vhca_id);
void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn,
u32 *vhca_id);
void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn);
void mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn);
bool mlx5e_channels_get_ptp_rqn(struct mlx5e_channels *chs, u32 *rqn);

#endif /* __MLX5_EN_CHANNELS_H__ */
Loading

0 comments on commit 3fbf612

Please sign in to comment.