7 files changed, 26 insertions, 19 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 028937b2a199..2a210c4efb89 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -2202,6 +2202,10 @@ static int mlx4_en_set_features(struct net_device *netdev,
                         return ret;
         }
 
+        if (DEV_FEATURE_CHANGED(netdev, features, NETIF_F_HW_VLAN_CTAG_TX))
+                en_info(priv, "Turn %s TX vlan strip offload\n",
+                        (features & NETIF_F_HW_VLAN_CTAG_TX) ? "ON" : "OFF");
+
         if (features & NETIF_F_LOOPBACK)
                 priv->ctrl_flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK);
         else
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 2ba5d368edce..698d60de1255 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -162,6 +162,10 @@ static int mlx4_en_init_allocator(struct mlx4_en_priv *priv,
                 if (mlx4_alloc_pages(priv, &ring->page_alloc[i],
                                      frag_info, GFP_KERNEL | __GFP_COLD))
                         goto out;
+
+                en_dbg(DRV, priv, "  frag %d allocator: - size:%d frags:%d\n",
+                       i, ring->page_alloc[i].page_size,
+                       atomic_read(&ring->page_alloc[i].page->_count));
         }
         return 0;
 
@@ -1059,8 +1063,9 @@ void mlx4_en_calc_rx_buf(struct net_device *dev)
                         (eff_mtu > buf_size + frag_sizes[i]) ?
                                 frag_sizes[i] : eff_mtu - buf_size;
                 priv->frag_info[i].frag_prefix_size = buf_size;
-                priv->frag_info[i].frag_stride = ALIGN(frag_sizes[i],
-                                                       SMP_CACHE_BYTES);
+                priv->frag_info[i].frag_stride =
+                                ALIGN(priv->frag_info[i].frag_size,
+                                      SMP_CACHE_BYTES);
                 buf_size += priv->frag_info[i].frag_size;
                 i++;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c
index 4b08a393ebcb..5a21e5dc94cb 100644
--- a/drivers/net/ethernet/mellanox/mlx4/fw.c
+++ b/drivers/net/ethernet/mellanox/mlx4/fw.c
@@ -2169,7 +2169,7 @@ static const u8 config_dev_csum_flags[] = {
 int mlx4_config_dev_retrieval(struct mlx4_dev *dev,
                               struct mlx4_config_dev_params *params)
 {
-        struct mlx4_config_dev config_dev;
+        struct mlx4_config_dev config_dev = {0};
         int err;
         u8 csum_mask;
 
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index f3245fe0f442..7e487223489a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -251,7 +251,8 @@ static void mlx4_enable_cqe_eqe_stride(struct mlx4_dev *dev)
                 if (mlx4_is_master(dev))
                         dev_cap->function_caps |= MLX4_FUNC_CAP_EQE_CQE_STRIDE;
         } else {
-                mlx4_dbg(dev, "Disabling CQE stride cacheLine unsupported\n");
+                if (cache_line_size() != 32  && cache_line_size() != 64)
+                        mlx4_dbg(dev, "Disabling CQE stride, cacheLine size unsupported\n");
                 dev_cap->flags2 &= ~MLX4_DEV_CAP_FLAG2_CQE_STRIDE;
                 dev_cap->flags2 &= ~MLX4_DEV_CAP_FLAG2_EQE_STRIDE;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx4/mr.c b/drivers/net/ethernet/mellanox/mlx4/mr.c
index d21e884a0838..78f51e103880 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mr.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mr.c
@@ -598,14 +598,11 @@ int mlx4_mr_rereg_mem_write(struct mlx4_dev *dev, struct mlx4_mr *mr,
         if (err)
                 return err;
 
-        mpt_entry->start       = cpu_to_be64(mr->iova);
-        mpt_entry->length      = cpu_to_be64(mr->size);
-        mpt_entry->entity_size = cpu_to_be32(mr->mtt.page_shift);
-
-        mpt_entry->pd_flags &= cpu_to_be32(MLX4_MPT_PD_MASK |
-                                           MLX4_MPT_PD_FLAG_EN_INV);
-        mpt_entry->flags    &= cpu_to_be32(MLX4_MPT_FLAG_FREE |
-                                           MLX4_MPT_FLAG_SW_OWNS);
+        mpt_entry->start       = cpu_to_be64(iova);
+        mpt_entry->length      = cpu_to_be64(size);
+        mpt_entry->entity_size = cpu_to_be32(page_shift);
+        mpt_entry->flags    &= ~(cpu_to_be32(MLX4_MPT_FLAG_FREE |
+                                           MLX4_MPT_FLAG_SW_OWNS));
         if (mr->mtt.order < 0) {
                 mpt_entry->flags |= cpu_to_be32(MLX4_MPT_FLAG_PHYSICAL);
                 mpt_entry->mtt_addr = 0;
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index c5f3dfca226b..486e3d26cd4a 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -2541,7 +2541,7 @@ int mlx4_SW2HW_MPT_wrapper(struct mlx4_dev *dev, int slave,
         /* Make sure that the PD bits related to the slave id are zeros. */
         pd = mr_get_pd(inbox->buf);
         pd_slave = (pd >> 17) & 0x7f;
-        if (pd_slave != 0 && pd_slave != slave) {
+        if (pd_slave != 0 && --pd_slave != slave) {
                 err = -EPERM;
                 goto ex_abort;
         }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
index 3f4525619a07..d6651937d899 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -903,12 +903,12 @@ static void remove_one(struct pci_dev *pdev)
 }
 
 static const struct pci_device_id mlx5_core_pci_table[] = {
-        { PCI_VDEVICE(MELLANOX, 4113) }, /* Connect-IB */
-        { PCI_VDEVICE(MELLANOX, 4114) }, /* Connect-IB VF */
-        { PCI_VDEVICE(MELLANOX, 4115) }, /* ConnectX-4 */
-        { PCI_VDEVICE(MELLANOX, 4116) }, /* ConnectX-4 VF */
-        { PCI_VDEVICE(MELLANOX, 4117) }, /* ConnectX-4LX */
-        { PCI_VDEVICE(MELLANOX, 4118) }, /* ConnectX-4LX VF */
+        { PCI_VDEVICE(MELLANOX, 0x1011) }, /* Connect-IB */
+        { PCI_VDEVICE(MELLANOX, 0x1012) }, /* Connect-IB VF */
+        { PCI_VDEVICE(MELLANOX, 0x1013) }, /* ConnectX-4 */
+        { PCI_VDEVICE(MELLANOX, 0x1014) }, /* ConnectX-4 VF */
+        { PCI_VDEVICE(MELLANOX, 0x1015) }, /* ConnectX-4LX */
+        { PCI_VDEVICE(MELLANOX, 0x1016) }, /* ConnectX-4LX VF */
         { 0, }
 };