Commit 83cd2397 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

hisilicon: Update drivers to use ethtool_sprintf 



Update the hisilicon drivers to make use of ethtool_sprintf. The general
idea is to reduce code size and overhead by replacing the repeated pattern
of string printf statements and ETH_STRING_LEN counter increments.

Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a143a7c

drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c

+3 −6
Original line number Diff line number Diff line
@@ -687,17 +687,14 @@ static void hns_gmac_get_stats(void *mac_drv, u64 *data) 


static void hns_gmac_get_strings(u32 stringset, u8 *data)

{

	char *buff = (char *)data;

	u8 *buff = data;

	u32 i;



	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < ARRAY_SIZE(g_gmac_stats_string); i++) {

		snprintf(buff, ETH_GSTRING_LEN, "%s",

			 g_gmac_stats_string[i].desc);

		buff = buff + ETH_GSTRING_LEN;

	}

	for (i = 0; i < ARRAY_SIZE(g_gmac_stats_string); i++)

		ethtool_sprintf(&buff, g_gmac_stats_string[i].desc);

}



static int hns_gmac_get_sset_count(int stringset)

drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c

+15 −26
Original line number Diff line number Diff line
@@ -462,33 +462,22 @@ int hns_ppe_get_regs_count(void) 
 */

void hns_ppe_get_strings(struct hns_ppe_cb *ppe_cb, int stringset, u8 *data)

{

	char *buff = (char *)data;

	int index = ppe_cb->index;



	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_sw_pkt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_pkt_ok", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_drop_pkt_no_bd", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_alloc_buf_fail", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_alloc_buf_wait", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_pkt_drop_no_buf", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_rx_pkt_err_fifo_full", index);

	buff = buff + ETH_GSTRING_LEN;



	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_tx_bd", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_tx_pkt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_tx_pkt_ok", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_tx_pkt_err_fifo_empty", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "ppe%d_tx_pkt_err_csum_fail", index);

	u8 *buff = data;



	ethtool_sprintf(&buff, "ppe%d_rx_sw_pkt", index);

	ethtool_sprintf(&buff, "ppe%d_rx_pkt_ok", index);

	ethtool_sprintf(&buff, "ppe%d_rx_drop_pkt_no_bd", index);

	ethtool_sprintf(&buff, "ppe%d_rx_alloc_buf_fail", index);

	ethtool_sprintf(&buff, "ppe%d_rx_alloc_buf_wait", index);

	ethtool_sprintf(&buff, "ppe%d_rx_pkt_drop_no_buf", index);

	ethtool_sprintf(&buff, "ppe%d_rx_pkt_err_fifo_full", index);



	ethtool_sprintf(&buff, "ppe%d_tx_bd", index);

	ethtool_sprintf(&buff, "ppe%d_tx_pkt", index);

	ethtool_sprintf(&buff, "ppe%d_tx_pkt_ok", index);

	ethtool_sprintf(&buff, "ppe%d_tx_pkt_err_fifo_empty", index);

	ethtool_sprintf(&buff, "ppe%d_tx_pkt_err_csum_fail", index);

}



void hns_ppe_get_stats(struct hns_ppe_cb *ppe_cb, u64 *data)

drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c

+32 −59
Original line number Diff line number Diff line
@@ -929,69 +929,42 @@ int hns_rcb_get_ring_regs_count(void) 
 */

void hns_rcb_get_strings(int stringset, u8 *data, int index)

{

	char *buff = (char *)data;

	u8 *buff = data;



	if (stringset != ETH_SS_STATS)

		return;



	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_rcb_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_ppe_tx_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_ppe_drop_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_fbd_num", index);

	buff = buff + ETH_GSTRING_LEN;



	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_bytes", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_err_cnt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_io_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_sw_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_seg_pkt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_restart_queue", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "tx_ring%d_tx_busy", index);

	buff = buff + ETH_GSTRING_LEN;



	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_rcb_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_ppe_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_ppe_drop_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_fbd_num", index);

	buff = buff + ETH_GSTRING_LEN;



	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_pkt_num", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_bytes", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_err_cnt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_io_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_sw_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_seg_pkt", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_reuse_pg", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_len_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_non_vld_desc_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_bd_num_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_l2_err", index);

	buff = buff + ETH_GSTRING_LEN;

	snprintf(buff, ETH_GSTRING_LEN, "rx_ring%d_l3l4csum_err", index);

	ethtool_sprintf(&buff, "tx_ring%d_rcb_pkt_num", index);

	ethtool_sprintf(&buff, "tx_ring%d_ppe_tx_pkt_num", index);

	ethtool_sprintf(&buff, "tx_ring%d_ppe_drop_pkt_num", index);

	ethtool_sprintf(&buff, "tx_ring%d_fbd_num", index);



	ethtool_sprintf(&buff, "tx_ring%d_pkt_num", index);

	ethtool_sprintf(&buff, "tx_ring%d_bytes", index);

	ethtool_sprintf(&buff, "tx_ring%d_err_cnt", index);

	ethtool_sprintf(&buff, "tx_ring%d_io_err", index);

	ethtool_sprintf(&buff, "tx_ring%d_sw_err", index);

	ethtool_sprintf(&buff, "tx_ring%d_seg_pkt", index);

	ethtool_sprintf(&buff, "tx_ring%d_restart_queue", index);

	ethtool_sprintf(&buff, "tx_ring%d_tx_busy", index);



	ethtool_sprintf(&buff, "rx_ring%d_rcb_pkt_num", index);

	ethtool_sprintf(&buff, "rx_ring%d_ppe_pkt_num", index);

	ethtool_sprintf(&buff, "rx_ring%d_ppe_drop_pkt_num", index);

	ethtool_sprintf(&buff, "rx_ring%d_fbd_num", index);



	ethtool_sprintf(&buff, "rx_ring%d_pkt_num", index);

	ethtool_sprintf(&buff, "rx_ring%d_bytes", index);

	ethtool_sprintf(&buff, "rx_ring%d_err_cnt", index);

	ethtool_sprintf(&buff, "rx_ring%d_io_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_sw_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_seg_pkt", index);

	ethtool_sprintf(&buff, "rx_ring%d_reuse_pg", index);

	ethtool_sprintf(&buff, "rx_ring%d_len_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_non_vld_desc_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_bd_num_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_l2_err", index);

	ethtool_sprintf(&buff, "rx_ring%d_l3l4csum_err", index);

}



void hns_rcb_get_common_regs(struct rcb_common_cb *rcb_com, void *data)

drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c

+3 −5
Original line number Diff line number Diff line
@@ -758,16 +758,14 @@ static void hns_xgmac_get_stats(void *mac_drv, u64 *data) 
 */

static void hns_xgmac_get_strings(u32 stringset, u8 *data)

{

	char *buff = (char *)data;

	u8 *buff = data;

	u32 i;



	if (stringset != ETH_SS_STATS)

		return;



	for (i = 0; i < ARRAY_SIZE(g_xgmac_stats_string); i++) {

		snprintf(buff, ETH_GSTRING_LEN, g_xgmac_stats_string[i].desc);

		buff = buff + ETH_GSTRING_LEN;

	}

	for (i = 0; i < ARRAY_SIZE(g_xgmac_stats_string); i++)

		ethtool_sprintf(&buff, g_xgmac_stats_string[i].desc);

}



/**

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

+37 −66
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static void hns_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
{

	struct hns_nic_priv *priv = netdev_priv(netdev);

	struct hnae_handle *h = priv->ae_handle;

	char *buff = (char *)data;

	u8 *buff = data;



	if (!h->dev->ops->get_strings) {

		netdev_err(netdev, "h->dev->ops->get_strings is null!\n");
@@ -903,74 +903,45 @@ static void hns_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
	}



	if (stringset == ETH_SS_TEST) {

		if (priv->ae_handle->phy_if != PHY_INTERFACE_MODE_XGMII) {

			memcpy(buff, hns_nic_test_strs[MAC_INTERNALLOOP_MAC],

			       ETH_GSTRING_LEN);

			buff += ETH_GSTRING_LEN;

		}

		memcpy(buff, hns_nic_test_strs[MAC_INTERNALLOOP_SERDES],

		       ETH_GSTRING_LEN);

		buff += ETH_GSTRING_LEN;

		if (priv->ae_handle->phy_if != PHY_INTERFACE_MODE_XGMII)

			ethtool_sprintf(&buff,

					hns_nic_test_strs[MAC_INTERNALLOOP_MAC]);

		ethtool_sprintf(&buff,

				hns_nic_test_strs[MAC_INTERNALLOOP_SERDES]);

		if ((netdev->phydev) && (!netdev->phydev->is_c45))

			memcpy(buff, hns_nic_test_strs[MAC_INTERNALLOOP_PHY],

			       ETH_GSTRING_LEN);

			ethtool_sprintf(&buff,

					hns_nic_test_strs[MAC_INTERNALLOOP_PHY]);



	} else {

		snprintf(buff, ETH_GSTRING_LEN, "rx_packets");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_packets");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_bytes");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_bytes");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_dropped");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_dropped");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "multicast");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "collisions");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_over_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_crc_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_frame_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_fifo_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_missed_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_aborted_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_carrier_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_fifo_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_heartbeat_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_length_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_window_errors");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "rx_compressed");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "tx_compressed");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "netdev_rx_dropped");

		buff = buff + ETH_GSTRING_LEN;

		snprintf(buff, ETH_GSTRING_LEN, "netdev_tx_dropped");

		buff = buff + ETH_GSTRING_LEN;



		snprintf(buff, ETH_GSTRING_LEN, "netdev_tx_timeout");

		buff = buff + ETH_GSTRING_LEN;



		h->dev->ops->get_strings(h, stringset, (u8 *)buff);

		ethtool_sprintf(&buff, "rx_packets");

		ethtool_sprintf(&buff, "tx_packets");

		ethtool_sprintf(&buff, "rx_bytes");

		ethtool_sprintf(&buff, "tx_bytes");

		ethtool_sprintf(&buff, "rx_errors");

		ethtool_sprintf(&buff, "tx_errors");

		ethtool_sprintf(&buff, "rx_dropped");

		ethtool_sprintf(&buff, "tx_dropped");

		ethtool_sprintf(&buff, "multicast");

		ethtool_sprintf(&buff, "collisions");

		ethtool_sprintf(&buff, "rx_over_errors");

		ethtool_sprintf(&buff, "rx_crc_errors");

		ethtool_sprintf(&buff, "rx_frame_errors");

		ethtool_sprintf(&buff, "rx_fifo_errors");

		ethtool_sprintf(&buff, "rx_missed_errors");

		ethtool_sprintf(&buff, "tx_aborted_errors");

		ethtool_sprintf(&buff, "tx_carrier_errors");

		ethtool_sprintf(&buff, "tx_fifo_errors");

		ethtool_sprintf(&buff, "tx_heartbeat_errors");

		ethtool_sprintf(&buff, "rx_length_errors");

		ethtool_sprintf(&buff, "tx_window_errors");

		ethtool_sprintf(&buff, "rx_compressed");

		ethtool_sprintf(&buff, "tx_compressed");

		ethtool_sprintf(&buff, "netdev_rx_dropped");

		ethtool_sprintf(&buff, "netdev_tx_dropped");



		ethtool_sprintf(&buff, "netdev_tx_timeout");



		h->dev->ops->get_strings(h, stringset, buff);

	}

}