net/mlx5e: Rename/move functions following the ndo_stop flow change
Rename some functions that used to be invoked upon ndo_open/stop and are now invoked upon create/destroy_netdev() in order to better hint their place in the flow. Change some functions location in the file so that functions involved in ndo_open/stop flow will not be interleaved with other functions. This is a cosmetic change, no logical change here. Signed-off-by: Achiad Shochat <achiad@mellanox.com> Signed-off-by: Amir Vadai <amirv@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Achiad Shochat
David S. Miller
parent
5c50368f38
commit
40ab6a6ebe
3 changed files with 327 additions and 329 deletions
|
|
@ -482,8 +482,8 @@ struct mlx5_cqe64 *mlx5e_get_cqe(struct mlx5e_cq *cq);
|
|||
|
||||
void mlx5e_update_stats(struct mlx5e_priv *priv);
|
||||
|
||||
int mlx5e_open_flow_table(struct mlx5e_priv *priv);
|
||||
void mlx5e_close_flow_table(struct mlx5e_priv *priv);
|
||||
int mlx5e_create_flow_tables(struct mlx5e_priv *priv);
|
||||
void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv);
|
||||
void mlx5e_init_eth_addr(struct mlx5e_priv *priv);
|
||||
void mlx5e_set_rx_mode_core(struct mlx5e_priv *priv);
|
||||
void mlx5e_set_rx_mode_work(struct work_struct *work);
|
||||
|
|
|
|||
|
|
@ -929,7 +929,7 @@ static void mlx5e_destroy_vlan_flow_table(struct mlx5e_priv *priv)
|
|||
mlx5_destroy_flow_table(priv->ft.vlan);
|
||||
}
|
||||
|
||||
int mlx5e_open_flow_table(struct mlx5e_priv *priv)
|
||||
int mlx5e_create_flow_tables(struct mlx5e_priv *priv)
|
||||
{
|
||||
int err;
|
||||
|
||||
|
|
@ -949,7 +949,7 @@ err_destroy_main_flow_table:
|
|||
return err;
|
||||
}
|
||||
|
||||
void mlx5e_close_flow_table(struct mlx5e_priv *priv)
|
||||
void mlx5e_destroy_flow_tables(struct mlx5e_priv *priv)
|
||||
{
|
||||
mlx5e_destroy_vlan_flow_table(priv);
|
||||
mlx5e_destroy_main_flow_table(priv);
|
||||
|
|
|
|||
|
|
@ -1114,6 +1114,283 @@ static void mlx5e_close_channels(struct mlx5e_priv *priv)
|
|||
kfree(priv->channel);
|
||||
}
|
||||
|
||||
static int mlx5e_rx_hash_fn(int hfunc)
|
||||
{
|
||||
return (hfunc == ETH_RSS_HASH_TOP) ?
|
||||
MLX5_RX_HASH_FN_TOEPLITZ :
|
||||
MLX5_RX_HASH_FN_INVERTED_XOR8;
|
||||
}
|
||||
|
||||
static int mlx5e_bits_invert(unsigned long a, int size)
|
||||
{
|
||||
int inv = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
inv |= (test_bit(size - i - 1, &a) ? 1 : 0) << i;
|
||||
|
||||
return inv;
|
||||
}
|
||||
|
||||
static void mlx5e_fill_rqt_rqns(struct mlx5e_priv *priv, void *rqtc,
|
||||
enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
int i;
|
||||
int log_sz;
|
||||
|
||||
switch (rqt_ix) {
|
||||
case MLX5E_INDIRECTION_RQT:
|
||||
log_sz = priv->params.rx_hash_log_tbl_sz;
|
||||
for (i = 0; i < (1 << log_sz); i++) {
|
||||
int ix = i;
|
||||
|
||||
if (priv->params.rss_hfunc == ETH_RSS_HASH_XOR)
|
||||
ix = mlx5e_bits_invert(i, log_sz);
|
||||
|
||||
ix = ix % priv->params.num_channels;
|
||||
MLX5_SET(rqtc, rqtc, rq_num[i],
|
||||
test_bit(MLX5E_STATE_OPENED, &priv->state) ?
|
||||
priv->channel[ix]->rq.rqn :
|
||||
priv->drop_rq.rqn);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default: /* MLX5E_SINGLE_RQ_RQT */
|
||||
MLX5_SET(rqtc, rqtc, rq_num[0],
|
||||
test_bit(MLX5E_STATE_OPENED, &priv->state) ?
|
||||
priv->channel[0]->rq.rqn :
|
||||
priv->drop_rq.rqn);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int mlx5e_create_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 *in;
|
||||
void *rqtc;
|
||||
int inlen;
|
||||
int log_sz;
|
||||
int sz;
|
||||
int err;
|
||||
|
||||
log_sz = (rqt_ix == MLX5E_SINGLE_RQ_RQT) ? 0 :
|
||||
priv->params.rx_hash_log_tbl_sz;
|
||||
sz = 1 << log_sz;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * sz;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
rqtc = MLX5_ADDR_OF(create_rqt_in, in, rqt_context);
|
||||
|
||||
MLX5_SET(rqtc, rqtc, rqt_actual_size, sz);
|
||||
MLX5_SET(rqtc, rqtc, rqt_max_size, sz);
|
||||
|
||||
mlx5e_fill_rqt_rqns(priv, rqtc, rqt_ix);
|
||||
|
||||
err = mlx5_core_create_rqt(mdev, in, inlen, &priv->rqtn[rqt_ix]);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_redirect_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 *in;
|
||||
void *rqtc;
|
||||
int inlen;
|
||||
int log_sz;
|
||||
int sz;
|
||||
int err;
|
||||
|
||||
log_sz = (rqt_ix == MLX5E_SINGLE_RQ_RQT) ? 0 :
|
||||
priv->params.rx_hash_log_tbl_sz;
|
||||
sz = 1 << log_sz;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) + sizeof(u32) * sz;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
rqtc = MLX5_ADDR_OF(modify_rqt_in, in, ctx);
|
||||
|
||||
MLX5_SET(rqtc, rqtc, rqt_actual_size, sz);
|
||||
|
||||
mlx5e_fill_rqt_rqns(priv, rqtc, rqt_ix);
|
||||
|
||||
MLX5_SET(modify_rqt_in, in, bitmask.rqn_list, 1);
|
||||
|
||||
err = mlx5_core_modify_rqt(mdev, priv->rqtn[rqt_ix], in, inlen);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mlx5e_destroy_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
mlx5_core_destroy_rqt(priv->mdev, priv->rqtn[rqt_ix]);
|
||||
}
|
||||
|
||||
static void mlx5e_redirect_rqts(struct mlx5e_priv *priv)
|
||||
{
|
||||
mlx5e_redirect_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
mlx5e_redirect_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
}
|
||||
|
||||
static void mlx5e_build_tir_ctx_lro(void *tirc, struct mlx5e_priv *priv)
|
||||
{
|
||||
if (!priv->params.lro_en)
|
||||
return;
|
||||
|
||||
#define ROUGH_MAX_L2_L3_HDR_SZ 256
|
||||
|
||||
MLX5_SET(tirc, tirc, lro_enable_mask,
|
||||
MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO |
|
||||
MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO);
|
||||
MLX5_SET(tirc, tirc, lro_max_ip_payload_size,
|
||||
(priv->params.lro_wqe_sz -
|
||||
ROUGH_MAX_L2_L3_HDR_SZ) >> 8);
|
||||
MLX5_SET(tirc, tirc, lro_timeout_period_usecs,
|
||||
MLX5_CAP_ETH(priv->mdev,
|
||||
lro_timer_supported_periods[3]));
|
||||
}
|
||||
|
||||
static int mlx5e_modify_tir_lro(struct mlx5e_priv *priv, int tt)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
void *in;
|
||||
void *tirc;
|
||||
int inlen;
|
||||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_tir_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
MLX5_SET(modify_tir_in, in, bitmask.lro, 1);
|
||||
tirc = MLX5_ADDR_OF(modify_tir_in, in, ctx);
|
||||
|
||||
mlx5e_build_tir_ctx_lro(tirc, priv);
|
||||
|
||||
err = mlx5_core_modify_tir(mdev, priv->tirn[tt], in, inlen);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
int hw_mtu;
|
||||
int err;
|
||||
|
||||
err = mlx5_set_port_mtu(mdev, MLX5E_SW2HW_MTU(netdev->mtu), 1);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
|
||||
|
||||
if (MLX5E_HW2SW_MTU(hw_mtu) != netdev->mtu)
|
||||
netdev_warn(netdev, "%s: Port MTU %d is different than netdev mtu %d\n",
|
||||
__func__, MLX5E_HW2SW_MTU(hw_mtu), netdev->mtu);
|
||||
|
||||
netdev->mtu = MLX5E_HW2SW_MTU(hw_mtu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int mlx5e_open_locked(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int num_txqs;
|
||||
int err;
|
||||
|
||||
set_bit(MLX5E_STATE_OPENED, &priv->state);
|
||||
|
||||
num_txqs = priv->params.num_channels * priv->params.num_tc;
|
||||
netif_set_real_num_tx_queues(netdev, num_txqs);
|
||||
netif_set_real_num_rx_queues(netdev, priv->params.num_channels);
|
||||
|
||||
err = mlx5e_set_dev_port_mtu(netdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = mlx5e_open_channels(priv);
|
||||
if (err) {
|
||||
netdev_err(netdev, "%s: mlx5e_open_channels failed, %d\n",
|
||||
__func__, err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = mlx5e_add_all_vlan_rules(priv);
|
||||
if (err) {
|
||||
netdev_err(netdev, "%s: mlx5e_add_all_vlan_rules failed, %d\n",
|
||||
__func__, err);
|
||||
goto err_close_channels;
|
||||
}
|
||||
|
||||
mlx5e_update_carrier(priv);
|
||||
mlx5e_redirect_rqts(priv);
|
||||
mlx5e_set_rx_mode_core(priv);
|
||||
|
||||
schedule_delayed_work(&priv->update_stats_work, 0);
|
||||
return 0;
|
||||
|
||||
err_close_channels:
|
||||
mlx5e_close_channels(priv);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_open(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int err;
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
err = mlx5e_open_locked(netdev);
|
||||
mutex_unlock(&priv->state_lock);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int mlx5e_close_locked(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
clear_bit(MLX5E_STATE_OPENED, &priv->state);
|
||||
|
||||
mlx5e_redirect_rqts(priv);
|
||||
mlx5e_set_rx_mode_core(priv);
|
||||
mlx5e_del_all_vlan_rules(priv);
|
||||
netif_carrier_off(priv->netdev);
|
||||
mlx5e_close_channels(priv);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mlx5e_close(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int err;
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
err = mlx5e_close_locked(netdev);
|
||||
mutex_unlock(&priv->state_lock);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_create_drop_rq(struct mlx5e_priv *priv,
|
||||
struct mlx5e_rq *rq,
|
||||
struct mlx5e_rq_param *param)
|
||||
|
|
@ -1219,7 +1496,7 @@ static void mlx5e_close_drop_rq(struct mlx5e_priv *priv)
|
|||
mlx5e_destroy_cq(&priv->drop_rq.cq);
|
||||
}
|
||||
|
||||
static int mlx5e_open_tis(struct mlx5e_priv *priv, int tc)
|
||||
static int mlx5e_create_tis(struct mlx5e_priv *priv, int tc)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 in[MLX5_ST_SZ_DW(create_tis_in)];
|
||||
|
|
@ -1233,18 +1510,18 @@ static int mlx5e_open_tis(struct mlx5e_priv *priv, int tc)
|
|||
return mlx5_core_create_tis(mdev, in, sizeof(in), &priv->tisn[tc]);
|
||||
}
|
||||
|
||||
static void mlx5e_close_tis(struct mlx5e_priv *priv, int tc)
|
||||
static void mlx5e_destroy_tis(struct mlx5e_priv *priv, int tc)
|
||||
{
|
||||
mlx5_core_destroy_tis(priv->mdev, priv->tisn[tc]);
|
||||
}
|
||||
|
||||
static int mlx5e_open_tises(struct mlx5e_priv *priv)
|
||||
static int mlx5e_create_tises(struct mlx5e_priv *priv)
|
||||
{
|
||||
int err;
|
||||
int tc;
|
||||
|
||||
for (tc = 0; tc < priv->params.num_tc; tc++) {
|
||||
err = mlx5e_open_tis(priv, tc);
|
||||
err = mlx5e_create_tis(priv, tc);
|
||||
if (err)
|
||||
goto err_close_tises;
|
||||
}
|
||||
|
|
@ -1253,185 +1530,17 @@ static int mlx5e_open_tises(struct mlx5e_priv *priv)
|
|||
|
||||
err_close_tises:
|
||||
for (tc--; tc >= 0; tc--)
|
||||
mlx5e_close_tis(priv, tc);
|
||||
mlx5e_destroy_tis(priv, tc);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mlx5e_close_tises(struct mlx5e_priv *priv)
|
||||
static void mlx5e_destroy_tises(struct mlx5e_priv *priv)
|
||||
{
|
||||
int tc;
|
||||
|
||||
for (tc = 0; tc < priv->params.num_tc; tc++)
|
||||
mlx5e_close_tis(priv, tc);
|
||||
}
|
||||
|
||||
static int mlx5e_rx_hash_fn(int hfunc)
|
||||
{
|
||||
return (hfunc == ETH_RSS_HASH_TOP) ?
|
||||
MLX5_RX_HASH_FN_TOEPLITZ :
|
||||
MLX5_RX_HASH_FN_INVERTED_XOR8;
|
||||
}
|
||||
|
||||
static int mlx5e_bits_invert(unsigned long a, int size)
|
||||
{
|
||||
int inv = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < size; i++)
|
||||
inv |= (test_bit(size - i - 1, &a) ? 1 : 0) << i;
|
||||
|
||||
return inv;
|
||||
}
|
||||
|
||||
static void mlx5e_fill_rqt_rqns(struct mlx5e_priv *priv, void *rqtc,
|
||||
enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
int i;
|
||||
int log_sz;
|
||||
|
||||
switch (rqt_ix) {
|
||||
case MLX5E_INDIRECTION_RQT:
|
||||
log_sz = priv->params.rx_hash_log_tbl_sz;
|
||||
for (i = 0; i < (1 << log_sz); i++) {
|
||||
int ix = i;
|
||||
|
||||
if (priv->params.rss_hfunc == ETH_RSS_HASH_XOR)
|
||||
ix = mlx5e_bits_invert(i, log_sz);
|
||||
|
||||
ix = ix % priv->params.num_channels;
|
||||
MLX5_SET(rqtc, rqtc, rq_num[i],
|
||||
test_bit(MLX5E_STATE_OPENED, &priv->state) ?
|
||||
priv->channel[ix]->rq.rqn :
|
||||
priv->drop_rq.rqn);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default: /* MLX5E_SINGLE_RQ_RQT */
|
||||
MLX5_SET(rqtc, rqtc, rq_num[0],
|
||||
test_bit(MLX5E_STATE_OPENED, &priv->state) ?
|
||||
priv->channel[0]->rq.rqn :
|
||||
priv->drop_rq.rqn);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int mlx5e_open_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 *in;
|
||||
void *rqtc;
|
||||
int inlen;
|
||||
int log_sz;
|
||||
int sz;
|
||||
int err;
|
||||
|
||||
log_sz = (rqt_ix == MLX5E_SINGLE_RQ_RQT) ? 0 :
|
||||
priv->params.rx_hash_log_tbl_sz;
|
||||
sz = 1 << log_sz;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * sz;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
rqtc = MLX5_ADDR_OF(create_rqt_in, in, rqt_context);
|
||||
|
||||
MLX5_SET(rqtc, rqtc, rqt_actual_size, sz);
|
||||
MLX5_SET(rqtc, rqtc, rqt_max_size, sz);
|
||||
|
||||
mlx5e_fill_rqt_rqns(priv, rqtc, rqt_ix);
|
||||
|
||||
err = mlx5_core_create_rqt(mdev, in, inlen, &priv->rqtn[rqt_ix]);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_redirect_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 *in;
|
||||
void *rqtc;
|
||||
int inlen;
|
||||
int log_sz;
|
||||
int sz;
|
||||
int err;
|
||||
|
||||
log_sz = (rqt_ix == MLX5E_SINGLE_RQ_RQT) ? 0 :
|
||||
priv->params.rx_hash_log_tbl_sz;
|
||||
sz = 1 << log_sz;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) + sizeof(u32) * sz;
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
rqtc = MLX5_ADDR_OF(modify_rqt_in, in, ctx);
|
||||
|
||||
MLX5_SET(rqtc, rqtc, rqt_actual_size, sz);
|
||||
|
||||
mlx5e_fill_rqt_rqns(priv, rqtc, rqt_ix);
|
||||
|
||||
MLX5_SET(modify_rqt_in, in, bitmask.rqn_list, 1);
|
||||
|
||||
err = mlx5_core_modify_rqt(mdev, priv->rqtn[rqt_ix], in, inlen);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mlx5e_close_rqt(struct mlx5e_priv *priv, enum mlx5e_rqt_ix rqt_ix)
|
||||
{
|
||||
mlx5_core_destroy_rqt(priv->mdev, priv->rqtn[rqt_ix]);
|
||||
}
|
||||
|
||||
static void mlx5e_build_tir_ctx_lro(void *tirc, struct mlx5e_priv *priv)
|
||||
{
|
||||
if (!priv->params.lro_en)
|
||||
return;
|
||||
|
||||
#define ROUGH_MAX_L2_L3_HDR_SZ 256
|
||||
|
||||
MLX5_SET(tirc, tirc, lro_enable_mask,
|
||||
MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO |
|
||||
MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO);
|
||||
MLX5_SET(tirc, tirc, lro_max_ip_payload_size,
|
||||
(priv->params.lro_wqe_sz -
|
||||
ROUGH_MAX_L2_L3_HDR_SZ) >> 8);
|
||||
MLX5_SET(tirc, tirc, lro_timeout_period_usecs,
|
||||
MLX5_CAP_ETH(priv->mdev,
|
||||
lro_timer_supported_periods[3]));
|
||||
}
|
||||
|
||||
static int mlx5e_modify_tir_lro(struct mlx5e_priv *priv, int tt)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
|
||||
void *in;
|
||||
void *tirc;
|
||||
int inlen;
|
||||
int err;
|
||||
|
||||
inlen = MLX5_ST_SZ_BYTES(modify_tir_in);
|
||||
in = mlx5_vzalloc(inlen);
|
||||
if (!in)
|
||||
return -ENOMEM;
|
||||
|
||||
MLX5_SET(modify_tir_in, in, bitmask.lro, 1);
|
||||
tirc = MLX5_ADDR_OF(modify_tir_in, in, ctx);
|
||||
|
||||
mlx5e_build_tir_ctx_lro(tirc, priv);
|
||||
|
||||
err = mlx5_core_modify_tir(mdev, priv->tirn[tt], in, inlen);
|
||||
|
||||
kvfree(in);
|
||||
|
||||
return err;
|
||||
mlx5e_destroy_tis(priv, tc);
|
||||
}
|
||||
|
||||
static void mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 *tirc, int tt)
|
||||
|
|
@ -1560,7 +1669,7 @@ static void mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 *tirc, int tt)
|
|||
}
|
||||
}
|
||||
|
||||
static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt)
|
||||
static int mlx5e_create_tir(struct mlx5e_priv *priv, int tt)
|
||||
{
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
u32 *in;
|
||||
|
|
@ -1584,148 +1693,37 @@ static int mlx5e_open_tir(struct mlx5e_priv *priv, int tt)
|
|||
return err;
|
||||
}
|
||||
|
||||
static void mlx5e_close_tir(struct mlx5e_priv *priv, int tt)
|
||||
static void mlx5e_destroy_tir(struct mlx5e_priv *priv, int tt)
|
||||
{
|
||||
mlx5_core_destroy_tir(priv->mdev, priv->tirn[tt]);
|
||||
}
|
||||
|
||||
static int mlx5e_open_tirs(struct mlx5e_priv *priv)
|
||||
static int mlx5e_create_tirs(struct mlx5e_priv *priv)
|
||||
{
|
||||
int err;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MLX5E_NUM_TT; i++) {
|
||||
err = mlx5e_open_tir(priv, i);
|
||||
err = mlx5e_create_tir(priv, i);
|
||||
if (err)
|
||||
goto err_close_tirs;
|
||||
goto err_destroy_tirs;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_close_tirs:
|
||||
err_destroy_tirs:
|
||||
for (i--; i >= 0; i--)
|
||||
mlx5e_close_tir(priv, i);
|
||||
mlx5e_destroy_tir(priv, i);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mlx5e_close_tirs(struct mlx5e_priv *priv)
|
||||
static void mlx5e_destroy_tirs(struct mlx5e_priv *priv)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < MLX5E_NUM_TT; i++)
|
||||
mlx5e_close_tir(priv, i);
|
||||
}
|
||||
|
||||
static int mlx5e_set_dev_port_mtu(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
struct mlx5_core_dev *mdev = priv->mdev;
|
||||
int hw_mtu;
|
||||
int err;
|
||||
|
||||
err = mlx5_set_port_mtu(mdev, MLX5E_SW2HW_MTU(netdev->mtu), 1);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
mlx5_query_port_oper_mtu(mdev, &hw_mtu, 1);
|
||||
|
||||
if (MLX5E_HW2SW_MTU(hw_mtu) != netdev->mtu)
|
||||
netdev_warn(netdev, "%s: Port MTU %d is different than netdev mtu %d\n",
|
||||
__func__, MLX5E_HW2SW_MTU(hw_mtu), netdev->mtu);
|
||||
|
||||
netdev->mtu = MLX5E_HW2SW_MTU(hw_mtu);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mlx5e_redirect_rqts(struct mlx5e_priv *priv)
|
||||
{
|
||||
mlx5e_redirect_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
mlx5e_redirect_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
}
|
||||
|
||||
int mlx5e_open_locked(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int num_txqs;
|
||||
int err;
|
||||
|
||||
set_bit(MLX5E_STATE_OPENED, &priv->state);
|
||||
|
||||
num_txqs = priv->params.num_channels * priv->params.num_tc;
|
||||
netif_set_real_num_tx_queues(netdev, num_txqs);
|
||||
netif_set_real_num_rx_queues(netdev, priv->params.num_channels);
|
||||
|
||||
err = mlx5e_set_dev_port_mtu(netdev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = mlx5e_open_channels(priv);
|
||||
if (err) {
|
||||
netdev_err(netdev, "%s: mlx5e_open_channels failed, %d\n",
|
||||
__func__, err);
|
||||
return err;
|
||||
}
|
||||
|
||||
err = mlx5e_add_all_vlan_rules(priv);
|
||||
if (err) {
|
||||
netdev_err(netdev, "%s: mlx5e_add_all_vlan_rules failed, %d\n",
|
||||
__func__, err);
|
||||
goto err_close_channels;
|
||||
}
|
||||
|
||||
mlx5e_init_eth_addr(priv);
|
||||
|
||||
mlx5e_update_carrier(priv);
|
||||
mlx5e_redirect_rqts(priv);
|
||||
mlx5e_set_rx_mode_core(priv);
|
||||
|
||||
schedule_delayed_work(&priv->update_stats_work, 0);
|
||||
return 0;
|
||||
|
||||
err_close_channels:
|
||||
mlx5e_close_channels(priv);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int mlx5e_open(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int err;
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
err = mlx5e_open_locked(netdev);
|
||||
mutex_unlock(&priv->state_lock);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
int mlx5e_close_locked(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
|
||||
clear_bit(MLX5E_STATE_OPENED, &priv->state);
|
||||
|
||||
mlx5e_set_rx_mode_core(priv);
|
||||
mlx5e_del_all_vlan_rules(priv);
|
||||
mlx5e_redirect_rqts(priv);
|
||||
netif_carrier_off(priv->netdev);
|
||||
mlx5e_close_channels(priv);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int mlx5e_close(struct net_device *netdev)
|
||||
{
|
||||
struct mlx5e_priv *priv = netdev_priv(netdev);
|
||||
int err;
|
||||
|
||||
mutex_lock(&priv->state_lock);
|
||||
err = mlx5e_close_locked(netdev);
|
||||
mutex_unlock(&priv->state_lock);
|
||||
|
||||
return err;
|
||||
mlx5e_destroy_tir(priv, i);
|
||||
}
|
||||
|
||||
static struct rtnl_link_stats64 *
|
||||
|
|
@ -2051,40 +2049,40 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)
|
|||
goto err_dealloc_transport_domain;
|
||||
}
|
||||
|
||||
err = mlx5e_open_tises(priv);
|
||||
err = mlx5e_create_tises(priv);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "open tises failed, %d\n", err);
|
||||
mlx5_core_warn(mdev, "create tises failed, %d\n", err);
|
||||
goto err_destroy_mkey;
|
||||
}
|
||||
|
||||
err = mlx5e_open_drop_rq(priv);
|
||||
if (err) {
|
||||
mlx5_core_err(mdev, "open drop rq failed, %d\n", err);
|
||||
goto err_close_tises;
|
||||
goto err_destroy_tises;
|
||||
}
|
||||
|
||||
err = mlx5e_open_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
err = mlx5e_create_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "open rqt(INDIR) failed, %d\n", err);
|
||||
mlx5_core_warn(mdev, "create rqt(INDIR) failed, %d\n", err);
|
||||
goto err_close_drop_rq;
|
||||
}
|
||||
|
||||
err = mlx5e_open_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
err = mlx5e_create_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "open rqt(SINGLE) failed, %d\n", err);
|
||||
goto err_close_rqt_indir;
|
||||
mlx5_core_warn(mdev, "create rqt(SINGLE) failed, %d\n", err);
|
||||
goto err_destroy_rqt_indir;
|
||||
}
|
||||
|
||||
err = mlx5e_open_tirs(priv);
|
||||
err = mlx5e_create_tirs(priv);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "open tirs failed, %d\n", err);
|
||||
goto err_close_rqt_single;
|
||||
mlx5_core_warn(mdev, "create tirs failed, %d\n", err);
|
||||
goto err_destroy_rqt_single;
|
||||
}
|
||||
|
||||
err = mlx5e_open_flow_table(priv);
|
||||
err = mlx5e_create_flow_tables(priv);
|
||||
if (err) {
|
||||
mlx5_core_warn(mdev, "open flow table failed, %d\n", err);
|
||||
goto err_close_tirs;
|
||||
mlx5_core_warn(mdev, "create flow tables failed, %d\n", err);
|
||||
goto err_destroy_tirs;
|
||||
}
|
||||
|
||||
mlx5e_init_eth_addr(priv);
|
||||
|
|
@ -2092,30 +2090,30 @@ static void *mlx5e_create_netdev(struct mlx5_core_dev *mdev)
|
|||
err = register_netdev(netdev);
|
||||
if (err) {
|
||||
mlx5_core_err(mdev, "register_netdev failed, %d\n", err);
|
||||
goto err_close_flow_table;
|
||||
goto err_destroy_flow_tables;
|
||||
}
|
||||
|
||||
mlx5e_enable_async_events(priv);
|
||||
|
||||
return priv;
|
||||
|
||||
err_close_flow_table:
|
||||
mlx5e_close_flow_table(priv);
|
||||
err_destroy_flow_tables:
|
||||
mlx5e_destroy_flow_tables(priv);
|
||||
|
||||
err_close_tirs:
|
||||
mlx5e_close_tirs(priv);
|
||||
err_destroy_tirs:
|
||||
mlx5e_destroy_tirs(priv);
|
||||
|
||||
err_close_rqt_single:
|
||||
mlx5e_close_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
err_destroy_rqt_single:
|
||||
mlx5e_destroy_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
|
||||
err_close_rqt_indir:
|
||||
mlx5e_close_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
err_destroy_rqt_indir:
|
||||
mlx5e_destroy_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
|
||||
err_close_drop_rq:
|
||||
mlx5e_close_drop_rq(priv);
|
||||
|
||||
err_close_tises:
|
||||
mlx5e_close_tises(priv);
|
||||
err_destroy_tises:
|
||||
mlx5e_destroy_tises(priv);
|
||||
|
||||
err_destroy_mkey:
|
||||
mlx5_core_destroy_mkey(mdev, &priv->mr);
|
||||
|
|
@ -2141,12 +2139,12 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv)
|
|||
struct net_device *netdev = priv->netdev;
|
||||
|
||||
unregister_netdev(netdev);
|
||||
mlx5e_close_flow_table(priv);
|
||||
mlx5e_close_tirs(priv);
|
||||
mlx5e_close_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
mlx5e_close_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
mlx5e_destroy_flow_tables(priv);
|
||||
mlx5e_destroy_tirs(priv);
|
||||
mlx5e_destroy_rqt(priv, MLX5E_SINGLE_RQ_RQT);
|
||||
mlx5e_destroy_rqt(priv, MLX5E_INDIRECTION_RQT);
|
||||
mlx5e_close_drop_rq(priv);
|
||||
mlx5e_close_tises(priv);
|
||||
mlx5e_destroy_tises(priv);
|
||||
mlx5_core_destroy_mkey(priv->mdev, &priv->mr);
|
||||
mlx5_dealloc_transport_domain(priv->mdev, priv->tdn);
|
||||
mlx5_core_dealloc_pd(priv->mdev, priv->pdn);
|
||||
|
|
|
|||
Loading…
Reference in a new issue