net: hns3: implement .process_hw_error for hns3 client (a83d2961) · Commits · 戴 / test

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,12 @@ enum hnae3_reset_notify_type {
	HNAE3_RESTORE_CLIENT,		HNAE3_RESTORE_CLIENT,
	};		};

			enum hnae3_hw_error_type {
			HNAE3_PPU_POISON_ERROR,
			HNAE3_CMDQ_ECC_ERROR,
			HNAE3_IMP_RD_POISON_ERROR,
			};

	enum hnae3_reset_type {		enum hnae3_reset_type {
	HNAE3_VF_RESET,		HNAE3_VF_RESET,
	HNAE3_VF_FUNC_RESET,		HNAE3_VF_FUNC_RESET,
	@@ -210,7 +216,8 @@ struct hnae3_client_ops {
	int (setup_tc)(struct hnae3_handle handle, u8 tc);		int (setup_tc)(struct hnae3_handle handle, u8 tc);
	int (reset_notify)(struct hnae3_handle handle,		int (reset_notify)(struct hnae3_handle handle,
	enum hnae3_reset_notify_type type);		enum hnae3_reset_notify_type type);
	enum hnae3_reset_type (process_hw_error)(struct hnae3_handle handle);		void (process_hw_error)(struct hnae3_handle handle,
			enum hnae3_hw_error_type);
	};		};

	#define HNAE3_CLIENT_NAME_LENGTH 16		#define HNAE3_CLIENT_NAME_LENGTH 16

+24 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4470,12 +4470,36 @@ int hns3_set_channels(struct net_device *netdev,
	return hns3_reset_notify(h, HNAE3_UP_CLIENT);		return hns3_reset_notify(h, HNAE3_UP_CLIENT);
	}		}

			static const struct hns3_hw_error_info hns3_hw_err[] = {
			{ .type = HNAE3_PPU_POISON_ERROR,
			.msg = "PPU poison" },
			{ .type = HNAE3_CMDQ_ECC_ERROR,
			.msg = "IMP CMDQ error" },
			{ .type = HNAE3_IMP_RD_POISON_ERROR,
			.msg = "IMP RD poison" },
			};

			static void hns3_process_hw_error(struct hnae3_handle *handle,
			enum hnae3_hw_error_type type)
			{
			int i;

			for (i = 0; i < ARRAY_SIZE(hns3_hw_err); i++) {
			if (hns3_hw_err[i].type == type) {
			dev_err(&handle->pdev->dev, "Detected %s!\n",
			hns3_hw_err[i].msg);
			break;
			}
			}
			}

	static const struct hnae3_client_ops client_ops = {		static const struct hnae3_client_ops client_ops = {
	.init_instance = hns3_client_init,		.init_instance = hns3_client_init,
	.uninit_instance = hns3_client_uninit,		.uninit_instance = hns3_client_uninit,
	.link_status_change = hns3_link_status_change,		.link_status_change = hns3_link_status_change,
	.setup_tc = hns3_client_setup_tc,		.setup_tc = hns3_client_setup_tc,
	.reset_notify = hns3_reset_notify,		.reset_notify = hns3_reset_notify,
			.process_hw_error = hns3_process_hw_error,
	};		};

	/* hns3_init_module - Driver registration routine		/* hns3_init_module - Driver registration routine

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -552,6 +552,11 @@ union l4_hdr_info {
	unsigned char *hdr;		unsigned char *hdr;
	};		};

			struct hns3_hw_error_info {
			enum hnae3_hw_error_type type;
			const char *msg;
			};

	static inline int ring_space(struct hns3_enet_ring *ring)		static inline int ring_space(struct hns3_enet_ring *ring)
	{		{
	/* This smp_load_acquire() pairs with smp_store_release() in		/* This smp_load_acquire() pairs with smp_store_release() in

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1325,10 +1325,12 @@ static int hclge_handle_pf_ras_error(struct hclge_dev *hdev,
	/* log PPU(RCB) errors */		/* log PPU(RCB) errors */
	desc_data = (__le32 *)&desc[3];		desc_data = (__le32 *)&desc[3];
	status = le32_to_cpu(*desc_data) & HCLGE_PPU_PF_INT_RAS_MASK;		status = le32_to_cpu(*desc_data) & HCLGE_PPU_PF_INT_RAS_MASK;
	if (status)		if (status) {
	hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST0",		hclge_log_error(dev, "PPU_PF_ABNORMAL_INT_ST0",
	&hclge_ppu_pf_abnormal_int[0], status,		&hclge_ppu_pf_abnormal_int[0], status,
	&ae_dev->hw_err_reset_req);		&ae_dev->hw_err_reset_req);
			hclge_report_hw_error(hdev, HNAE3_PPU_POISON_ERROR);
			}

	/* clear all PF RAS errors */		/* clear all PF RAS errors */
	hclge_cmd_reuse_desc(&desc[0], false);		hclge_cmd_reuse_desc(&desc[0], false);

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,7 @@
	#define __HCLGE_ERR_H		#define __HCLGE_ERR_H

	#include "hclge_main.h"		#include "hclge_main.h"
			#include "hnae3.h"

	#define HCLGE_MPF_RAS_INT_MIN_BD_NUM 10		#define HCLGE_MPF_RAS_INT_MIN_BD_NUM 10
	#define HCLGE_PF_RAS_INT_MIN_BD_NUM 4		#define HCLGE_PF_RAS_INT_MIN_BD_NUM 4