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

Commit 177211b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-next' 



Eli Cohen says:

====================
mlx5 driver updates

The following series contains some fixes to mlx5 as well as update to the list
of supported devices.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4945c1d6 d14e7110

drivers/infiniband/hw/mlx5/mr.c

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ static int add_keys(struct mlx5_ib_dev *dev, int c, int num) 
					    sizeof(*in), reg_mr_callback,

					    mr, &mr->out);

		if (err) {

			spin_lock_irq(&ent->lock);

			ent->pending--;

			spin_unlock_irq(&ent->lock);

			mlx5_ib_warn(dev, "create mkey failed %d\n", err);

			kfree(mr);

			break;

drivers/infiniband/hw/mlx5/qp.c

+15 −1
Original line number Diff line number Diff line
@@ -1011,9 +1011,14 @@ static void mlx5_ib_lock_cqs(struct mlx5_ib_cq *send_cq, struct mlx5_ib_cq *recv 
			}

		} else {

			spin_lock_irq(&send_cq->lock);

			__acquire(&recv_cq->lock);

		}

	} else if (recv_cq) {

		spin_lock_irq(&recv_cq->lock);

		__acquire(&send_cq->lock);

	} else {

		__acquire(&send_cq->lock);

		__acquire(&recv_cq->lock);

	}

}
@@ -1033,10 +1038,15 @@ static void mlx5_ib_unlock_cqs(struct mlx5_ib_cq *send_cq, struct mlx5_ib_cq *re 
				spin_unlock_irq(&recv_cq->lock);

			}

		} else {

			__release(&recv_cq->lock);

			spin_unlock_irq(&send_cq->lock);

		}

	} else if (recv_cq) {

		__release(&send_cq->lock);

		spin_unlock_irq(&recv_cq->lock);

	} else {

		__release(&recv_cq->lock);

		__release(&send_cq->lock);

	}

}
@@ -2411,7 +2421,7 @@ static u8 get_fence(u8 fence, struct ib_send_wr *wr) 


static int begin_wqe(struct mlx5_ib_qp *qp, void **seg,

		     struct mlx5_wqe_ctrl_seg **ctrl,

		     struct ib_send_wr *wr, int *idx,

		     struct ib_send_wr *wr, unsigned *idx,

		     int *size, int nreq)

{

	int err = 0;
@@ -2737,6 +2747,8 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 


		if (bf->need_lock)

			spin_lock(&bf->lock);

		else

			__acquire(&bf->lock);



		/* TBD enable WC */

		if (0 && nreq == 1 && bf->uuarn && inl && size > 1 && size <= bf->buf_size / 16) {
@@ -2753,6 +2765,8 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		bf->offset ^= bf->buf_size;

		if (bf->need_lock)

			spin_unlock(&bf->lock);

		else

			__release(&bf->lock);

	}



	spin_unlock_irqrestore(&qp->sq.lock, flags);

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

+1 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 
		goto err_map;

	}



	if (cmd->log_sz + cmd->log_stride > PAGE_SHIFT) {

	if (cmd->log_sz + cmd->log_stride > MLX5_ADAPTER_PAGE_SHIFT) {

		dev_err(&dev->pdev->dev, "command queue size overflow\n");

		err = -EINVAL;

		goto err_map;

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

+2 −2
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ static int mlx5_eq_int(struct mlx5_core_dev *dev, struct mlx5_eq *eq) 
		case MLX5_EVENT_TYPE_WQ_INVAL_REQ_ERROR:

		case MLX5_EVENT_TYPE_WQ_ACCESS_ERROR:

			rsn = be32_to_cpu(eqe->data.qp_srq.qp_srq_n) & 0xffffff;

			mlx5_core_dbg(dev, "event %s(%d) arrived\n",

				      eqe_type_str(eqe->type), eqe->type);

			mlx5_core_dbg(dev, "event %s(%d) arrived on resource 0x%x\n",

				      eqe_type_str(eqe->type), eqe->type, rsn);

			mlx5_rsc_event(dev, rsn, eqe->type);

			break;

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

+13 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <linux/mlx5/qp.h>

#include <linux/mlx5/srq.h>

#include <linux/debugfs.h>

#include <linux/kmod.h>

#include <linux/mlx5/mlx5_ifc.h>

#include "mlx5_core.h"
@@ -225,7 +226,7 @@ static int mlx5_enable_msix(struct mlx5_core_dev *dev) 
		table->msix_arr[i].entry = i;



	nvec = pci_enable_msix_range(dev->pdev, table->msix_arr,

				     MLX5_EQ_VEC_COMP_BASE, nvec);

				     MLX5_EQ_VEC_COMP_BASE + 1, nvec);

	if (nvec < 0)

		return nvec;
@@ -840,6 +841,8 @@ struct mlx5_core_event_handler { 
		      void *data);

};



#define MLX5_IB_MOD "mlx5_ib"



static int init_one(struct pci_dev *pdev,

		    const struct pci_device_id *id)

{
@@ -878,6 +881,10 @@ static int init_one(struct pci_dev *pdev, 
		goto out_init;

	}



	err = request_module_nowait(MLX5_IB_MOD);

	if (err)

		pr_info("failed request module on %s\n", MLX5_IB_MOD);



	return 0;



out_init:
@@ -896,8 +903,12 @@ static void remove_one(struct pci_dev *pdev) 
}



static const struct pci_device_id mlx5_core_pci_table[] = {

	{ PCI_VDEVICE(MELLANOX, 4113) }, /* MT4113 Connect-IB */

	{ 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 */

	{ 0, }

};