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

Commit 3742cc65 authored by Ido Shamay's avatar Ido Shamay Committed by David S. Miller
Browse files

net/mlx4: Warn users of depracated QoS Firmware 



A new capability bit was introduced in the past to to differ devices
using the QoS ETS feature. The old was deprecated since then.
If driver sees device which set only the old capabilty, it will print
warning to user suggesting to upgrade the FW.

Signed-off-by: default avatarIdo Shamay <idos@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cda373f4

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

+1 −1
Original line number Diff line number Diff line
@@ -2814,7 +2814,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
	priv->msg_enable = MLX4_EN_MSG_LEVEL;

#ifdef CONFIG_MLX4_EN_DCB

	if (!mlx4_is_slave(priv->mdev->dev)) {

		if (mdev->dev->caps.flags & MLX4_DEV_CAP_FLAG_SET_ETH_SCHED) {

		if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETS_CFG) {

			dev->dcbnl_ops = &mlx4_en_dcbnl_ops;

		} else {

			en_info(priv, "enabling only PFC DCB ops\n");

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

+5 −2
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags) 
		[23] = "QP rate limiting support",

		[24] = "Ethernet Flow control statistics support",

		[25] = "Granular QoS per VF support",

		[26] = "Port ETS Scheduler support",

	};

	int i;
@@ -900,6 +901,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	MLX4_GET(field, outbox, QUERY_DEV_CAP_VXLAN);

	if (field & 1<<3)

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_VXLAN_OFFLOADS;

	if (field & (1 << 5))

		dev_cap->flags2 |= MLX4_DEV_CAP_FLAG2_ETS_CFG;

	MLX4_GET(dev_cap->max_icm_sz, outbox,

		 QUERY_DEV_CAP_MAX_ICM_SZ_OFFSET);

	if (dev_cap->flags & MLX4_DEV_CAP_FLAG_COUNTERS)
@@ -1157,9 +1160,9 @@ int mlx4_QUERY_DEV_CAP_wrapper(struct mlx4_dev *dev, int slave, 
	field &= 0x7f;

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_CQ_TS_SUPPORT_OFFSET);



	/* For guests, disable vxlan tunneling */

	/* For guests, disable vxlan tunneling and QoS support */

	MLX4_GET(field, outbox->buf, QUERY_DEV_CAP_VXLAN);

	field &= 0xf7;

	field &= 0xd7;

	MLX4_PUT(outbox->buf, field, QUERY_DEV_CAP_VXLAN);



	/* For guests, report Blueflame disabled */

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

+8 −0
Original line number Diff line number Diff line
@@ -528,6 +528,14 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		dev->caps.alloc_res_qp_mask =

			(dev->caps.bf_reg_size ? MLX4_RESERVE_ETH_BF_QP : 0) |

			MLX4_RESERVE_A0_QP;



		if (!(dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETS_CFG) &&

		    dev->caps.flags & MLX4_DEV_CAP_FLAG_SET_ETH_SCHED) {

			mlx4_warn(dev, "Old device ETS support detected\n");

			mlx4_warn(dev, "Consider upgrading device FW.\n");

			dev->caps.flags2 |= MLX4_DEV_CAP_FLAG2_ETS_CFG;

		}



	} else {

		dev->caps.alloc_res_qp_mask = 0;

	}

include/linux/mlx4/device.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ enum { 
	MLX4_DEV_CAP_FLAG2_QP_RATE_LIMIT	= 1LL <<  23,

	MLX4_DEV_CAP_FLAG2_FLOWSTATS_EN         = 1LL <<  24,

	MLX4_DEV_CAP_FLAG2_QOS_VPP		= 1LL <<  25,

	MLX4_DEV_CAP_FLAG2_ETS_CFG		= 1LL <<  26,

};



enum {