net/mlx4_core: Disable Granular QoS per VF under IB/Eth VPI configuration

ogerlitz · davem330 · commit ac0a72a3e6e8 · 2015-06-15T16:42:57.000-07:00
Due to firmware bug, under VPI configuration when port1 = IB and
port2 = Eth, Granular QoS per VF isn't working properly. More over,
the whole QP0/QP1 Para-Virtualization in the mlx4 IB driver is
broken on that config.

Hence, we must disable Granular QoS per VF under that configuration
till a fix is introduced. Once that happens, a new device capability
will be used to mark the feature support on that specific configuration.

Reported-by: Doug Ledford &lt;dledford@redhat.com&gt;
Signed-off-by: Or Gerlitz &lt;ogerlitz@mellanox.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -479,6 +479,14 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 		}
 	}
 
+	if (mlx4_is_master(dev) && (dev->caps.num_ports == 2) &&
+	    (port_type_array[0] == MLX4_PORT_TYPE_IB) &&
+	    (port_type_array[1] == MLX4_PORT_TYPE_ETH)) {
+		mlx4_warn(dev,
+			  "Granular QoS per VF not supported with IB/Eth configuration\n");
+		dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_QOS_VPP;
+	}
+
 	dev->caps.max_counters = 1 << ilog2(dev_cap->max_counters);
 
 	dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW] = dev_cap->reserved_qps;

Original file line number	Diff line number	Diff line change
`@@ -479,6 +479,14 @@ static int mlx4_dev_cap(struct mlx4_dev dev, struct mlx4_dev_cap dev_cap)`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`
	`482`	`+ if (mlx4_is_master(dev) && (dev->caps.num_ports == 2) &&`
	`483`	`+ (port_type_array[0] == MLX4_PORT_TYPE_IB) &&`
	`484`	`+ (port_type_array[1] == MLX4_PORT_TYPE_ETH)) {`
	`485`	`+ mlx4_warn(dev,`
	`486`	`+ "Granular QoS per VF not supported with IB/Eth configuration\n");`
	`487`	`+ dev->caps.flags2 &= ~MLX4_DEV_CAP_FLAG2_QOS_VPP;`
	`488`	`+ }`
	`489`	`+`
`482`	`490`	`dev->caps.max_counters = 1 << ilog2(dev_cap->max_counters);`
`483`	`491`
`484`	`492`	`dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW] = dev_cap->reserved_qps;`