Commit 259fae5a authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 



Merge mlx5-next shared branched into net-next,

From Bodong Wang:
1) Introduction of ECPF (Embedded CPU Physical Function), and low level
bits for mlx5 SmartNic capabilities support.
2) Vport enumeration refactoring that affect mlx5_ib and mlx5_core

From Aya Levin,
3) Add support for 50Gbps per lane link modes in the Port Type and Speed
register (PTYS)
4) Refactor low level query functions for PTYS register
5) Add support for 50Gbps per lane link modes to mlx5_ib

Note: due to a change in API in mlx5/core and a later patch from net-next,
a fixup was squashed with this merge commit that replaces FDB_UPLINK_VPORT
with MLX5_VPORT_UPLINK which exists only in upstream net-next.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parents 50f444aa 08e8676f

drivers/infiniband/hw/mlx5/cmd.c

+37 −0
Original line number Original line Diff line number Diff line
@@ -345,3 +345,40 @@ int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id, 
				       counter_set_id);

				       counter_set_id);

	return err;

	return err;

}

}



int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port)

{

	int outlen = MLX5_ST_SZ_BYTES(mad_ifc_out);

	int inlen = MLX5_ST_SZ_BYTES(mad_ifc_in);

	int err = -ENOMEM;

	void *data;

	void *resp;

	u32 *out;

	u32 *in;



	in = kzalloc(inlen, GFP_KERNEL);

	out = kzalloc(outlen, GFP_KERNEL);

	if (!in || !out)

		goto out;



	MLX5_SET(mad_ifc_in, in, opcode, MLX5_CMD_OP_MAD_IFC);

	MLX5_SET(mad_ifc_in, in, op_mod, opmod);

	MLX5_SET(mad_ifc_in, in, port, port);



	data = MLX5_ADDR_OF(mad_ifc_in, in, mad);

	memcpy(data, inb, MLX5_FLD_SZ_BYTES(mad_ifc_in, mad));



	err = mlx5_cmd_exec(dev, in, inlen, out, outlen);

	if (err)

		goto out;



	resp = MLX5_ADDR_OF(mad_ifc_out, out, response_mad_packet);

	memcpy(outb, resp,

	       MLX5_FLD_SZ_BYTES(mad_ifc_out, response_mad_packet));



out:

	kfree(out);

	kfree(in);

	return err;

}

drivers/infiniband/hw/mlx5/cmd.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -63,4 +63,6 @@ int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid); 
int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid);

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

int mlx5_cmd_alloc_q_counter(struct mlx5_core_dev *dev, u16 *counter_id,

			     u16 uid);

			     u16 uid);

int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,

		     u16 opmod, u8 port);

#endif /* MLX5_IB_CMD_H */
 
#endif /* MLX5_IB_CMD_H */

drivers/infiniband/hw/mlx5/ib_rep.c

+18 −55
Original line number Original line Diff line number Diff line
@@ -3,10 +3,11 @@ 
 * Copyright (c) 2018 Mellanox Technologies. All rights reserved.

 * Copyright (c) 2018 Mellanox Technologies. All rights reserved.

 */

 */





#include <linux/mlx5/vport.h>

#include "ib_rep.h"

#include "ib_rep.h"

#include "srq.h"

#include "srq.h"





static const struct mlx5_ib_profile rep_profile = {

static const struct mlx5_ib_profile vf_rep_profile = {

	STAGE_CREATE(MLX5_IB_STAGE_INIT,

	STAGE_CREATE(MLX5_IB_STAGE_INIT,

		     mlx5_ib_stage_init_init,

		     mlx5_ib_stage_init_init,

		     mlx5_ib_stage_init_cleanup),

		     mlx5_ib_stage_init_cleanup),
@@ -45,31 +46,17 @@ static const struct mlx5_ib_profile rep_profile = { 
		     NULL),

		     NULL),

};

};





static int

mlx5_ib_nic_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

	struct mlx5_ib_dev *ibdev;



	ibdev = mlx5_ib_rep_to_dev(rep);

	if (!__mlx5_ib_add(ibdev, ibdev->profile))

		return -EINVAL;

	return 0;

}



static void

mlx5_ib_nic_rep_unload(struct mlx5_eswitch_rep *rep)

{

	struct mlx5_ib_dev *ibdev;



	ibdev = mlx5_ib_rep_to_dev(rep);

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

}



static int

static int

mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep)

{

{

	const struct mlx5_ib_profile *profile;

	struct mlx5_ib_dev *ibdev;

	struct mlx5_ib_dev *ibdev;





	if (rep->vport == MLX5_VPORT_UPLINK)

		profile = &uplink_rep_profile;

	else

		profile = &vf_rep_profile;



	ibdev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*ibdev));

	ibdev = (struct mlx5_ib_dev *)ib_alloc_device(sizeof(*ibdev));

	if (!ibdev)

	if (!ibdev)

		return -ENOMEM;

		return -ENOMEM;
@@ -78,7 +65,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	ibdev->mdev = dev;

	ibdev->mdev = dev;

	ibdev->num_ports = max(MLX5_CAP_GEN(dev, num_ports),

	ibdev->num_ports = max(MLX5_CAP_GEN(dev, num_ports),

			       MLX5_CAP_GEN(dev, num_vhca_ports));

			       MLX5_CAP_GEN(dev, num_vhca_ports));

	if (!__mlx5_ib_add(ibdev, &rep_profile))

	if (!__mlx5_ib_add(ibdev, profile))

		return -EINVAL;

		return -EINVAL;





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

	rep->rep_if[REP_IB].priv = ibdev;
@@ -105,15 +92,14 @@ static void *mlx5_ib_vport_get_proto_dev(struct mlx5_eswitch_rep *rep) 
	return mlx5_ib_rep_to_dev(rep);

	return mlx5_ib_rep_to_dev(rep);

}

}





static void mlx5_ib_rep_register_vf_vports(struct mlx5_ib_dev *dev)

void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev)

{

{

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

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

	int total_vfs = MLX5_TOTAL_VPORTS(dev->mdev);

	int total_vports = MLX5_TOTAL_VPORTS(mdev);

	int vport;



	for (vport = 1; vport < total_vfs; vport++) {

	struct mlx5_eswitch_rep_if rep_if = {};

	struct mlx5_eswitch_rep_if rep_if = {};

	int vport;





	for (vport = 0; vport < total_vports; vport++) {

		rep_if.load = mlx5_ib_vport_rep_load;

		rep_if.load = mlx5_ib_vport_rep_load;

		rep_if.unload = mlx5_ib_vport_rep_unload;

		rep_if.unload = mlx5_ib_vport_rep_unload;

		rep_if.get_proto_dev = mlx5_ib_vport_get_proto_dev;

		rep_if.get_proto_dev = mlx5_ib_vport_get_proto_dev;
@@ -121,39 +107,16 @@ static void mlx5_ib_rep_register_vf_vports(struct mlx5_ib_dev *dev) 
	}

	}

}

}





static void mlx5_ib_rep_unregister_vf_vports(struct mlx5_ib_dev *dev)

void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev)

{

{

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

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

	int total_vfs = MLX5_TOTAL_VPORTS(dev->mdev);

	int total_vports = MLX5_TOTAL_VPORTS(mdev);

	int vport;

	int vport;





	for (vport = 1; vport < total_vfs; vport++)

	for (vport = total_vports - 1; vport >= 0; vport--)

		mlx5_eswitch_unregister_vport_rep(esw, vport, REP_IB);

		mlx5_eswitch_unregister_vport_rep(esw, vport, REP_IB);

}

}





void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev)

{

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

	struct mlx5_eswitch_rep_if rep_if = {};



	rep_if.load = mlx5_ib_nic_rep_load;

	rep_if.unload = mlx5_ib_nic_rep_unload;

	rep_if.get_proto_dev = mlx5_ib_vport_get_proto_dev;

	rep_if.priv = dev;



	mlx5_eswitch_register_vport_rep(esw, 0, &rep_if, REP_IB);



	mlx5_ib_rep_register_vf_vports(dev);

}



void mlx5_ib_unregister_vport_reps(struct mlx5_ib_dev *dev)

{

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



	mlx5_ib_rep_unregister_vf_vports(dev); /* VFs vports */

	mlx5_eswitch_unregister_vport_rep(esw, 0, REP_IB); /* UPLINK PF*/

}



u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

{

{

	return mlx5_eswitch_mode(esw);

	return mlx5_eswitch_mode(esw);

drivers/infiniband/hw/mlx5/ib_rep.h

+6 −4
Original line number Original line Diff line number Diff line
@@ -10,14 +10,16 @@ 
#include "mlx5_ib.h"

#include "mlx5_ib.h"





#ifdef CONFIG_MLX5_ESWITCH

#ifdef CONFIG_MLX5_ESWITCH

extern const struct mlx5_ib_profile uplink_rep_profile;



u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,

					  int vport_index);

					  int vport_index);

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_uplink_ibdev(struct mlx5_eswitch *esw);

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw,

					   int vport_index);

					   int vport_index);

void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev);

void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev);

void mlx5_ib_unregister_vport_reps(struct mlx5_ib_dev *dev);

void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev);

int create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

int create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

			      struct mlx5_ib_sq *sq);

			      struct mlx5_ib_sq *sq);

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,

struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw,
@@ -48,8 +50,8 @@ struct mlx5_eswitch_rep *mlx5_ib_vport_rep(struct mlx5_eswitch *esw, 
	return NULL;

	return NULL;

}

}





static inline void mlx5_ib_register_vport_reps(struct mlx5_ib_dev *dev) {}

static inline void mlx5_ib_register_vport_reps(struct mlx5_core_dev *mdev) {}

static inline void mlx5_ib_unregister_vport_reps(struct mlx5_ib_dev *dev) {}

static inline void mlx5_ib_unregister_vport_reps(struct mlx5_core_dev *mdev) {}

static inline int create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

static inline int create_flow_rule_vport_sq(struct mlx5_ib_dev *dev,

					    struct mlx5_ib_sq *sq)

					    struct mlx5_ib_sq *sq)

{

{

drivers/infiniband/hw/mlx5/mad.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <rdma/ib_smi.h>

#include <rdma/ib_smi.h>

#include <rdma/ib_pma.h>

#include <rdma/ib_pma.h>

#include "mlx5_ib.h"

#include "mlx5_ib.h"

#include "cmd.h"





enum {

enum {

	MLX5_IB_VENDOR_CLASS1 = 0x9,

	MLX5_IB_VENDOR_CLASS1 = 0x9,
@@ -51,9 +52,10 @@ static bool can_do_mad_ifc(struct mlx5_ib_dev *dev, u8 port_num, 
	return dev->mdev->port_caps[port_num - 1].has_smi;

	return dev->mdev->port_caps[port_num - 1].has_smi;

}

}





int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,

static int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey,

		 u8 port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,

			int ignore_bkey, u8 port, const struct ib_wc *in_wc,

		 const void *in_mad, void *response_mad)

			const struct ib_grh *in_grh, const void *in_mad,

			void *response_mad)

{

{

	u8 op_modifier = 0;

	u8 op_modifier = 0;
@@ -68,7 +70,8 @@ int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey, 
	if (ignore_bkey || !in_wc)

	if (ignore_bkey || !in_wc)

		op_modifier |= 0x2;

		op_modifier |= 0x2;





	return mlx5_core_mad_ifc(dev->mdev, in_mad, response_mad, op_modifier, port);

	return mlx5_cmd_mad_ifc(dev->mdev, in_mad, response_mad, op_modifier,

				port);

}

}





static int process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,

static int process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,