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

Commit 12dbc04d authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge remote-tracking branch 'mlx5-next/mlx5-next' into HEAD 



Take mlx5-next so we can take a dependent two patch series next.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 7608bf40 82b11f07

drivers/infiniband/hw/mlx5/ib_rep.c

+10 −9
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	if (!__mlx5_ib_add(ibdev, profile))

		return -EINVAL;



	rep->rep_if[REP_IB].priv = ibdev;

	rep->rep_data[REP_IB].priv = ibdev;



	return 0;

}
@@ -70,13 +70,13 @@ mlx5_ib_vport_rep_unload(struct mlx5_eswitch_rep *rep) 
{

	struct mlx5_ib_dev *dev;



	if (!rep->rep_if[REP_IB].priv ||

	if (!rep->rep_data[REP_IB].priv ||

	    rep->vport != MLX5_VPORT_UPLINK)

		return;



	dev = mlx5_ib_rep_to_dev(rep);

	__mlx5_ib_remove(dev, dev->profile, MLX5_IB_STAGE_MAX);

	rep->rep_if[REP_IB].priv = NULL;

	rep->rep_data[REP_IB].priv = NULL;

}



static void *mlx5_ib_vport_get_proto_dev(struct mlx5_eswitch_rep *rep)
@@ -84,16 +84,17 @@ static void *mlx5_ib_vport_get_proto_dev(struct mlx5_eswitch_rep *rep) 
	return mlx5_ib_rep_to_dev(rep);

}



static const struct mlx5_eswitch_rep_ops rep_ops = {

	.load = mlx5_ib_vport_rep_load,

	.unload = mlx5_ib_vport_rep_unload,

	.get_proto_dev = mlx5_ib_vport_get_proto_dev,

};



void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev)

{

	struct mlx5_eswitch *esw = mdev->priv.eswitch;

	struct mlx5_eswitch_rep_if rep_if = {};



	rep_if.load = mlx5_ib_vport_rep_load;

	rep_if.unload = mlx5_ib_vport_rep_unload;

	rep_if.get_proto_dev = mlx5_ib_vport_get_proto_dev;



	mlx5_eswitch_register_vport_reps(esw, &rep_if, REP_IB);

	mlx5_eswitch_register_vport_reps(esw, &rep_ops, REP_IB);

}



void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev)

drivers/infiniband/hw/mlx5/ib_rep.h

+1 −1
Original line number Diff line number Diff line
@@ -72,6 +72,6 @@ struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw, 
static inline

struct mlx5_ib_dev *mlx5_ib_rep_to_dev(struct mlx5_eswitch_rep *rep)

{

	return (struct mlx5_ib_dev *)rep->rep_if[REP_IB].priv;

	return rep->rep_data[REP_IB].priv;

}

#endif /* __MLX5_IB_REP_H__ */

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −0
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ struct mlx5_ib_lb_state { 
};



struct mlx5_ib_pf_eq {

	struct notifier_block irq_nb;

	struct mlx5_ib_dev *dev;

	struct mlx5_eq *core;

	struct work_struct work;

drivers/infiniband/hw/mlx5/odp.c

+15 −6
Original line number Diff line number Diff line
@@ -1485,9 +1485,11 @@ static void mlx5_ib_eq_pf_process(struct mlx5_ib_pf_eq *eq) 
	mlx5_eq_update_ci(eq->core, cc, 1);

}



static irqreturn_t mlx5_ib_eq_pf_int(int irq, void *eq_ptr)

static int mlx5_ib_eq_pf_int(struct notifier_block *nb, unsigned long type,

			     void *data)

{

	struct mlx5_ib_pf_eq *eq = eq_ptr;

	struct mlx5_ib_pf_eq *eq =

		container_of(nb, struct mlx5_ib_pf_eq, irq_nb);

	unsigned long flags;



	if (spin_trylock_irqsave(&eq->lock, flags)) {
@@ -1550,20 +1552,26 @@ mlx5_ib_create_pf_eq(struct mlx5_ib_dev *dev, struct mlx5_ib_pf_eq *eq) 
		goto err_mempool;

	}



	eq->irq_nb.notifier_call = mlx5_ib_eq_pf_int;

	param = (struct mlx5_eq_param) {

		.index = MLX5_EQ_PFAULT_IDX,

		.irq_index = 0,

		.mask = 1 << MLX5_EVENT_TYPE_PAGE_FAULT,

		.nent = MLX5_IB_NUM_PF_EQE,

		.context = eq,

		.handler = mlx5_ib_eq_pf_int

	};

	eq->core = mlx5_eq_create_generic(dev->mdev, "mlx5_ib_page_fault_eq", &param);

	eq->core = mlx5_eq_create_generic(dev->mdev, &param);

	if (IS_ERR(eq->core)) {

		err = PTR_ERR(eq->core);

		goto err_wq;

	}

	err = mlx5_eq_enable(dev->mdev, eq->core, &eq->irq_nb);

	if (err) {

		mlx5_ib_err(dev, "failed to enable odp EQ %d\n", err);

		goto err_eq;

	}



	return 0;

err_eq:

	mlx5_eq_destroy_generic(dev->mdev, eq->core);

err_wq:

	destroy_workqueue(eq->wq);

err_mempool:
@@ -1576,6 +1584,7 @@ mlx5_ib_destroy_pf_eq(struct mlx5_ib_dev *dev, struct mlx5_ib_pf_eq *eq) 
{

	int err;



	mlx5_eq_disable(dev->mdev, eq->core, &eq->irq_nb);

	err = mlx5_eq_destroy_generic(dev->mdev, eq->core);

	cancel_work_sync(&eq->work);

	destroy_workqueue(eq->wq);

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-$(CONFIG_MLX5_CORE) += mlx5_core.o 
#

mlx5_core-y :=	main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \

		health.o mcg.o cq.o alloc.o qp.o port.o mr.o pd.o \

		transobj.o vport.o sriov.o fs_cmd.o fs_core.o \

		transobj.o vport.o sriov.o fs_cmd.o fs_core.o pci_irq.o \

		fs_counters.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o diag/fs_tracepoint.o diag/fw_tracer.o