On Fri, Jul 1, 2016 at 1:14 PM, David Miller <[email protected]> wrote:
> From: Saeed Mahameed <[email protected]>
> Date: Thu, 30 Jun 2016 17:34:37 +0300
>
>> This series provides two set of fixes to the mlx5 driver:
>> - Resiliency fixes for reset flow and internal pci errors
>> - xmit path fixes
>
> Series applied to 'net' but expecting all of this to be backported
> to -stable is unreasonable.
>
Thanks Dave,
One small comment on this series is that it will hit two trivial
conflicts once net is merged into current net-next.
Conflict applying: "net/mlx5e: Timeout if SQ doesn't flush during close":
Fix:
---
@@@ -810,12 -802,19 +820,19 @@@ static void mlx5e_close_sq(struct mlx5e
if (mlx5e_sq_has_room_for(sq, 1))
mlx5e_send_nop(sq, true);
- mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY, MLX5_SQC_STATE_ERR,
- false, 0);
- err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY,
- MLX5_SQC_STATE_ERR);
++ err = mlx5e_modify_sq(sq, MLX5_SQC_STATE_RDY,
MLX5_SQC_STATE_ERR,
++ false, 0);
+ if (err)
+ set_bit(MLX5E_SQ_STATE_TX_TIMEOUT, &sq->state);
---
Conflict applying: "net/mlx5e: Handle RQ flush in error cases"
Fix:
---
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
index 6db979e,b429591..0000000
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@@ -214,7 -191,7 +214,8 @@@ struct mlx5e_tstamp
enum {
MLX5E_RQ_STATE_POST_WQES_ENABLE,
MLX5E_RQ_STATE_UMR_WQE_IN_PROGRESS,
+ MLX5E_RQ_STATE_AM,
+ MLX5E_RQ_STATE_FLUSH_TIMEOUT,
};
---
Thanks,
Saeed
