net/mlx5: Use native_port_num as 1st option of device index

lrw514 · Saeed Mahameed · commit 1021d0645d59 · 2021-10-15T17:37:47.000-07:00
Using "native_port_num" can support more NICs.

Fallback to PCIe IDs if "native_port_num" query fails.

Signed-off-by: Rongwei Liu &lt;rongweil@nvidia.com&gt;
Reviewed-by: Mark Bloch &lt;mbloch@nvidia.com&gt;
Signed-off-by: Saeed Mahameed &lt;saeedm@nvidia.com&gt;
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
@@ -1245,7 +1245,12 @@ static inline int mlx5_core_native_port_num(struct mlx5_core_dev *dev)
 
 static inline int mlx5_get_dev_index(struct mlx5_core_dev *dev)
 {
-	return PCI_FUNC(dev->pdev->devfn);
+	int idx = MLX5_CAP_GEN(dev, native_port_num);
+
+	if (idx >= 1 && idx <= MLX5_MAX_PORTS)
+		return idx - 1;
+	else
+		return PCI_FUNC(dev->pdev->devfn);
 }
 
 enum {

Original file line number	Diff line number	Diff line change
`@@ -1245,7 +1245,12 @@ static inline int mlx5_core_native_port_num(struct mlx5_core_dev *dev)`
`1245`	`1245`
`1246`	`1246`	`static inline int mlx5_get_dev_index(struct mlx5_core_dev *dev)`
`1247`	`1247`	`{`
`1248`		`- return PCI_FUNC(dev->pdev->devfn);`
	`1248`	`+ int idx = MLX5_CAP_GEN(dev, native_port_num);`
	`1249`	`+`
	`1250`	`+ if (idx >= 1 && idx <= MLX5_MAX_PORTS)`
	`1251`	`+ return idx - 1;`
	`1252`	`+ else`
	`1253`	`+ return PCI_FUNC(dev->pdev->devfn);`
`1249`	`1254`	`}`
`1250`	`1255`
`1251`	`1256`	`enum {`