Commit 27b942fb authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: Get rid of storing copy of device name 



Currently mlx5 core stores copy of the PCI device name in a
mlx5_priv structure and uses pr_warn, pr_err helpers.

Get rid of the copy of this name; instead store the parent device
pointer that contains name as well as dma specific parameters.
This also allows to use kernel's well defined dev_warn, dev_err, dev_dbg
device specific print routines.

This is also a preparation patch to access non PCI parent device in
future.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 316793fb

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

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static void set_wqname(struct mlx5_core_dev *dev) 
	struct mlx5_cmd *cmd = &dev->cmd;



	snprintf(cmd->wq_name, sizeof(cmd->wq_name), "mlx5_cmd_%s",

		 dev->priv.name);

		 dev_name(dev->device));

}



static void clean_debug_files(struct mlx5_core_dev *dev)

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer_tracepoint.h

+3 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ TRACE_EVENT(mlx5_fw, 
	TP_ARGS(tracer, trace_timestamp, lost, event_id, msg),



	TP_STRUCT__entry(

		__string(dev_name, tracer->dev->priv.name)

		__string(dev_name, dev_name(tracer->dev->device))

		__field(u64, trace_timestamp)

		__field(bool, lost)

		__field(u8, event_id)
@@ -55,7 +55,8 @@ TRACE_EVENT(mlx5_fw, 
	),



	TP_fast_assign(

		__assign_str(dev_name, tracer->dev->priv.name);

		__assign_str(dev_name,

			     dev_name(tracer->dev->device));

		__entry->trace_timestamp = trace_timestamp;

		__entry->lost = lost;

		__entry->event_id = event_id;

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

+3 −2
Original line number Diff line number Diff line
@@ -663,7 +663,8 @@ static int mlx5e_hairpin_flow_add(struct mlx5e_priv *priv, 
	}



	netdev_dbg(priv->netdev, "add hairpin: tirn %x rqn %x peer %s sqn %x prio %d (log) data %d packets %d\n",

		   hp->tirn, hp->pair->rqn[0], hp->pair->peer_mdev->priv.name,

		   hp->tirn, hp->pair->rqn[0],

		   dev_name(hp->pair->peer_mdev->device),

		   hp->pair->sqn[0], match_prio, params.log_data_size, params.log_num_packets);



	hpe->hp = hp;
@@ -700,7 +701,7 @@ static void mlx5e_hairpin_flow_del(struct mlx5e_priv *priv, 
		hpe = list_entry(next, struct mlx5e_hairpin_entry, flows);



		netdev_dbg(priv->netdev, "del hairpin: peer %s\n",

			   hpe->hp->pair->peer_mdev->priv.name);

			   dev_name(hpe->hp->pair->peer_mdev->device));



		mlx5e_hairpin_destroy(hpe->hp);

		hash_del(&hpe->hairpin_hlist);

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

+4 −4
Original line number Diff line number Diff line
@@ -376,11 +376,11 @@ bool mlx5_esw_multipath_prereq(struct mlx5_core_dev *dev0, 


#define MLX5_DEBUG_ESWITCH_MASK BIT(3)



#define esw_info(dev, format, ...)				\

	pr_info("(%s): E-Switch: " format, (dev)->priv.name, ##__VA_ARGS__)

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

	dev_info((__dev)->device, "E-Switch: " format, ##__VA_ARGS__)



#define esw_warn(dev, format, ...)				\

	pr_warn("(%s): E-Switch: " format, (dev)->priv.name, ##__VA_ARGS__)

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

	dev_warn((__dev)->device, "E-Switch: " format, ##__VA_ARGS__)



#define esw_debug(dev, format, ...)				\

	mlx5_core_dbg_mask(dev, MLX5_DEBUG_ESWITCH_MASK, format, ##__VA_ARGS__)

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

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ int mlx5_health_init(struct mlx5_core_dev *dev) 
		return -ENOMEM;



	strcpy(name, "mlx5_health");

	strcat(name, dev->priv.name);

	strcat(name, dev_name(dev->device));

	health->wq = create_singlethread_workqueue(name);

	kfree(name);

	if (!health->wq)