Commit b32e521e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-hns3-add-some-fixes-for-net' 

Guangbin Huang says:

====================
net: hns3: add some fixes for -net

This series adds some fixes for the HNS3 ethernet driver.
====================

Link: https://lore.kernel.org/r/20211126120318.33921-1-huangguangbin2@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0435a4d0 82229c4d

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

+7 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,8 @@ static void hns3_dump_page_pool_info(struct hns3_enet_ring *ring, 
	u32 j = 0;



	sprintf(result[j++], "%u", index);

	sprintf(result[j++], "%u", ring->page_pool->pages_state_hold_cnt);

	sprintf(result[j++], "%u",

		READ_ONCE(ring->page_pool->pages_state_hold_cnt));

	sprintf(result[j++], "%u",

		atomic_read(&ring->page_pool->pages_state_release_cnt));

	sprintf(result[j++], "%u", ring->page_pool->p.pool_size);
@@ -1106,6 +1107,11 @@ hns3_dbg_page_pool_info(struct hnae3_handle *h, char *buf, int len) 
		return -EFAULT;

	}



	if (!priv->ring[h->kinfo.num_tqps].page_pool) {

		dev_err(&h->pdev->dev, "page pool is not initialized\n");

		return -EFAULT;

	}



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

		result[i] = &data_str[i][0];

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

+4 −0
Original line number Diff line number Diff line
@@ -987,6 +987,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags) 
	struct hnae3_ae_dev *ae_dev = pci_get_drvdata(h->pdev);

	const struct hnae3_ae_ops *ops = h->ae_algo->ops;

	const struct hns3_reset_type_map *rst_type_map;

	enum ethtool_reset_flags rst_flags;

	u32 i, size;



	if (ops->ae_dev_resetting && ops->ae_dev_resetting(h))
@@ -1006,6 +1007,7 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags) 
	for (i = 0; i < size; i++) {

		if (rst_type_map[i].rst_flags == *flags) {

			rst_type = rst_type_map[i].rst_type;

			rst_flags = rst_type_map[i].rst_flags;

			break;

		}

	}
@@ -1021,6 +1023,8 @@ static int hns3_set_reset(struct net_device *netdev, u32 *flags) 


	ops->reset_event(h->pdev, h);



	*flags &= ~rst_flags;



	return 0;

}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+2 −2
Original line number Diff line number Diff line
@@ -703,9 +703,9 @@ static int hclgevf_set_rss_tc_mode(struct hclgevf_dev *hdev, u16 rss_size) 
	roundup_size = ilog2(roundup_size);



	for (i = 0; i < HCLGEVF_MAX_TC_NUM; i++) {

		tc_valid[i] = !!(hdev->hw_tc_map & BIT(i));

		tc_valid[i] = 1;

		tc_size[i] = roundup_size;

		tc_offset[i] = rss_size * i;

		tc_offset[i] = (hdev->hw_tc_map & BIT(i)) ? rss_size * i : 0;

	}



	hclgevf_cmd_setup_basic_desc(&desc, HCLGEVF_OPC_RSS_TC_MODE, false);