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

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

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
code optimizations & bugfixes for HNS3 driver

This patchset includes bugfixes and code optimizations for the HNS3
ethernet controller driver

Change log:
V1->V2: fixes comment from Eric Dumazet
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 16e82920 d3ad430a

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

+2 −1
Original line number Diff line number Diff line
@@ -433,7 +433,8 @@ struct hnae3_ae_ops { 
			     struct ethtool_channels *ch);

	void (*get_tqps_and_rss_info)(struct hnae3_handle *h,

				      u16 *alloc_tqps, u16 *max_rss_size);

	int (*set_channels)(struct hnae3_handle *handle, u32 new_tqps_num);

	int (*set_channels)(struct hnae3_handle *handle, u32 new_tqps_num,

			    bool rxfh_configured);

	void (*get_flowctrl_adv)(struct hnae3_handle *handle,

				 u32 *flowctrl_adv);

	int (*set_led_id)(struct hnae3_handle *handle,

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

+35 −9
Original line number Diff line number Diff line
@@ -1399,7 +1399,12 @@ static void hns3_nic_get_stats64(struct net_device *netdev, 
	int queue_num = priv->ae_handle->kinfo.num_tqps;

	struct hnae3_handle *handle = priv->ae_handle;

	struct hns3_enet_ring *ring;

	u64 rx_length_errors = 0;

	u64 rx_crc_errors = 0;

	u64 rx_multicast = 0;

	unsigned int start;

	u64 tx_errors = 0;

	u64 rx_errors = 0;

	unsigned int idx;

	u64 tx_bytes = 0;

	u64 rx_bytes = 0;
@@ -1422,6 +1427,8 @@ static void hns3_nic_get_stats64(struct net_device *netdev, 
			tx_pkts += ring->stats.tx_pkts;

			tx_drop += ring->stats.tx_busy;

			tx_drop += ring->stats.sw_err_cnt;

			tx_errors += ring->stats.tx_busy;

			tx_errors += ring->stats.sw_err_cnt;

		} while (u64_stats_fetch_retry_irq(&ring->syncp, start));



		/* fetch the rx stats */
@@ -1433,6 +1440,12 @@ static void hns3_nic_get_stats64(struct net_device *netdev, 
			rx_drop += ring->stats.non_vld_descs;

			rx_drop += ring->stats.err_pkt_len;

			rx_drop += ring->stats.l2_err;

			rx_errors += ring->stats.non_vld_descs;

			rx_errors += ring->stats.l2_err;

			rx_crc_errors += ring->stats.l2_err;

			rx_crc_errors += ring->stats.l3l4_csum_err;

			rx_multicast += ring->stats.rx_multicast;

			rx_length_errors += ring->stats.err_pkt_len;

		} while (u64_stats_fetch_retry_irq(&ring->syncp, start));

	}
@@ -1441,15 +1454,15 @@ static void hns3_nic_get_stats64(struct net_device *netdev, 
	stats->rx_bytes = rx_bytes;

	stats->rx_packets = rx_pkts;



	stats->rx_errors = netdev->stats.rx_errors;

	stats->multicast = netdev->stats.multicast;

	stats->rx_length_errors = netdev->stats.rx_length_errors;

	stats->rx_crc_errors = netdev->stats.rx_crc_errors;

	stats->rx_errors = rx_errors;

	stats->multicast = rx_multicast;

	stats->rx_length_errors = rx_length_errors;

	stats->rx_crc_errors = rx_crc_errors;

	stats->rx_missed_errors = netdev->stats.rx_missed_errors;



	stats->tx_errors = netdev->stats.tx_errors;

	stats->rx_dropped = rx_drop + netdev->stats.rx_dropped;

	stats->tx_dropped = tx_drop + netdev->stats.tx_dropped;

	stats->tx_errors = tx_errors;

	stats->rx_dropped = rx_drop;

	stats->tx_dropped = tx_drop;

	stats->collisions = netdev->stats.collisions;

	stats->rx_over_errors = netdev->stats.rx_over_errors;

	stats->rx_frame_errors = netdev->stats.rx_frame_errors;
@@ -2572,6 +2585,7 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
			     struct sk_buff **out_skb)

{

	struct net_device *netdev = ring->tqp->handle->kinfo.netdev;

	enum hns3_pkt_l2t_type l2_frame_type;

	struct sk_buff *skb = ring->skb;

	struct hns3_desc_cb *desc_cb;

	struct hns3_desc *desc;
@@ -2680,7 +2694,12 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
		return -EFAULT;

	}



	l2_frame_type = hnae3_get_field(l234info, HNS3_RXD_DMAC_M,

					HNS3_RXD_DMAC_S);

	u64_stats_update_begin(&ring->syncp);

	if (l2_frame_type == HNS3_L2_TYPE_MULTICAST)

		ring->stats.rx_multicast++;



	ring->stats.rx_pkts++;

	ring->stats.rx_bytes += skb->len;

	u64_stats_update_end(&ring->syncp);
@@ -3378,6 +3397,11 @@ static void hns3_fini_ring(struct hns3_enet_ring *ring) 
	ring->desc_cb = NULL;

	ring->next_to_clean = 0;

	ring->next_to_use = 0;

	ring->pending_buf = 0;

	if (ring->skb) {

		dev_kfree_skb_any(ring->skb);

		ring->skb = NULL;

	}

}



static int hns3_buf_size2type(u32 buf_size)
@@ -4144,6 +4168,7 @@ int hns3_set_channels(struct net_device *netdev, 
{

	struct hnae3_handle *h = hns3_get_handle(netdev);

	struct hnae3_knic_private_info *kinfo = &h->kinfo;

	bool rxfh_configured = netif_is_rxfh_configured(netdev);

	u32 new_tqp_num = ch->combined_count;

	u16 org_tqp_num;

	int ret;
@@ -4171,9 +4196,10 @@ int hns3_set_channels(struct net_device *netdev, 
		return ret;



	org_tqp_num = h->kinfo.num_tqps;

	ret = h->ae_algo->ops->set_channels(h, new_tqp_num);

	ret = h->ae_algo->ops->set_channels(h, new_tqp_num, rxfh_configured);

	if (ret) {

		ret = h->ae_algo->ops->set_channels(h, org_tqp_num);

		ret = h->ae_algo->ops->set_channels(h, org_tqp_num,

						    rxfh_configured);

		if (ret) {

			/* If revert to old tqp failed, fatal error occurred */

			dev_err(&netdev->dev,

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

+8 −0
Original line number Diff line number Diff line
@@ -202,6 +202,13 @@ enum hns3_nic_state { 


#define HNS3_RING_EN_B				0



enum hns3_pkt_l2t_type {

	HNS3_L2_TYPE_UNICAST,

	HNS3_L2_TYPE_MULTICAST,

	HNS3_L2_TYPE_BROADCAST,

	HNS3_L2_TYPE_INVALID,

};



enum hns3_pkt_l3t_type {

	HNS3_L3T_NONE,

	HNS3_L3T_IPV6,
@@ -376,6 +383,7 @@ struct ring_stats { 
			u64 err_bd_num;

			u64 l2_err;

			u64 l3l4_csum_err;

			u64 rx_multicast;

		};

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ static const struct hns3_stats hns3_rxq_stats[] = { 
	HNS3_TQP_STAT("err_bd_num", err_bd_num),

	HNS3_TQP_STAT("l2_err", l2_err),

	HNS3_TQP_STAT("l3l4_csum_err", l3l4_csum_err),

	HNS3_TQP_STAT("multicast", rx_multicast),

};



#define HNS3_RXQ_STATS_COUNT ARRAY_SIZE(hns3_rxq_stats)

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

+10 −2
Original line number Diff line number Diff line
@@ -170,8 +170,12 @@ static bool hclge_is_special_opcode(u16 opcode) 
	/* these commands have several descriptors,

	 * and use the first one to save opcode and return value

	 */

	u16 spec_opcode[3] = {HCLGE_OPC_STATS_64_BIT,

		HCLGE_OPC_STATS_32_BIT, HCLGE_OPC_STATS_MAC};

	u16 spec_opcode[] = {HCLGE_OPC_STATS_64_BIT,

			     HCLGE_OPC_STATS_32_BIT,

			     HCLGE_OPC_STATS_MAC,

			     HCLGE_OPC_STATS_MAC_ALL,

			     HCLGE_OPC_QUERY_32_BIT_REG,

			     HCLGE_OPC_QUERY_64_BIT_REG};

	int i;



	for (i = 0; i < ARRAY_SIZE(spec_opcode); i++) {
@@ -259,6 +263,10 @@ int hclge_cmd_send(struct hclge_hw *hw, struct hclge_desc *desc, int num) 


			if (desc_ret == HCLGE_CMD_EXEC_SUCCESS)

				retval = 0;

			else if (desc_ret == HCLGE_CMD_NO_AUTH)

				retval = -EPERM;

			else if (desc_ret == HCLGE_CMD_NOT_SUPPORTED)

				retval = -EOPNOTSUPP;

			else

				retval = -EIO;

			hw->cmq.last_status = desc_ret;