From c81f5e62cb6cd01de5449375e96da47ab4167c15 Mon Sep 17 00:00:00 2001 From: Huazhong Tan Date: Mon, 22 Jul 2019 10:43:44 +0800 Subject: [PATCH] net: hns3: modify two macro definition driver inclusion category: bugfix bugzilla: NA CVE: NA Async two macro definition with M7. Also adds a hardware error check to hclge_handle_mpf_ras_error() which has been removed incorrectly. Fixes: 7cc5f1c13564 ("net: hns3: add support for handling IMP error") Feature or Bugfix:Bugfix Signed-off-by: Huazhong Tan Reviewed-by: linyunsheng Reviewed-by: Yang Yingliang Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 +++ drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c index fde1013008f4..dfb82073ee24 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c @@ -1142,6 +1142,9 @@ static int hclge_handle_mpf_ras_error(struct hclge_dev *hdev, &hclge_cmdq_nic_mem_ecc_int[0], status, &ae_dev->hw_err_reset_req); + if ((le32_to_cpu(desc[0].data[2])) & BIT(0)) + dev_warn(dev, "imp_rd_data_poison_err found\n"); + status = le32_to_cpu(desc[0].data[3]); if (status) hclge_log_error(dev, "TQP_INT_ECC_INT_STS", diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h index d93304ebb3f1..fbb18c3655c7 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h @@ -183,8 +183,8 @@ enum HLCGE_PORT_TYPE { #define HCLGE_VECTOR0_RX_CMDQ_INT_B 1 #define HCLGE_VECTOR0_IMP_RESET_INT_B 1 -#define HCLGE_VECTOR0_IMP_RD_POISON_B 4 -#define HCLGE_VECTOR0_IMP_CMDQ_ERR_B 5 +#define HCLGE_VECTOR0_IMP_CMDQ_ERR_B 4 +#define HCLGE_VECTOR0_IMP_RD_POISON_B 5 #define HCLGE_MAC_DEFAULT_FRAME \ (ETH_HLEN + ETH_FCS_LEN + 2 * VLAN_HLEN + ETH_DATA_LEN) -- GitLab