Commit 4d656b70 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-cleanups' 



Huazhong Tan says:
====================
net: hns3: add some cleanups

This series includes some cleanups for the HNS3 ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 026412ec b1261897

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

+0 −7
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ void hns3_set_vector_coalesce_rl(struct hns3_enet_tqp_vector *tqp_vector, 
	 * Rl defines rate of interrupts i.e. number of interrupts-per-second

	 * GL and RL(Rate Limiter) are 2 ways to acheive interrupt coalescing

	 */



	if (rl_reg > 0 && !tqp_vector->tx_group.coal.adapt_enable &&

	    !tqp_vector->rx_group.coal.adapt_enable)

		/* According to the hardware, the range of rl_reg is
@@ -883,7 +882,6 @@ static void hns3_set_outer_l2l3l4(struct sk_buff *skb, u8 ol4_proto, 
			hns3_set_field(*ol_type_vlan_len_msec,

				       HNS3_TXD_OL3T_S,

				       HNS3_OL3T_IPV4_NO_CSUM);



	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		hns3_set_field(*ol_type_vlan_len_msec, HNS3_TXD_OL3T_S,

			       HNS3_OL3T_IPV6);
@@ -1296,7 +1294,6 @@ static unsigned int hns3_tx_bd_num(struct sk_buff *skb, unsigned int *bd_size, 
		return HNS3_MAX_TSO_BD_NUM + 1U;



	bd_num = hns3_skb_bd_num(skb, bd_size, bd_num);



	if (!skb_has_frag_list(skb) || bd_num > HNS3_MAX_TSO_BD_NUM)

		return bd_num;
@@ -2965,7 +2962,6 @@ static void hns3_rx_checksum(struct hns3_enet_ring *ring, struct sk_buff *skb, 
					  HNS3_RXD_L3ID_S);

		l4_type = hnae3_get_field(l234info, HNS3_RXD_L4ID_M,

					  HNS3_RXD_L4ID_S);



		/* Can checksum ipv4 or ipv6 + UDP/TCP/SCTP packets */

		if ((l3_type == HNS3_L3_TYPE_IPV4 ||

		     l3_type == HNS3_L3_TYPE_IPV6) &&
@@ -3295,7 +3291,6 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring) 


	if (!skb) {

		bd_base_info = le32_to_cpu(desc->rx.bd_base_info);



		/* Check valid BD */

		if (unlikely(!(bd_base_info & BIT(HNS3_RXD_VLD_B))))

			return -ENXIO;
@@ -3557,7 +3552,6 @@ static int hns3_nic_common_poll(struct napi_struct *napi, int budget) 
	hns3_for_each_ring(ring, tqp_vector->rx_group) {

		int rx_cleaned = hns3_clean_rx_ring(ring, rx_budget,

						    hns3_rx_skb);



		if (rx_cleaned >= rx_budget)

			clean_complete = false;
@@ -4024,7 +4018,6 @@ static void hns3_init_ring_hw(struct hns3_enet_ring *ring) 
			       hns3_buf_size2type(ring->buf_size));

		hns3_write_dev(q, HNS3_RING_RX_RING_BD_NUM_REG,

			       ring->desc_num / 8 - 1);



	} else {

		hns3_write_dev(q, HNS3_RING_TX_RING_BASEADDR_L_REG,

			       (u32)dma);

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

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int hns3_lp_run_test(struct net_device *ndev, enum hnae3_loop mode) 
}



/**

 * hns3_nic_self_test - self test

 * hns3_self_test - self test

 * @ndev: net device

 * @eth_test: test cmd

 * @data: test result

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

+0 −1
Original line number Diff line number Diff line
@@ -366,7 +366,6 @@ static void hclge_parse_capability(struct hclge_dev *hdev, 
	u32 caps;



	caps = __le32_to_cpu(cmd->caps[0]);



	if (hnae3_get_bit(caps, HCLGE_CAP_UDP_GSO_B))

		set_bit(HNAE3_DEV_SUPPORT_UDP_GSO_B, ae_dev->caps);

	if (hnae3_get_bit(caps, HCLGE_CAP_PTP_B))

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

+0 −2
Original line number Diff line number Diff line
@@ -506,8 +506,6 @@ struct hclge_pf_res_cmd { 
#define HCLGE_CFG_RD_LEN_BYTES	16

#define HCLGE_CFG_RD_LEN_UNIT	4



#define HCLGE_CFG_VMDQ_S	0

#define HCLGE_CFG_VMDQ_M	GENMASK(7, 0)

#define HCLGE_CFG_TC_NUM_S	8

#define HCLGE_CFG_TC_NUM_M	GENMASK(15, 8)

#define HCLGE_CFG_TQP_DESC_N_S	16

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

+2 −3
Original line number Diff line number Diff line
@@ -1541,8 +1541,7 @@ static void hclge_dbg_dump_ncl_config(struct hclge_dev *hdev, 
	}

}



static void hclge_dbg_dump_loopback(struct hclge_dev *hdev,

				    const char *cmd_buf)

static void hclge_dbg_dump_loopback(struct hclge_dev *hdev)

{

	struct phy_device *phydev = hdev->hw.mac.phydev;

	struct hclge_config_mac_mode_cmd *req_app;
@@ -1778,7 +1777,7 @@ int hclge_dbg_run_cmd(struct hnae3_handle *handle, const char *cmd_buf) 
		hclge_dbg_dump_mac_tnl_status(hdev);

	} else if (strncmp(cmd_buf, DUMP_LOOPBACK,

		   strlen(DUMP_LOOPBACK)) == 0) {

		hclge_dbg_dump_loopback(hdev, &cmd_buf[sizeof(DUMP_LOOPBACK)]);

		hclge_dbg_dump_loopback(hdev);

	} else if (strncmp(cmd_buf, "dump qs shaper", 14) == 0) {

		hclge_dbg_dump_qs_shaper(hdev,

					 &cmd_buf[sizeof("dump qs shaper")]);