net/mlx5e: Replace usage of mlx5e_devlink_get_dl_port() by netdev->devlink_port

On places where netdev pointer is available, access related devlink_port
pointer by netdev->devlink_port instead of using
mlx5e_devlink_get_dl_port() which is going to be removed.

Move SET_NETDEV_DEVLINK_PORT() call right after devlink port
registration to make sure netdev->devlink_port is valid.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
index 95edab4..c462fe7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -736,10 +736,10 @@ static const struct devlink_health_reporter_ops mlx5_rx_reporter_ops = {
 
 void mlx5e_reporter_rx_create(struct mlx5e_priv *priv)
 {
-       struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);
        struct devlink_health_reporter *reporter;
 
-       reporter = devlink_port_health_reporter_create(dl_port, &mlx5_rx_reporter_ops,
+       reporter = devlink_port_health_reporter_create(priv->netdev->devlink_port,
+                                                      &mlx5_rx_reporter_ops,
                                                       MLX5E_REPORTER_RX_GRACEFUL_PERIOD, priv);
        if (IS_ERR(reporter)) {
                netdev_warn(priv->netdev, "Failed to create rx reporter, err = %ld\n",

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
index 41e356d..34666e2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -594,10 +594,10 @@ static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = {
 
 void mlx5e_reporter_tx_create(struct mlx5e_priv *priv)
 {
-       struct devlink_port *dl_port = mlx5e_devlink_get_dl_port(priv);
        struct devlink_health_reporter *reporter;
 
-       reporter = devlink_port_health_reporter_create(dl_port, &mlx5_tx_reporter_ops,
+       reporter = devlink_port_health_reporter_create(priv->netdev->devlink_port,
+                                                      &mlx5_tx_reporter_ops,
                                                       MLX5_REPORTER_TX_GRACEFUL_PERIOD, priv);
        if (IS_ERR(reporter)) {
                netdev_warn(priv->netdev,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 9b5b266..92c9e01 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -5926,6 +5926,7 @@ static int mlx5e_probe(struct auxiliary_device *adev,
                mlx5_core_err(mdev, "mlx5e_devlink_port_register failed, %d\n", err);
                goto err_destroy_netdev;
        }
+       SET_NETDEV_DEVLINK_PORT(netdev, mlx5e_devlink_get_dl_port(priv));
 
        err = profile->init(mdev, netdev);
        if (err) {
@@ -5939,7 +5940,6 @@ static int mlx5e_probe(struct auxiliary_device *adev,
                goto err_profile_cleanup;
        }
 
-       SET_NETDEV_DEVLINK_PORT(netdev, mlx5e_devlink_get_dl_port(priv));
        err = register_netdev(netdev);
        if (err) {
                mlx5_core_err(mdev, "register_netdev failed, %d\n", err);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index a9473a5..b2c7ec4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -2570,10 +2570,8 @@ int mlx5e_rq_set_handlers(struct mlx5e_rq *rq, struct mlx5e_params *params, bool
 
 static void mlx5e_trap_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
 {
-       struct mlx5e_priv *priv = netdev_priv(rq->netdev);
        struct mlx5_wq_cyc *wq = &rq->wqe.wq;
        struct mlx5e_wqe_frag_info *wi;
-       struct devlink_port *dl_port;
        struct sk_buff *skb;
        u32 cqe_bcnt;
        u16 trap_id;
@@ -2596,8 +2594,8 @@ static void mlx5e_trap_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe
        mlx5e_complete_rx_cqe(rq, cqe, cqe_bcnt, skb);
        skb_push(skb, ETH_HLEN);
 
-       dl_port = mlx5e_devlink_get_dl_port(priv);
-       mlx5_devlink_trap_report(rq->mdev, trap_id, skb, dl_port);
+       mlx5_devlink_trap_report(rq->mdev, trap_id, skb,
+                                rq->netdev->devlink_port);
        dev_kfree_skb_any(skb);
 
 free_wqe: