Commit adcf738b authored by Guojia Liao's avatar Guojia Liao Committed by David S. Miller
Browse files

net: hns3: cleanup some print format warning 



Using '%d' for printing type unsigned int or '%u' for
type int would cause static tools to give false warnings,
so this patch cleanups this warning by using the suitable
format specifier of the type of variable.

BTW, modifies the type of some variables and macro to
synchronize with their usage.

Signed-off-by: default avatarGuojia Liao <liaoguojia@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e690456

drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ enum hclge_mbx_vlan_cfg_subcode { 
};



#define HCLGE_MBX_MAX_MSG_SIZE	16

#define HCLGE_MBX_MAX_RESP_DATA_SIZE	8

#define HCLGE_MBX_MAX_RESP_DATA_SIZE	8U

#define HCLGE_MBX_RING_MAP_BASIC_MSG_NUM	3

#define HCLGE_MBX_RING_NODE_VARIABLE_NUM	3

drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c

+15 −15
Original line number Diff line number Diff line
@@ -57,68 +57,68 @@ static int hns3_dbg_queue_info(struct hnae3_handle *h, 
					   HNS3_RING_RX_RING_BASEADDR_H_REG);

		base_add_l = readl_relaxed(ring->tqp->io_base +

					   HNS3_RING_RX_RING_BASEADDR_L_REG);

		dev_info(&h->pdev->dev, "RX(%d) BASE ADD: 0x%08x%08x\n", i,

		dev_info(&h->pdev->dev, "RX(%u) BASE ADD: 0x%08x%08x\n", i,

			 base_add_h, base_add_l);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_BD_NUM_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING BD NUM: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING BD NUM: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_BD_LEN_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING BD LEN: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING BD LEN: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_TAIL_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING TAIL: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING TAIL: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_HEAD_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING HEAD: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING HEAD: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_FBDNUM_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING FBDNUM: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING FBDNUM: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_RX_RING_PKTNUM_RECORD_REG);

		dev_info(&h->pdev->dev, "RX(%d) RING PKTNUM: %u\n", i, value);

		dev_info(&h->pdev->dev, "RX(%u) RING PKTNUM: %u\n", i, value);



		ring = &priv->ring[i];

		base_add_h = readl_relaxed(ring->tqp->io_base +

					   HNS3_RING_TX_RING_BASEADDR_H_REG);

		base_add_l = readl_relaxed(ring->tqp->io_base +

					   HNS3_RING_TX_RING_BASEADDR_L_REG);

		dev_info(&h->pdev->dev, "TX(%d) BASE ADD: 0x%08x%08x\n", i,

		dev_info(&h->pdev->dev, "TX(%u) BASE ADD: 0x%08x%08x\n", i,

			 base_add_h, base_add_l);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_BD_NUM_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING BD NUM: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING BD NUM: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_TC_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING TC: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING TC: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_TAIL_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING TAIL: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING TAIL: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_HEAD_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING HEAD: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING HEAD: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_FBDNUM_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING FBDNUM: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING FBDNUM: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_OFFSET_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING OFFSET: %u\n", i, value);

		dev_info(&h->pdev->dev, "TX(%u) RING OFFSET: %u\n", i, value);



		value = readl_relaxed(ring->tqp->io_base +

				      HNS3_RING_TX_RING_PKTNUM_RECORD_REG);

		dev_info(&h->pdev->dev, "TX(%d) RING PKTNUM: %u\n\n", i,

		dev_info(&h->pdev->dev, "TX(%u) RING PKTNUM: %u\n\n", i,

			 value);

	}

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+10 −10
Original line number Diff line number Diff line
@@ -2002,7 +2002,7 @@ bool hns3_is_phys_func(struct pci_dev *pdev) 
	case HNAE3_DEV_ID_100G_RDMA_DCB_PFC_VF:

		return false;

	default:

		dev_warn(&pdev->dev, "un-recognized pci device-id %d",

		dev_warn(&pdev->dev, "un-recognized pci device-id %u",

			 dev_id);

	}
@@ -3939,14 +3939,14 @@ static void hns3_info_show(struct hns3_nic_priv *priv) 
	struct hnae3_knic_private_info *kinfo = &priv->ae_handle->kinfo;



	dev_info(priv->dev, "MAC address: %pM\n", priv->netdev->dev_addr);

	dev_info(priv->dev, "Task queue pairs numbers: %d\n", kinfo->num_tqps);

	dev_info(priv->dev, "RSS size: %d\n", kinfo->rss_size);

	dev_info(priv->dev, "Allocated RSS size: %d\n", kinfo->req_rss_size);

	dev_info(priv->dev, "RX buffer length: %d\n", kinfo->rx_buf_len);

	dev_info(priv->dev, "Desc num per TX queue: %d\n", kinfo->num_tx_desc);

	dev_info(priv->dev, "Desc num per RX queue: %d\n", kinfo->num_rx_desc);

	dev_info(priv->dev, "Total number of enabled TCs: %d\n", kinfo->num_tc);

	dev_info(priv->dev, "Max mtu size: %d\n", priv->netdev->max_mtu);

	dev_info(priv->dev, "Task queue pairs numbers: %u\n", kinfo->num_tqps);

	dev_info(priv->dev, "RSS size: %u\n", kinfo->rss_size);

	dev_info(priv->dev, "Allocated RSS size: %u\n", kinfo->req_rss_size);

	dev_info(priv->dev, "RX buffer length: %u\n", kinfo->rx_buf_len);

	dev_info(priv->dev, "Desc num per TX queue: %u\n", kinfo->num_tx_desc);

	dev_info(priv->dev, "Desc num per RX queue: %u\n", kinfo->num_rx_desc);

	dev_info(priv->dev, "Total number of enabled TCs: %u\n", kinfo->num_tc);

	dev_info(priv->dev, "Max mtu size: %u\n", priv->netdev->max_mtu);

}



static int hns3_client_init(struct hnae3_handle *handle)
@@ -4566,7 +4566,7 @@ int hns3_set_channels(struct net_device *netdev, 
	if (new_tqp_num > hns3_get_max_available_channels(h) ||

	    new_tqp_num < 1) {

		dev_err(&netdev->dev,

			"Change tqps fail, the tqp range is from 1 to %d",

			"Change tqps fail, the tqp range is from 1 to %u",

			hns3_get_max_available_channels(h));

		return -EINVAL;

	}

drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+6 −6
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static int hns3_set_ringparam(struct net_device *ndev, 
	}



	netdev_info(ndev,

		    "Changing Tx/Rx ring depth from %d/%d to %d/%d\n",

		    "Changing Tx/Rx ring depth from %u/%u to %u/%u\n",

		    old_tx_desc_num, old_rx_desc_num,

		    new_tx_desc_num, new_rx_desc_num);
@@ -1097,7 +1097,7 @@ static int hns3_get_coalesce_per_queue(struct net_device *netdev, u32 queue, 


	if (queue >= queue_num) {

		netdev_err(netdev,

			   "Invalid queue value %d! Queue max id=%d\n",

			   "Invalid queue value %u! Queue max id=%u\n",

			   queue, queue_num - 1);

		return -EINVAL;

	}
@@ -1147,14 +1147,14 @@ static int hns3_check_gl_coalesce_para(struct net_device *netdev, 
	rx_gl = hns3_gl_round_down(cmd->rx_coalesce_usecs);

	if (rx_gl != cmd->rx_coalesce_usecs) {

		netdev_info(netdev,

			    "rx_usecs(%d) rounded down to %d, because it must be multiple of 2.\n",

			    "rx_usecs(%u) rounded down to %u, because it must be multiple of 2.\n",

			    cmd->rx_coalesce_usecs, rx_gl);

	}



	tx_gl = hns3_gl_round_down(cmd->tx_coalesce_usecs);

	if (tx_gl != cmd->tx_coalesce_usecs) {

		netdev_info(netdev,

			    "tx_usecs(%d) rounded down to %d, because it must be multiple of 2.\n",

			    "tx_usecs(%u) rounded down to %u, because it must be multiple of 2.\n",

			    cmd->tx_coalesce_usecs, tx_gl);

	}
@@ -1182,7 +1182,7 @@ static int hns3_check_rl_coalesce_para(struct net_device *netdev, 
	rl = hns3_rl_round_down(cmd->rx_coalesce_usecs_high);

	if (rl != cmd->rx_coalesce_usecs_high) {

		netdev_info(netdev,

			    "usecs_high(%d) rounded down to %d, because it must be multiple of 4.\n",

			    "usecs_high(%u) rounded down to %u, because it must be multiple of 4.\n",

			    cmd->rx_coalesce_usecs_high, rl);

	}
@@ -1211,7 +1211,7 @@ static int hns3_check_coalesce_para(struct net_device *netdev, 
	if (cmd->use_adaptive_tx_coalesce == 1 ||

	    cmd->use_adaptive_rx_coalesce == 1) {

		netdev_info(netdev,

			    "adaptive-tx=%d and adaptive-rx=%d, tx_usecs or rx_usecs will changed dynamically.\n",

			    "adaptive-tx=%u and adaptive-rx=%u, tx_usecs or rx_usecs will changed dynamically.\n",

			    cmd->use_adaptive_tx_coalesce,

			    cmd->use_adaptive_rx_coalesce);

	}

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static int hclge_cmd_csq_clean(struct hclge_hw *hw) 
	rmb(); /* Make sure head is ready before touch any data */



	if (!is_valid_csq_clean_head(csq, head)) {

		dev_warn(&hdev->pdev->dev, "wrong cmd head (%d, %d-%d)\n", head,

		dev_warn(&hdev->pdev->dev, "wrong cmd head (%u, %d-%d)\n", head,

			 csq->next_to_use, csq->next_to_clean);

		dev_warn(&hdev->pdev->dev,

			 "Disabling any further commands to IMP firmware\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE