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

Merge branch 'mlx4-misc-patches' 



Tariq Toukan says:

====================
mlx4 misc patches

This patchset contains misc patches from the team
to the mlx4 Core and Eth drivers.

Patch 1 by Eran replaces large static allocations by dynamic ones.
Patch 2 by Leon makes an explicit conversion and solves a smatch warning.
In patch 3 I fix a misplaced brackets of the sizeof operation.
Patch 4 by Moshe adds the ability to inform the FW regarding user mac updates.

Series generated against net-next commit:
901c5d2f ARM: dts: rk3228-evb: Fix the compiling error
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b74fd306 be599603

drivers/infiniband/hw/mlx4/qp.c

+13 −13
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static int is_sqp(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp) 
	/* VF or PF -- proxy SQP */

	if (mlx4_is_mfunc(dev->dev)) {

		for (i = 0; i < dev->dev->caps.num_ports; i++) {

			if (qp->mqp.qpn == dev->dev->caps.qp0_proxy[i] ||

			    qp->mqp.qpn == dev->dev->caps.qp1_proxy[i]) {

			if (qp->mqp.qpn == dev->dev->caps.spec_qps[i].qp0_proxy ||

			    qp->mqp.qpn == dev->dev->caps.spec_qps[i].qp1_proxy) {

				proxy_sqp = 1;

				break;

			}
@@ -173,7 +173,7 @@ static int is_qp0(struct mlx4_ib_dev *dev, struct mlx4_ib_qp *qp) 
	/* VF or PF -- proxy QP0 */

	if (mlx4_is_mfunc(dev->dev)) {

		for (i = 0; i < dev->dev->caps.num_ports; i++) {

			if (qp->mqp.qpn == dev->dev->caps.qp0_proxy[i]) {

			if (qp->mqp.qpn == dev->dev->caps.spec_qps[i].qp0_proxy) {

				proxy_qp0 = 1;

				break;

			}
@@ -614,8 +614,8 @@ static int qp0_enabled_vf(struct mlx4_dev *dev, int qpn) 
{

	int i;

	for (i = 0; i < dev->caps.num_ports; i++) {

		if (qpn == dev->caps.qp0_proxy[i])

			return !!dev->caps.qp0_qkey[i];

		if (qpn == dev->caps.spec_qps[i].qp0_proxy)

			return !!dev->caps.spec_qps[i].qp0_qkey;

	}

	return 0;

}
@@ -1114,9 +1114,9 @@ static u32 get_sqp_num(struct mlx4_ib_dev *dev, struct ib_qp_init_attr *attr) 
	}

	/* PF or VF -- creating proxies */

	if (attr->qp_type == IB_QPT_SMI)

		return dev->dev->caps.qp0_proxy[attr->port_num - 1];

		return dev->dev->caps.spec_qps[attr->port_num - 1].qp0_proxy;

	else

		return dev->dev->caps.qp1_proxy[attr->port_num - 1];

		return dev->dev->caps.spec_qps[attr->port_num - 1].qp1_proxy;

}



static struct ib_qp *_mlx4_ib_create_qp(struct ib_pd *pd,
@@ -2277,9 +2277,9 @@ static int vf_get_qp0_qkey(struct mlx4_dev *dev, int qpn, u32 *qkey) 
{

	int i;

	for (i = 0; i < dev->caps.num_ports; i++) {

		if (qpn == dev->caps.qp0_proxy[i] ||

		    qpn == dev->caps.qp0_tunnel[i]) {

			*qkey = dev->caps.qp0_qkey[i];

		if (qpn == dev->caps.spec_qps[i].qp0_proxy ||

		    qpn == dev->caps.spec_qps[i].qp0_tunnel) {

			*qkey = dev->caps.spec_qps[i].qp0_qkey;

			return 0;

		}

	}
@@ -2340,7 +2340,7 @@ static int build_sriov_qp0_header(struct mlx4_ib_sqp *sqp, 
		sqp->ud_header.bth.destination_qpn = cpu_to_be32(wr->remote_qpn);

	else

		sqp->ud_header.bth.destination_qpn =

			cpu_to_be32(mdev->dev->caps.qp0_tunnel[sqp->qp.port - 1]);

			cpu_to_be32(mdev->dev->caps.spec_qps[sqp->qp.port - 1].qp0_tunnel);



	sqp->ud_header.bth.psn = cpu_to_be32((sqp->send_psn++) & ((1 << 24) - 1));

	if (mlx4_is_master(mdev->dev)) {
@@ -2800,9 +2800,9 @@ static void set_tunnel_datagram_seg(struct mlx4_ib_dev *dev, 


	memcpy(dseg->av, &sqp_av, sizeof (struct mlx4_av));

	if (qpt == MLX4_IB_QPT_PROXY_GSI)

		dseg->dqpn = cpu_to_be32(dev->dev->caps.qp1_tunnel[port - 1]);

		dseg->dqpn = cpu_to_be32(dev->dev->caps.spec_qps[port - 1].qp1_tunnel);

	else

		dseg->dqpn = cpu_to_be32(dev->dev->caps.qp0_tunnel[port - 1]);

		dseg->dqpn = cpu_to_be32(dev->dev->caps.spec_qps[port - 1].qp0_tunnel);

	/* Use QKEY from the QP context, which is set by master */

	dseg->qkey = cpu_to_be32(IB_QP_SET_QKEY);

}

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+21 −2
Original line number Diff line number Diff line
@@ -732,6 +732,21 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, 
	return __mlx4_replace_mac(dev, priv->port, qpn, new_mac_u64);

}



static void mlx4_en_update_user_mac(struct mlx4_en_priv *priv,

				    unsigned char new_mac[ETH_ALEN + 2])

{

	struct mlx4_en_dev *mdev = priv->mdev;

	int err;



	if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_USER_MAC_EN))

		return;



	err = mlx4_SET_PORT_user_mac(mdev->dev, priv->port, new_mac);

	if (err)

		en_err(priv, "Failed to pass user MAC(%pM) to Firmware for port %d, with error %d\n",

		       new_mac, priv->port, err);

}



static int mlx4_en_do_set_mac(struct mlx4_en_priv *priv,

			      unsigned char new_mac[ETH_ALEN + 2])

{
@@ -766,8 +781,12 @@ static int mlx4_en_set_mac(struct net_device *dev, void *addr) 
	mutex_lock(&mdev->state_lock);

	memcpy(new_mac, saddr->sa_data, ETH_ALEN);

	err = mlx4_en_do_set_mac(priv, new_mac);

	if (!err)

	if (err)

		goto out;



	memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN);

	mlx4_en_update_user_mac(priv, new_mac);

out:

	mutex_unlock(&mdev->state_lock);



	return err;

drivers/net/ethernet/mellanox/mlx4/eq.c

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static int mlx4_eq_int(struct mlx4_dev *dev, struct mlx4_eq *eq) 
			}

			memcpy(&priv->mfunc.master.comm_arm_bit_vector,

			       eqe->event.comm_channel_arm.bit_vec,

			       sizeof(eqe)->event.comm_channel_arm.bit_vec);

			       sizeof(eqe->event.comm_channel_arm.bit_vec));

			queue_work(priv->mfunc.master.comm_wq,

				   &priv->mfunc.master.comm_work);

			break;

drivers/net/ethernet/mellanox/mlx4/fw.c

+12 −7
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags) 
		[35] = "Diag counters per port",

		[36] = "QinQ VST mode support",

		[37] = "sl to vl mapping table change event support",

		[38] = "user MAC support",

	};

	int i;
@@ -679,22 +680,22 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, u8 gen_or_port, 


	if (func_cap->flags1 & QUERY_FUNC_CAP_VF_ENABLE_QP0) {

		MLX4_GET(qkey, outbox, QUERY_FUNC_CAP_PRIV_VF_QKEY_OFFSET);

		func_cap->qp0_qkey = qkey;

		func_cap->spec_qps.qp0_qkey = qkey;

	} else {

		func_cap->qp0_qkey = 0;

		func_cap->spec_qps.qp0_qkey = 0;

	}



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP0_TUNNEL);

	func_cap->qp0_tunnel_qpn = size & 0xFFFFFF;

	func_cap->spec_qps.qp0_tunnel = size & 0xFFFFFF;



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP0_PROXY);

	func_cap->qp0_proxy_qpn = size & 0xFFFFFF;

	func_cap->spec_qps.qp0_proxy = size & 0xFFFFFF;



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP1_TUNNEL);

	func_cap->qp1_tunnel_qpn = size & 0xFFFFFF;

	func_cap->spec_qps.qp1_tunnel = size & 0xFFFFFF;



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_QP1_PROXY);

	func_cap->qp1_proxy_qpn = size & 0xFFFFFF;

	func_cap->spec_qps.qp1_proxy = size & 0xFFFFFF;



	if (func_cap->flags1 & QUERY_FUNC_CAP_FLAGS1_NIC_INFO)

		MLX4_GET(func_cap->phys_port_id, outbox,
@@ -778,6 +779,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
#define QUERY_DEV_CAP_MAX_DESC_SZ_SQ_OFFSET	0x52

#define QUERY_DEV_CAP_MAX_SG_RQ_OFFSET		0x55

#define QUERY_DEV_CAP_MAX_DESC_SZ_RQ_OFFSET	0x56

#define QUERY_DEV_CAP_USER_MAC_EN_OFFSET	0x5C

#define QUERY_DEV_CAP_SVLAN_BY_QP_OFFSET	0x5D

#define QUERY_DEV_CAP_MAX_QP_MCG_OFFSET		0x61

#define QUERY_DEV_CAP_RSVD_MCG_OFFSET		0x62
@@ -949,6 +951,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	MLX4_GET(size, outbox, QUERY_DEV_CAP_MAX_DESC_SZ_SQ_OFFSET);

	dev_cap->max_sq_desc_sz = size;



	MLX4_GET(field, outbox, QUERY_DEV_CAP_USER_MAC_EN_OFFSET);

	if (field & (1 << 2))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_USER_MAC_EN;

	MLX4_GET(field, outbox, QUERY_DEV_CAP_SVLAN_BY_QP_OFFSET);

	if (field & 0x1)

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_SVLAN_BY_QP;
@@ -1534,7 +1539,7 @@ int mlx4_map_cmd(struct mlx4_dev *dev, u16 op, struct mlx4_icm *icm, u64 virt) 
		for (i = 0; i < mlx4_icm_size(&iter) >> lg; ++i) {

			if (virt != -1) {

				pages[nent * 2] = cpu_to_be64(virt);

				virt += 1 << lg;

				virt += 1ULL << lg;

			}



			pages[nent * 2 + 1] =

drivers/net/ethernet/mellanox/mlx4/fw.h

+1 −5
Original line number Diff line number Diff line
@@ -144,11 +144,7 @@ struct mlx4_func_cap { 
	int	max_eq;

	int	reserved_eq;

	int	mcg_quota;

	u32	qp0_qkey;

	u32	qp0_tunnel_qpn;

	u32	qp0_proxy_qpn;

	u32	qp1_tunnel_qpn;

	u32	qp1_proxy_qpn;

	struct mlx4_spec_qps spec_qps;

	u32	reserved_lkey;

	u8	physical_port;

	u8	flags0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE