net/mlx5: Factor out HCA capabilities functions
Subsystems (4)
PATCH 1/1 net/mlx5: Factor out HCA capabilities functions
From: Leon Romanovsky <[email protected]>
Combine all HCA capabilities setters under one function and compile out the ODP related function in case kernel was compiled without ODP support.
Signed-off-by Leon Romanovsky <[email protected]>
...
Changelog v0->v1:
* Embedded config option check into ODP capability function flow
--- .../net/ethernet/mellanox/mlx5/core/main.c | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/main.c +31 -15
@@ -466,7 +466,8 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *dev)int set_sz;int err; -if (!MLX5_CAP_GEN (dev, pg)) +if (!IS_ENABLED (CONFIG_INFINIBAND_ON_DEMAND_PAGING ) || + !MLX5_CAP_GEN (dev, pg))return 0 ; err =mlx5_core_get_caps (dev,MLX5_CAP_ODP );
@@ -576,6 +577,33 @@ static int handle_hca_cap(struct mlx5_core_dev *dev)return err; } +static int set_hca_cap (struct mlx5_core_dev *dev) +{ +struct pci_dev *pdev = dev->pdev; +int err; + + err =handle_hca_cap (dev); +if (err) { +dev_err (&pdev->dev,"handle_hca_cap failed\n" ); + goto out; + } + + err =handle_hca_cap_atomic (dev); +if (err) { +dev_err (&pdev->dev,"handle_hca_cap_atomic failed\n" ); + goto out; + } + + err =handle_hca_cap_odp (dev); +if (err) { +dev_err (&pdev->dev,"handle_hca_cap_odp failed\n" ); + goto out; + } + +out: +return err; +} +static int set_hca_ctrl (struct mlx5_core_dev *dev) {struct mlx5_reg_host_endianness he_in;
@@ -963,21 +991,9 @@ static int mlx5_load_one(struct mlx5_core_dev *dev, struct mlx5_priv *priv, goto reclaim_boot_pages; } - err =handle_hca_cap (dev); -if (err) { -dev_err (&pdev->dev,"handle_hca_cap failed\n" ); - goto reclaim_boot_pages; - } - - err =handle_hca_cap_atomic (dev); -if (err) { -dev_err (&pdev->dev,"handle_hca_cap_atomic failed\n" ); - goto reclaim_boot_pages; - } - - err =handle_hca_cap_odp (dev); + err =set_hca_cap (dev);if (err) { -dev_err (&pdev->dev,"handle_hca_cap_odp failed\n" ); +dev_err (&pdev->dev,"set_hca_cap failed\n" ); goto reclaim_boot_pages; }
Leon Romanovsky
AppliedQuoted 6 lines · Leon Romanovsky
From: Leon Romanovsky <[email protected]>
Combine all HCA capabilities setters under one function and compile out the ODP related function in case kernel was compiled without ODP support.
Quoted 8 lines
Signed-off-by Leon Romanovsky <[email protected]>---
Changelogv0->v1:
* Embedded config option check into ODP capability function flow--- .../net/ethernet/mellanox/mlx5/core/main.c | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-)
Applied to mlx5-next branch,37b6bb77c6fd net/mlx5: Factor out HCA capabilities functions
Thanks