Merge tag 'mlx5-fixes-2019-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-08-22

This series introduces some fixes to mlx5 driver.

1) Form Moshe, two fixes for firmware health reporter
2) From Eran, two ktls fixes.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 29 insertions, 31 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
index 8b93101e1a09..7833ddef0427 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
@@ -109,13 +109,15 @@ build_progress_params(struct mlx5e_tx_wqe *wqe, u16 pc, u32 sqn,
 
 static void tx_fill_wi(struct mlx5e_txqsq *sq,
                        u16 pi, u8 num_wqebbs,
-                       skb_frag_t *resync_dump_frag)
+                       skb_frag_t *resync_dump_frag,
+                       u32 num_bytes)
 {
         struct mlx5e_tx_wqe_info *wi = &sq->db.wqe_info[pi];
 
         wi->skb              = NULL;
         wi->num_wqebbs       = num_wqebbs;
         wi->resync_dump_frag = resync_dump_frag;
+        wi->num_bytes        = num_bytes;
 }
 
 void mlx5e_ktls_tx_offload_set_pending(struct mlx5e_ktls_offload_context_tx *priv_tx)
@@ -143,7 +145,7 @@ post_static_params(struct mlx5e_txqsq *sq,
 
         umr_wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_STATIC_UMR_WQE_SZ, &pi);
         build_static_params(umr_wqe, sq->pc, sq->sqn, priv_tx, fence);
-        tx_fill_wi(sq, pi, MLX5E_KTLS_STATIC_WQEBBS, NULL);
+        tx_fill_wi(sq, pi, MLX5E_KTLS_STATIC_WQEBBS, NULL, 0);
         sq->pc += MLX5E_KTLS_STATIC_WQEBBS;
 }
 
@@ -157,7 +159,7 @@ post_progress_params(struct mlx5e_txqsq *sq,
 
         wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_PROGRESS_WQE_SZ, &pi);
         build_progress_params(wqe, sq->pc, sq->sqn, priv_tx, fence);
-        tx_fill_wi(sq, pi, MLX5E_KTLS_PROGRESS_WQEBBS, NULL);
+        tx_fill_wi(sq, pi, MLX5E_KTLS_PROGRESS_WQEBBS, NULL, 0);
         sq->pc += MLX5E_KTLS_PROGRESS_WQEBBS;
 }
 
@@ -248,43 +250,37 @@ tx_post_resync_params(struct mlx5e_txqsq *sq,
         mlx5e_ktls_tx_post_param_wqes(sq, priv_tx, skip_static_post, true);
 }
 
+struct mlx5e_dump_wqe {
+        struct mlx5_wqe_ctrl_seg ctrl;
+        struct mlx5_wqe_data_seg data;
+};
+
 static int
 tx_post_resync_dump(struct mlx5e_txqsq *sq, struct sk_buff *skb,
                     skb_frag_t *frag, u32 tisn, bool first)
 {
         struct mlx5_wqe_ctrl_seg *cseg;
-        struct mlx5_wqe_eth_seg  *eseg;
         struct mlx5_wqe_data_seg *dseg;
-        struct mlx5e_tx_wqe *wqe;
+        struct mlx5e_dump_wqe *wqe;
         dma_addr_t dma_addr = 0;
-        u16 ds_cnt, ds_cnt_inl;
         u8  num_wqebbs;
-        u16 pi, ihs;
+        u16 ds_cnt;
         int fsz;
-
-        ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
-        ihs    = eth_get_headlen(skb->dev, skb->data, skb_headlen(skb));
-        ds_cnt_inl = DIV_ROUND_UP(ihs - INL_HDR_START_SZ, MLX5_SEND_WQE_DS);
-        ds_cnt += ds_cnt_inl;
-        ds_cnt += 1; /* one frag */
+        u16 pi;
 
         wqe = mlx5e_sq_fetch_wqe(sq, sizeof(*wqe), &pi);
 
+        ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
         num_wqebbs = DIV_ROUND_UP(ds_cnt, MLX5_SEND_WQEBB_NUM_DS);
 
         cseg = &wqe->ctrl;
-        eseg = &wqe->eth;
-        dseg =  wqe->data;
+        dseg = &wqe->data;
 
         cseg->opmod_idx_opcode = cpu_to_be32((sq->pc << 8)  | MLX5_OPCODE_DUMP);
         cseg->qpn_ds           = cpu_to_be32((sq->sqn << 8) | ds_cnt);
         cseg->tisn             = cpu_to_be32(tisn << 8);
         cseg->fm_ce_se         = first ? MLX5_FENCE_MODE_INITIATOR_SMALL : 0;
 
-        eseg->inline_hdr.sz = cpu_to_be16(ihs);
-        memcpy(eseg->inline_hdr.start, skb->data, ihs);
-        dseg += ds_cnt_inl;
-
         fsz = skb_frag_size(frag);
         dma_addr = skb_frag_dma_map(sq->pdev, frag, 0, fsz,
                                     DMA_TO_DEVICE);
@@ -296,7 +292,7 @@ tx_post_resync_dump(struct mlx5e_txqsq *sq, struct sk_buff *skb,
         dseg->byte_count = cpu_to_be32(fsz);
         mlx5e_dma_push(sq, dma_addr, fsz, MLX5E_DMA_MAP_PAGE);
 
-        tx_fill_wi(sq, pi, num_wqebbs, frag);
+        tx_fill_wi(sq, pi, num_wqebbs, frag, fsz);
         sq->pc += num_wqebbs;
 
         WARN(num_wqebbs > MLX5E_KTLS_MAX_DUMP_WQEBBS,
@@ -323,7 +319,7 @@ static void tx_post_fence_nop(struct mlx5e_txqsq *sq)
         struct mlx5_wq_cyc *wq = &sq->wq;
         u16 pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);
 
-        tx_fill_wi(sq, pi, 1, NULL);
+        tx_fill_wi(sq, pi, 1, NULL, 0);
 
         mlx5e_post_nop_fence(wq, sq->sqn, &sq->pc);
 }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/health.c b/drivers/net/ethernet/mellanox/mlx5/core/health.c
index 9314777d99e3..d685122d9ff7 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c
@@ -590,7 +590,8 @@ mlx5_fw_fatal_reporter_dump(struct devlink_health_reporter *reporter,
                         data_size = crdump_size - offset;
                 else
                         data_size = MLX5_CR_DUMP_CHUNK_SIZE;
-                err = devlink_fmsg_binary_put(fmsg, cr_data, data_size);
+                err = devlink_fmsg_binary_put(fmsg, (char *)cr_data + offset,
+                                              data_size);
                 if (err)
                         goto free_data;
         }
@@ -700,6 +701,16 @@ static void poll_health(struct timer_list *t)
         if (dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR)
                 goto out;
 
+        fatal_error = check_fatal_sensors(dev);
+
+        if (fatal_error && !health->fatal_error) {
+                mlx5_core_err(dev, "Fatal error %u detected\n", fatal_error);
+                dev->priv.health.fatal_error = fatal_error;
+                print_health_info(dev);
+                mlx5_trigger_health_work(dev);
+                goto out;
+        }
+
         count = ioread32be(health->health_counter);
         if (count == health->prev)
                 ++health->miss_counter;
@@ -718,15 +729,6 @@ static void poll_health(struct timer_list *t)
         if (health->synd && health->synd != prev_synd)
                 queue_work(health->wq, &health->report_work);
 
-        fatal_error = check_fatal_sensors(dev);
-
-        if (fatal_error && !health->fatal_error) {
-                mlx5_core_err(dev, "Fatal error %u detected\n", fatal_error);
-                dev->priv.health.fatal_error = fatal_error;
-                print_health_info(dev);
-                mlx5_trigger_health_work(dev);
-        }
-
 out:
         mod_timer(&health->timer, get_next_poll_jiffies());
 }