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

Commit 2974ab6e authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Leon Romanovsky
Browse files

net/mlx5: Improve driver log messages 



Remove duplicate pci dev name printing in mlx5_core_err.
Use mlx5_core_{warn,info,err} where possible to have the pci info in the
driver log messages.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarParvi Kaustubhi <parvik@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent c4f287c4

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+2 −2
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ int mlx5e_vport_rep_load(struct mlx5_eswitch *esw, 
{

	rep->priv_data = mlx5e_create_netdev(esw->dev, &mlx5e_rep_profile, rep);

	if (!rep->priv_data) {

		pr_warn("Failed to create representor for vport %d\n",

		mlx5_core_warn(esw->dev, "Failed to create representor for vport %d\n",

			       rep->vport);

		return -EINVAL;

	}

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+15 −11
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule, 


	spec = mlx5_vzalloc(sizeof(*spec));

	if (!spec) {

		pr_warn("FDB: Failed to alloc match parameters\n");

		esw_warn(esw->dev, "FDB: Failed to alloc match parameters\n");

		return NULL;

	}

	dmac_v = MLX5_ADDR_OF(fte_match_param, spec->match_value,
@@ -340,7 +340,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule, 
				   MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				   0, &dest);

	if (IS_ERR(flow_rule)) {

		pr_warn(

		esw_warn(esw->dev,

			 "FDB: Failed to add flow rule: dmac_v(%pM) dmac_c(%pM) -> vport(%d), err(%ld)\n",

			 dmac_v, dmac_c, vport, PTR_ERR(flow_rule));

		flow_rule = NULL;
@@ -1318,7 +1318,8 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw, 
				   0, NULL);

	if (IS_ERR(vport->ingress.allow_rule)) {

		err = PTR_ERR(vport->ingress.allow_rule);

		pr_warn("vport[%d] configure ingress allow rule, err(%d)\n",

		esw_warn(esw->dev,

			 "vport[%d] configure ingress allow rule, err(%d)\n",

			 vport->vport, err);

		vport->ingress.allow_rule = NULL;

		goto out;
@@ -1331,7 +1332,8 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw, 
				   0, NULL);

	if (IS_ERR(vport->ingress.drop_rule)) {

		err = PTR_ERR(vport->ingress.drop_rule);

		pr_warn("vport[%d] configure ingress drop rule, err(%d)\n",

		esw_warn(esw->dev,

			 "vport[%d] configure ingress drop rule, err(%d)\n",

			 vport->vport, err);

		vport->ingress.drop_rule = NULL;

		goto out;
@@ -1384,7 +1386,8 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw, 
				   0, NULL);

	if (IS_ERR(vport->egress.allowed_vlan)) {

		err = PTR_ERR(vport->egress.allowed_vlan);

		pr_warn("vport[%d] configure egress allowed vlan rule failed, err(%d)\n",

		esw_warn(esw->dev,

			 "vport[%d] configure egress allowed vlan rule failed, err(%d)\n",

			 vport->vport, err);

		vport->egress.allowed_vlan = NULL;

		goto out;
@@ -1398,7 +1401,8 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw, 
				   0, NULL);

	if (IS_ERR(vport->egress.drop_rule)) {

		err = PTR_ERR(vport->egress.drop_rule);

		pr_warn("vport[%d] configure egress drop rule failed, err(%d)\n",

		esw_warn(esw->dev,

			 "vport[%d] configure egress drop rule failed, err(%d)\n",

			 vport->vport, err);

		vport->egress.drop_rule = NULL;

	}

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+10 −8
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void del_flow_table(struct fs_node *node) 


	err = mlx5_cmd_destroy_flow_table(dev, ft);

	if (err)

		pr_warn("flow steering can't destroy ft\n");

		mlx5_core_warn(dev, "flow steering can't destroy ft\n");

	fs_get_obj(prio, ft->node.parent);

	prio->num_ft--;

}
@@ -364,7 +364,7 @@ static void del_rule(struct fs_node *node) 


	match_value = mlx5_vzalloc(match_len);

	if (!match_value) {

		pr_warn("failed to allocate inbox\n");

		mlx5_core_warn(dev, "failed to allocate inbox\n");

		return;

	}
@@ -387,7 +387,8 @@ static void del_rule(struct fs_node *node) 
					  modify_mask,

					  fte);

		if (err)

			pr_warn("%s can't del rule fg id=%d fte_index=%d\n",

			mlx5_core_warn(dev,

				       "%s can't del rule fg id=%d fte_index=%d\n",

				       __func__, fg->id, fte->index);

	}

	kvfree(match_value);
@@ -409,7 +410,8 @@ static void del_fte(struct fs_node *node) 
	err = mlx5_cmd_delete_fte(dev, ft,

				  fte->index);

	if (err)

		pr_warn("flow steering can't delete fte in index %d of flow group id %d\n",

		mlx5_core_warn(dev,

			       "flow steering can't delete fte in index %d of flow group id %d\n",

			       fte->index, fg->id);



	fte->status = 0;
@@ -427,7 +429,7 @@ static void del_flow_group(struct fs_node *node) 
	dev = get_dev(&ft->node);



	if (mlx5_cmd_destroy_flow_group(dev, ft, fg->id))

		pr_warn("flow steering can't destroy fg %d of ft %d\n",

		mlx5_core_warn(dev, "flow steering can't destroy fg %d of ft %d\n",

			       fg->id, ft->id);

}

drivers/net/ethernet/mellanox/mlx5/core/main.c

+6 −5
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ enum { 
				MLX5_DEV_CAP_FLAG_DCT,

};



static u16 to_fw_pkey_sz(u32 size)

static u16 to_fw_pkey_sz(struct mlx5_core_dev *dev, u32 size)

{

	switch (size) {

	case 128:
@@ -340,7 +340,7 @@ static u16 to_fw_pkey_sz(u32 size) 
	case 4096:

		return 5;

	default:

		pr_warn("invalid pkey table size %d\n", size);

		mlx5_core_warn(dev, "invalid pkey table size %d\n", size);

		return 0;

	}

}
@@ -477,7 +477,7 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) 
		      128);

	/* we limit the size of the pkey table to 128 entries for now */

	MLX5_SET(cmd_hca_cap, set_hca_cap, pkey_table_size,

		 to_fw_pkey_sz(128));

		 to_fw_pkey_sz(dev, 128));



	if (prof->mask & MLX5_PROF_MASK_QP_SIZE)

		MLX5_SET(cmd_hca_cap, set_hca_cap, log_max_qp,
@@ -1312,7 +1312,8 @@ static int init_one(struct pci_dev *pdev, 
	pci_set_drvdata(pdev, dev);



	if (prof_sel < 0 || prof_sel >= ARRAY_SIZE(profile)) {

		pr_warn("selected profile out of range, selecting default (%d)\n",

		mlx5_core_warn(dev,

			       "selected profile out of range, selecting default (%d)\n",

			       MLX5_DEFAULT_PROF);

		prof_sel = MLX5_DEFAULT_PROF;

	}

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ do { \ 
} while (0)



#define mlx5_core_err(__dev, format, ...)				\

	dev_err(&(__dev)->pdev->dev, "%s:%s:%d:(pid %d): " format,	\

	       (__dev)->priv.name, __func__, __LINE__, current->pid,	\

	dev_err(&(__dev)->pdev->dev, "%s:%d:(pid %d): " format,	\

		__func__, __LINE__, current->pid,	\

	       ##__VA_ARGS__)



#define mlx5_core_warn(__dev, format, ...)				\