net/mlx5: Read embedded cpu after init bit cleared

mosheshemesh2 · Saeed Mahameed · commit bbfa4b58997e · 2023-05-31T20:08:37.000-07:00
During driver load it reads embedded_cpu bit from initialization segment, but the initialization segment is readable only after initialization bit is cleared. Move the call to mlx5_read_embedded_cpu() right after initialization bit cleared. Signed-off-by: Moshe Shemesh <moshe@nvidia.com> Fixes: 591905b ("net/mlx5: Introduce Mellanox SmartNIC and modify page management logic") Reviewed-by: Shay Drory <shayd@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -923,7 +923,6 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct pci_dev *pdev,
 	}
 
 	mlx5_pci_vsc_init(dev);
-	dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);
 	return 0;
 
 err_clr_master:
@@ -1155,6 +1154,7 @@ static int mlx5_function_setup(struct mlx5_core_dev *dev, bool boot, u64 timeout
 		goto err_cmd_cleanup;
 	}
 
+	dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);
 	mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);
 
 	mlx5_start_health_poll(dev);

Original file line number	Diff line number	Diff line change
`@@ -923,7 +923,6 @@ static int mlx5_pci_init(struct mlx5_core_dev dev, struct pci_dev pdev,`
`923`	`923`	`}`
`924`	`924`
`925`	`925`	`mlx5_pci_vsc_init(dev);`
`926`		`- dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);`
`927`	`926`	`return 0;`
`928`	`927`
`929`	`928`	`err_clr_master:`
`@@ -1155,6 +1154,7 @@ static int mlx5_function_setup(struct mlx5_core_dev *dev, bool boot, u64 timeout`
`1155`	`1154`	`goto err_cmd_cleanup;`
`1156`	`1155`	`}`
`1157`	`1156`
	`1157`	`+ dev->caps.embedded_cpu = mlx5_read_embedded_cpu(dev);`
`1158`	`1158`	`mlx5_cmd_set_state(dev, MLX5_CMDIF_STATE_UP);`
`1159`	`1159`
`1160`	`1160`	`mlx5_start_health_poll(dev);`