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

Commit 1a91de28 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

mellanox: Logging message cleanups 



Use a more current logging style.

o Coalesce formats
o Add missing spaces for coalesced formats
o Align arguments for modified formats
o Add missing newlines for some logging messages
o Use DRV_NAME as part of format instead of %s, DRV_NAME to
  reduce overall text.
o Use ..., ##__VA_ARGS__ instead of args... in macros
o Correct a few format typos
o Use a single line message where appropriate

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-By: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2db2a15a

drivers/net/ethernet/mellanox/mlx4/cmd.c

+38 −47
Original line number Diff line number Diff line
@@ -212,8 +212,7 @@ static int mlx4_comm_cmd_poll(struct mlx4_dev *dev, u8 cmd, u16 param, 


	/* First, verify that the master reports correct status */

	if (comm_pending(dev)) {

		mlx4_warn(dev, "Communication channel is not idle."

			  "my toggle is %d (cmd:0x%x)\n",

		mlx4_warn(dev, "Communication channel is not idle - my toggle is %d (cmd:0x%x)\n",

			  priv->cmd.comm_toggle, cmd);

		return -EAGAIN;

	}
@@ -422,9 +421,8 @@ static int mlx4_slave_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param, 
					*out_param =

						be64_to_cpu(vhcr->out_param);

				else {

					mlx4_err(dev, "response expected while"

						 "output mailbox is NULL for "

						 "command 0x%x\n", op);

					mlx4_err(dev, "response expected while output mailbox is NULL for command 0x%x\n",

						 op);

					vhcr->status = CMD_STAT_BAD_PARAM;

				}

			}
@@ -439,16 +437,15 @@ static int mlx4_slave_cmd(struct mlx4_dev *dev, u64 in_param, u64 *out_param, 
					*out_param =

						be64_to_cpu(vhcr->out_param);

				else {

					mlx4_err(dev, "response expected while"

						 "output mailbox is NULL for "

						 "command 0x%x\n", op);

					mlx4_err(dev, "response expected while output mailbox is NULL for command 0x%x\n",

						 op);

					vhcr->status = CMD_STAT_BAD_PARAM;

				}

			}

			ret = mlx4_status_to_errno(vhcr->status);

		} else

			mlx4_err(dev, "failed execution of VHCR_POST command"

				 "opcode 0x%x\n", op);

			mlx4_err(dev, "failed execution of VHCR_POST command opcode 0x%x\n",

				 op);

	}



	mutex_unlock(&priv->cmd.slave_cmd_mutex);
@@ -625,8 +622,7 @@ static int mlx4_ACCESS_MEM(struct mlx4_dev *dev, u64 master_addr, 


	if ((slave_addr & 0xfff) | (master_addr & 0xfff) |

	    (slave & ~0x7f) | (size & 0xff)) {

		mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx "

			      "master_addr:0x%llx slave_id:%d size:%d\n",

		mlx4_err(dev, "Bad access mem params - slave_addr:0x%llx master_addr:0x%llx slave_id:%d size:%d\n",

			 slave_addr, master_addr, slave, size);

		return -EINVAL;

	}
@@ -788,8 +784,7 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave, 
	    ((smp->mgmt_class == IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE) ||

	     (smp->mgmt_class == IB_MGMT_CLASS_SUBN_LID_ROUTED &&

	      smp->method == IB_MGMT_METHOD_SET))) {

		mlx4_err(dev, "slave %d is trying to execute a Subnet MGMT MAD, "

			 "class 0x%x, method 0x%x for attr 0x%x. Rejecting\n",

		mlx4_err(dev, "slave %d is trying to execute a Subnet MGMT MAD, class 0x%x, method 0x%x for attr 0x%x - Rejecting\n",

			 slave, smp->method, smp->mgmt_class,

			 be16_to_cpu(smp->attr_id));

		return -EPERM;
@@ -1409,8 +1404,8 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave, 
				      ALIGN(sizeof(struct mlx4_vhcr_cmd),

					    MLX4_ACCESS_MEM_ALIGN), 1);

		if (ret) {

			mlx4_err(dev, "%s:Failed reading vhcr"

				 "ret: 0x%x\n", __func__, ret);

			mlx4_err(dev, "%s: Failed reading vhcr ret: 0x%x\n",

				 __func__, ret);

			kfree(vhcr);

			return ret;

		}
@@ -1461,9 +1456,8 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave, 


	/* Apply permission and bound checks if applicable */

	if (cmd->verify && cmd->verify(dev, slave, vhcr, inbox)) {

		mlx4_warn(dev, "Command:0x%x from slave: %d failed protection "

			  "checks for resource_id:%d\n", vhcr->op, slave,

			  vhcr->in_modifier);

		mlx4_warn(dev, "Command:0x%x from slave: %d failed protection checks for resource_id:%d\n",

			  vhcr->op, slave, vhcr->in_modifier);

		vhcr_cmd->status = CMD_STAT_BAD_OP;

		goto out_status;

	}
@@ -1502,8 +1496,7 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave, 
	}



	if (err) {

		mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with"

			  " error:%d, status %d\n",

		mlx4_warn(dev, "vhcr command:0x%x slave:%d failed with error:%d, status %d\n",

			  vhcr->op, slave, vhcr->errno, err);

		vhcr_cmd->status = mlx4_errno_to_status(err);

		goto out_status;
@@ -1537,8 +1530,8 @@ static int mlx4_master_process_vhcr(struct mlx4_dev *dev, int slave, 
				 __func__);

		else if (vhcr->e_bit &&

			 mlx4_GEN_EQE(dev, slave, &priv->mfunc.master.cmd_eqe))

				mlx4_warn(dev, "Failed to generate command completion "

					  "eqe for slave %d\n", slave);

				mlx4_warn(dev, "Failed to generate command completion eqe for slave %d\n",

					  slave);

	}



out:
@@ -1577,8 +1570,9 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 


	mlx4_dbg(dev, "updating immediately admin params slave %d port %d\n",

		 slave, port);

	mlx4_dbg(dev, "vlan %d QoS %d link down %d\n", vp_admin->default_vlan,

		 vp_admin->default_qos, vp_admin->link_state);

	mlx4_dbg(dev, "vlan %d QoS %d link down %d\n",

		 vp_admin->default_vlan, vp_admin->default_qos,

		 vp_admin->link_state);



	work = kzalloc(sizeof(*work), GFP_KERNEL);

	if (!work)
@@ -1591,7 +1585,7 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
						   &admin_vlan_ix);

			if (err) {

				kfree(work);

				mlx4_warn((&priv->dev),

				mlx4_warn(&priv->dev,

					  "No vlan resources slave %d, port %d\n",

					  slave, port);

				return err;
@@ -1600,7 +1594,7 @@ static int mlx4_master_immediate_activate_vlan_qos(struct mlx4_priv *priv, 
			admin_vlan_ix = NO_INDX;

		}

		work->flags |= MLX4_VF_IMMED_VLAN_FLAG_VLAN;

		mlx4_dbg((&(priv->dev)),

		mlx4_dbg(&priv->dev,

			 "alloc vlan %d idx  %d slave %d port %d\n",

			 (int)(vp_admin->default_vlan),

			 admin_vlan_ix, slave, port);
@@ -1661,12 +1655,12 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) 
						   vp_admin->default_vlan, &(vp_oper->vlan_idx));

			if (err) {

				vp_oper->vlan_idx = NO_INDX;

				mlx4_warn((&priv->dev),

				mlx4_warn(&priv->dev,

					  "No vlan resorces slave %d, port %d\n",

					  slave, port);

				return err;

			}

			mlx4_dbg((&(priv->dev)), "alloc vlan %d idx  %d slave %d port %d\n",

			mlx4_dbg(&priv->dev, "alloc vlan %d idx  %d slave %d port %d\n",

				 (int)(vp_oper->state.default_vlan),

				 vp_oper->vlan_idx, slave, port);

		}
@@ -1677,12 +1671,12 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave) 
			if (0 > vp_oper->mac_idx) {

				err = vp_oper->mac_idx;

				vp_oper->mac_idx = NO_INDX;

				mlx4_warn((&priv->dev),

				mlx4_warn(&priv->dev,

					  "No mac resorces slave %d, port %d\n",

					  slave, port);

				return err;

			}

			mlx4_dbg((&(priv->dev)), "alloc mac %llx idx  %d slave %d port %d\n",

			mlx4_dbg(&priv->dev, "alloc mac %llx idx  %d slave %d port %d\n",

				 vp_oper->state.mac, vp_oper->mac_idx, slave, port);

		}

	}
@@ -1731,8 +1725,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 
	slave_state[slave].comm_toggle ^= 1;

	reply = (u32) slave_state[slave].comm_toggle << 31;

	if (toggle != slave_state[slave].comm_toggle) {

		mlx4_warn(dev, "Incorrect toggle %d from slave %d. *** MASTER"

			  "STATE COMPROMISIED ***\n", toggle, slave);

		mlx4_warn(dev, "Incorrect toggle %d from slave %d. *** MASTER STATE COMPROMISED ***\n",

			  toggle, slave);

		goto reset_slave;

	}

	if (cmd == MLX4_COMM_CMD_RESET) {
@@ -1759,8 +1753,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 
	/*command from slave in the middle of FLR*/

	if (cmd != MLX4_COMM_CMD_RESET &&

	    MLX4_COMM_CMD_FLR == slave_state[slave].last_cmd) {

		mlx4_warn(dev, "slave:%d is Trying to run cmd(0x%x) "

			  "in the middle of FLR\n", slave, cmd);

		mlx4_warn(dev, "slave:%d is Trying to run cmd(0x%x) in the middle of FLR\n",

			  slave, cmd);

		return;

	}
@@ -1798,8 +1792,8 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 


		mutex_lock(&priv->cmd.slave_cmd_mutex);

		if (mlx4_master_process_vhcr(dev, slave, NULL)) {

			mlx4_err(dev, "Failed processing vhcr for slave:%d,"

				 " resetting slave.\n", slave);

			mlx4_err(dev, "Failed processing vhcr for slave:%d, resetting slave\n",

				 slave);

			mutex_unlock(&priv->cmd.slave_cmd_mutex);

			goto reset_slave;

		}
@@ -1816,8 +1810,7 @@ static void mlx4_master_do_cmd(struct mlx4_dev *dev, int slave, u8 cmd, 
		is_going_down = 1;

	spin_unlock_irqrestore(&priv->mfunc.master.slave_state_lock, flags);

	if (is_going_down) {

		mlx4_warn(dev, "Slave is going down aborting command(%d)"

			  " executing from slave:%d\n",

		mlx4_warn(dev, "Slave is going down aborting command(%d) executing from slave:%d\n",

			  cmd, slave);

		return;

	}
@@ -1880,9 +1873,8 @@ void mlx4_master_comm_channel(struct work_struct *work) 
			if (toggle != slt) {

				if (master->slave_state[slave].comm_toggle

				    != slt) {

					printk(KERN_INFO "slave %d out of sync."

					       " read toggle %d, state toggle %d. "

					       "Resynching.\n", slave, slt,

					printk(KERN_INFO "slave %d out of sync. read toggle %d, state toggle %d. Resynching.\n",

					       slave, slt,

					       master->slave_state[slave].comm_toggle);

					master->slave_state[slave].comm_toggle =

						slt;
@@ -1896,8 +1888,7 @@ void mlx4_master_comm_channel(struct work_struct *work) 
	}



	if (reported && reported != served)

		mlx4_warn(dev, "Got command event with bitmask from %d slaves"

			  " but %d were served\n",

		mlx4_warn(dev, "Got command event with bitmask from %d slaves but %d were served\n",

			  reported, served);



	if (mlx4_ARM_COMM_CHANNEL(dev))
@@ -1953,7 +1944,7 @@ int mlx4_multi_func_init(struct mlx4_dev *dev) 
		ioremap(pci_resource_start(dev->pdev, 2) +

			MLX4_SLAVE_COMM_BASE, MLX4_COMM_PAGESIZE);

	if (!priv->mfunc.comm) {

		mlx4_err(dev, "Couldn't map communication vector.\n");

		mlx4_err(dev, "Couldn't map communication vector\n");

		goto err_vhcr;

	}
@@ -2080,7 +2071,7 @@ int mlx4_cmd_init(struct mlx4_dev *dev) 
		priv->cmd.hcr = ioremap(pci_resource_start(dev->pdev, 0) +

					MLX4_HCR_BASE, MLX4_HCR_SIZE);

		if (!priv->cmd.hcr) {

			mlx4_err(dev, "Couldn't map command register.\n");

			mlx4_err(dev, "Couldn't map command register\n");

			return -ENOMEM;

		}

	}

drivers/net/ethernet/mellanox/mlx4/en_cq.c

+1 −2
Original line number Diff line number Diff line
@@ -125,8 +125,7 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, 
						   &cq->vector)) {

					cq->vector = (cq->ring + 1 + priv->port)

					    % mdev->dev->caps.num_comp_vectors;

					mlx4_warn(mdev, "Failed Assigning an EQ to "

						  "%s ,Falling back to legacy EQ's\n",

					mlx4_warn(mdev, "Failed assigning an EQ to %s, falling back to legacy EQ's\n",

						  name);

				}

			}

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

+3 −3
Original line number Diff line number Diff line
@@ -925,13 +925,13 @@ static int mlx4_en_flow_replace(struct net_device *dev, 
		qpn = cmd->fs.ring_cookie & (EN_ETHTOOL_QP_ATTACH - 1);

	} else {

		if (cmd->fs.ring_cookie >= priv->rx_ring_num) {

			en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist.\n",

			en_warn(priv, "rxnfc: RX ring (%llu) doesn't exist\n",

				cmd->fs.ring_cookie);

			return -EINVAL;

		}

		qpn = priv->rss_map.qps[cmd->fs.ring_cookie].qpn;

		if (!qpn) {

			en_warn(priv, "rxnfc: RX ring (%llu) is inactive.\n",

			en_warn(priv, "rxnfc: RX ring (%llu) is inactive\n",

				cmd->fs.ring_cookie);

			return -EINVAL;

		}
@@ -956,7 +956,7 @@ static int mlx4_en_flow_replace(struct net_device *dev, 
	}

	err = mlx4_flow_attach(priv->mdev->dev, &rule, &reg_id);

	if (err) {

		en_err(priv, "Fail to attach network rule at location %d.\n",

		en_err(priv, "Fail to attach network rule at location %d\n",

		       cmd->fs.location);

		goto out_free_list;

	}

drivers/net/ethernet/mellanox/mlx4/en_main.c

+3 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int mlx4_en_get_profile(struct mlx4_en_dev *mdev) 
			MLX4_EN_MAX_TX_RING_P_UP);

	if (params->udp_rss && !(mdev->dev->caps.flags

					& MLX4_DEV_CAP_FLAG_UDP_RSS)) {

		mlx4_warn(mdev, "UDP RSS is not supported on this device.\n");

		mlx4_warn(mdev, "UDP RSS is not supported on this device\n");

		params->udp_rss = 0;

	}

	for (i = 1; i <= MLX4_MAX_PORTS; i++) {
@@ -251,8 +251,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 


	mdev->LSO_support = !!(dev->caps.flags & (1 << 15));

	if (!mdev->LSO_support)

		mlx4_warn(mdev, "LSO not supported, please upgrade to later "

				"FW version to enable LSO\n");

		mlx4_warn(mdev, "LSO not supported, please upgrade to later FW version to enable LSO\n");



	if (mlx4_mr_alloc(mdev->dev, mdev->priv_pdn, 0, ~0ull,

			 MLX4_PERM_LOCAL_WRITE |  MLX4_PERM_LOCAL_READ,
@@ -268,7 +267,7 @@ static void *mlx4_en_add(struct mlx4_dev *dev) 
	/* Build device profile according to supplied module parameters */

	err = mlx4_en_get_profile(mdev);

	if (err) {

		mlx4_err(mdev, "Bad module parameters, aborting.\n");

		mlx4_err(mdev, "Bad module parameters, aborting\n");

		goto err_mr;

	}

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+4 −4
Original line number Diff line number Diff line
@@ -1576,7 +1576,7 @@ int mlx4_en_start_port(struct net_device *dev) 
			cq->buf[j].owner_sr_opcode = MLX4_CQE_OWNER_MASK;

		err = mlx4_en_set_cq_moder(priv, cq);

		if (err) {

			en_err(priv, "Failed setting cq moderation parameters");

			en_err(priv, "Failed setting cq moderation parameters\n");

			mlx4_en_deactivate_cq(priv, cq);

			goto cq_err;

		}
@@ -1615,7 +1615,7 @@ int mlx4_en_start_port(struct net_device *dev) 
		}

		err = mlx4_en_set_cq_moder(priv, cq);

		if (err) {

			en_err(priv, "Failed setting cq moderation parameters");

			en_err(priv, "Failed setting cq moderation parameters\n");

			mlx4_en_deactivate_cq(priv, cq);

			goto tx_err;

		}
@@ -2594,8 +2594,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
				    prof->tx_pause, prof->tx_ppp,

				    prof->rx_pause, prof->rx_ppp);

	if (err) {

		en_err(priv, "Failed setting port general configurations "

		       "for port %d, with error %d\n", priv->port, err);

		en_err(priv, "Failed setting port general configurations for port %d, with error %d\n",

		       priv->port, err);

		goto out;

	}