Unverified Commit b57e8bb1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2953 Revert vf fault patch and fix some page pool bug 

Merge Pull Request from: @svishen 
 
This pr revert some vf fault patch and backport the mainline page pool bugfix

issue:
https://gitee.com/openeuler/kernel/issues/I8E9UJ?from=project-issue
https://gitee.com/openeuler/kernel/issues/I8I33Y?from=project-issue
https://gitee.com/openeuler/kernel/issues/I8ISOD?from=project-issue 
 
Link:https://gitee.com/openeuler/kernel/pulls/2953

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a32c6660 53a983f5

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

+4 −4
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ enum HNAE3_DEV_CAP_BITS { 
	HNAE3_DEV_SUPPORT_CQ_B,

	HNAE3_DEV_SUPPORT_LANE_NUM_B,

	HNAE3_DEV_SUPPORT_WOL_B,

	HNAE3_DEV_SUPPORT_VF_FAULT_B,

	HNAE3_DEV_SUPPORT_NOTIFY_PKT_B,

	HNAE3_DEV_SUPPORT_TM_FLUSH_B,

	HNAE3_DEV_SUPPORT_VF_FAULT_B,

	HNAE3_DEV_SUPPORT_ERR_MOD_GEN_REG_B,

};
@@ -209,15 +209,15 @@ enum HNAE3_DEV_CAP_BITS { 
#define hnae3_ae_dev_wol_supported(ae_dev) \

	test_bit(HNAE3_DEV_SUPPORT_WOL_B, (ae_dev)->caps)



#define hnae3_ae_dev_vf_fault_supported(ae_dev) \

	test_bit(HNAE3_DEV_SUPPORT_VF_FAULT_B, (ae_dev)->caps)



#define hnae3_ae_dev_notify_pkt_supported(ae_dev) \

	test_bit(HNAE3_DEV_SUPPORT_NOTIFY_PKT_B, (ae_dev)->caps)



#define hnae3_ae_dev_tm_flush_supported(hdev) \

	test_bit(HNAE3_DEV_SUPPORT_TM_FLUSH_B, (hdev)->ae_dev->caps)



#define hnae3_ae_dev_vf_fault_supported(ae_dev) \

	test_bit(HNAE3_DEV_SUPPORT_VF_FAULT_B, (ae_dev)->caps)



#define hnae3_ae_dev_gen_reg_dfx_supported(hdev) \

	test_bit(HNAE3_DEV_SUPPORT_ERR_MOD_GEN_REG_B, (hdev)->ae_dev->caps)

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -155,9 +155,9 @@ static const struct hclge_comm_caps_bit_map hclge_pf_cmd_caps[] = { 
	{HCLGE_COMM_CAP_FD_B, HNAE3_DEV_SUPPORT_FD_B},

	{HCLGE_COMM_CAP_LANE_NUM_B, HNAE3_DEV_SUPPORT_LANE_NUM_B},

	{HCLGE_COMM_CAP_WOL_B, HNAE3_DEV_SUPPORT_WOL_B},

	{HCLGE_COMM_CAP_VF_FAULT_B, HNAE3_DEV_SUPPORT_VF_FAULT_B},

	{HCLGE_COMM_CAP_NOTIFY_PKT_B, HNAE3_DEV_SUPPORT_NOTIFY_PKT_B},

	{HCLGE_COMM_CAP_TM_FLUSH_B, HNAE3_DEV_SUPPORT_TM_FLUSH_B},

	{HCLGE_COMM_CAP_VF_FAULT_B, HNAE3_DEV_SUPPORT_VF_FAULT_B},

	{HCLGE_COMM_CAP_ERR_MOD_GEN_REG_B, HNAE3_DEV_SUPPORT_ERR_MOD_GEN_REG_B},

};

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

+3 −3
Original line number Diff line number Diff line
@@ -413,12 +413,12 @@ static struct hns3_dbg_cap_info hns3_dbg_cap[] = { 
	}, {

		.name = "support wake on lan",

		.cap_bit = HNAE3_DEV_SUPPORT_WOL_B,

	}, {

		.name = "support vf fault detect",

		.cap_bit = HNAE3_DEV_SUPPORT_VF_FAULT_B,

	}, {

		.name = "support tm flush",

		.cap_bit = HNAE3_DEV_SUPPORT_TM_FLUSH_B,

	}, {

		.name = "support vf fault detect",

		.cap_bit = HNAE3_DEV_SUPPORT_VF_FAULT_B,

	}

};

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

+3 −0
Original line number Diff line number Diff line
@@ -681,6 +681,9 @@ static u64 *hns3_ethtool_pp_stats(struct hnae3_handle *handle, u64 *data) 
	struct page_pool *page_pool;

	int i;



	if (!hns3_is_page_pool_enabled())

		return data;



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

		page_pool = priv->ring[i + ring_num].page_pool;

		if (page_pool)

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

+3 −3
Original line number Diff line number Diff line
@@ -3473,9 +3473,9 @@ int hclge_handle_vf_queue_err_ras(struct hclge_dev *hdev) 
	bool cause_by_vf = false;

	int ret;



	if (!hnae3_ae_dev_vf_fault_supported(hdev->ae_dev) ||

	    !test_and_clear_bit(HNAE3_VF_EXP_RESET,

				&hdev->ae_dev->hw_err_reset_req))

	if (!test_and_clear_bit(HNAE3_VF_EXP_RESET,

				&hdev->ae_dev->hw_err_reset_req) ||

	    !hnae3_ae_dev_vf_fault_supported(hdev->ae_dev))

		return 0;



	hclge_comm_cmd_setup_basic_desc(&desc[0], HCLGE_OPC_GET_QUEUE_ERR_VF,