Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a3f7d13 authored by David S. Miller's avatar David S. Miller
Browse files

Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Some overlapping changes in the mlx5 driver.

A merge conflict resolution posted by Stephen Rothwell was used as a
guide.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 784c372a ea23b427

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+0 −2
Original line number Diff line number Diff line
@@ -3094,8 +3094,6 @@ mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats) 
		PPORT_802_3_GET(pstats, a_frame_check_sequence_errors);

	stats->rx_frame_errors = PPORT_802_3_GET(pstats, a_alignment_errors);

	stats->tx_aborted_errors = PPORT_2863_GET(pstats, if_out_discards);

	stats->tx_carrier_errors =

		PPORT_802_3_GET(pstats, a_symbol_error_during_carrier);

	stats->rx_errors = stats->rx_length_errors + stats->rx_crc_errors +

			   stats->rx_frame_errors;

	stats->tx_errors = stats->tx_aborted_errors + stats->tx_carrier_errors;

drivers/net/ethernet/mellanox/mlx5/core/health.c

+14 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ enum { 


enum {

	MLX5_DROP_NEW_HEALTH_WORK,

	MLX5_DROP_NEW_RECOVERY_WORK,

};



static u8 get_nic_state(struct mlx5_core_dev *dev)
@@ -194,7 +195,7 @@ static void health_care(struct work_struct *work) 
	mlx5_handle_bad_state(dev);



	spin_lock_irqsave(&health->wq_lock, flags);

	if (!test_bit(MLX5_DROP_NEW_HEALTH_WORK, &health->flags))

	if (!test_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags))

		schedule_delayed_work(&health->recover_work, recover_delay);

	else

		dev_err(&dev->pdev->dev,
@@ -322,6 +323,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev) 
	init_timer(&health->timer);

	health->sick = 0;

	clear_bit(MLX5_DROP_NEW_HEALTH_WORK, &health->flags);

	clear_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags);

	health->health = &dev->iseg->health;

	health->health_counter = &dev->iseg->health_counter;
@@ -345,11 +347,22 @@ void mlx5_drain_health_wq(struct mlx5_core_dev *dev) 


	spin_lock_irqsave(&health->wq_lock, flags);

	set_bit(MLX5_DROP_NEW_HEALTH_WORK, &health->flags);

	set_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags);

	spin_unlock_irqrestore(&health->wq_lock, flags);

	cancel_delayed_work_sync(&health->recover_work);

	cancel_work_sync(&health->work);

}



void mlx5_drain_health_recovery(struct mlx5_core_dev *dev)

{

	struct mlx5_core_health *health = &dev->priv.health;



	spin_lock(&health->wq_lock);

	set_bit(MLX5_DROP_NEW_RECOVERY_WORK, &health->flags);

	spin_unlock(&health->wq_lock);

	cancel_delayed_work_sync(&dev->priv.health.recover_work);

}



void mlx5_health_cleanup(struct mlx5_core_dev *dev)

{

	struct mlx5_core_health *health = &dev->priv.health;

drivers/net/ethernet/mellanox/mlx5/core/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
	if (err) {

		dev_err(&dev->pdev->dev, "Firmware over %d MS in pre-initializing state, aborting\n",

			FW_PRE_INIT_TIMEOUT_MILI);

		goto out;

		goto out_err;

	}



	err = mlx5_cmd_init(dev);
@@ -1258,7 +1258,7 @@ static int mlx5_unload_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, 
	int err = 0;



	if (cleanup)

		mlx5_drain_health_wq(dev);

		mlx5_drain_health_recovery(dev);



	mutex_lock(&dev->intf_state_mutex);

	if (test_bit(MLX5_INTERFACE_STATE_DOWN, &dev->intf_state)) {

include/linux/mlx5/driver.h

+1 −0
Original line number Diff line number Diff line
@@ -946,6 +946,7 @@ void mlx5_start_health_poll(struct mlx5_core_dev *dev); 
void mlx5_stop_health_poll(struct mlx5_core_dev *dev);

void mlx5_drain_health_wq(struct mlx5_core_dev *dev);

void mlx5_trigger_health_work(struct mlx5_core_dev *dev);

void mlx5_drain_health_recovery(struct mlx5_core_dev *dev);

int mlx5_buf_alloc_node(struct mlx5_core_dev *dev, int size,

			struct mlx5_buf *buf, int node);

int mlx5_buf_alloc(struct mlx5_core_dev *dev, int size, struct mlx5_buf *buf);