net/mlx5e: Move devlink-health rx and tx reporters to devlink port

Utilize new devlink-health port reporters API to move rx and tx
reporters from device to port.

Signed-off-by: Vladyslav Tarasiuk <vladyslavt@mellanox.com>
Reviewed-by: Moshe Shemesh <moshe@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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 32ed1067e6dc24ff1496385c128de5be2ac9cd87..9913647a1fafa8d3f60ffc6a0ddb178e340cfd70 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c
@@ -611,13 +611,10 @@ static const struct devlink_health_reporter_ops mlx5_rx_reporter_ops = {
 
 void mlx5e_reporter_rx_create(struct mlx5e_priv *priv)
 {
-       struct devlink *devlink = priv_to_devlink(priv->mdev);
        struct devlink_health_reporter *reporter;
 
-       reporter = devlink_health_reporter_create(devlink,
-                                                 &mlx5_rx_reporter_ops,
-                                                 MLX5E_REPORTER_RX_GRACEFUL_PERIOD,
-                                                 priv);
+       reporter = devlink_port_health_reporter_create(&priv->dl_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",
                            PTR_ERR(reporter));
@@ -631,5 +628,5 @@ void mlx5e_reporter_rx_destroy(struct mlx5e_priv *priv)
        if (!priv->rx_reporter)
                return;
 
-       devlink_health_reporter_destroy(priv->rx_reporter);
+       devlink_port_health_reporter_destroy(priv->rx_reporter);
 }

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 826584380216316f9bfd656d4af7bf944349169d..8be6eaa3eeb14c6ccd0452ea788f76b9c861de22 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c
@@ -440,14 +440,9 @@ static const struct devlink_health_reporter_ops mlx5_tx_reporter_ops = {
 void mlx5e_reporter_tx_create(struct mlx5e_priv *priv)
 {
        struct devlink_health_reporter *reporter;
-       struct mlx5_core_dev *mdev = priv->mdev;
-       struct devlink *devlink;
-
-       devlink = priv_to_devlink(mdev);
-       reporter =
-               devlink_health_reporter_create(devlink, &mlx5_tx_reporter_ops,
-                                              MLX5_REPORTER_TX_GRACEFUL_PERIOD,
-                                              priv);
+
+       reporter = devlink_port_health_reporter_create(&priv->dl_port, &mlx5_tx_reporter_ops,
+                                                      MLX5_REPORTER_TX_GRACEFUL_PERIOD, priv);
        if (IS_ERR(reporter)) {
                netdev_warn(priv->netdev,
                            "Failed to create tx reporter, err = %ld\n",
@@ -462,5 +457,5 @@ void mlx5e_reporter_tx_destroy(struct mlx5e_priv *priv)
        if (!priv->tx_reporter)
                return;
 
-       devlink_health_reporter_destroy(priv->tx_reporter);
+       devlink_port_health_reporter_destroy(priv->tx_reporter);
 }