]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/blobdiff - drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c
net: hns3: remove existing process error functions and reorder hw_blk table
[mirror_ubuntu-bionic-kernel.git] / drivers / net / ethernet / hisilicon / hns3 / hns3pf / hclge_err.c
index 6da9e22d82d0c23f9b5cd9de50d4fb9935390b0d..ac9ab3c3b8a26e56ac627b1c866d129179885d50 100644 (file)
@@ -336,25 +336,6 @@ static const struct hclge_hw_error hclge_qcn_ecc_err_int[] = {
        { /* sentinel */ }
 };
 
-static void hclge_log_error(struct device *dev,
-                           const struct hclge_hw_error *err_list,
-                           u32 err_sts)
-{
-       const struct hclge_hw_error *err;
-       int i = 0;
-
-       while (err_list[i].msg) {
-               err = &err_list[i];
-               if (!(err->int_msk & err_sts)) {
-                       i++;
-                       continue;
-               }
-               dev_warn(dev, "%s [error status=0x%x] found\n",
-                        err->msg, err_sts);
-               i++;
-       }
-}
-
 /* hclge_cmd_query_error: read the error information
  * @hdev: pointer to struct hclge_dev
  * @desc: descriptor for describing the command
@@ -391,53 +372,6 @@ static int hclge_cmd_query_error(struct hclge_dev *hdev,
        return ret;
 }
 
-/* hclge_cmd_clear_error: clear the error status
- * @hdev: pointer to struct hclge_dev
- * @desc: descriptor for describing the command
- * @desc_src: prefilled descriptor from the previous command for reusing
- * @cmd:  command opcode
- * @flag: flag for extended command structure
- *
- * This function clear the error status in the hw register/s using command
- */
-static int hclge_cmd_clear_error(struct hclge_dev *hdev,
-                                struct hclge_desc *desc,
-                                struct hclge_desc *desc_src,
-                                u32 cmd, u16 flag)
-{
-       struct device *dev = &hdev->pdev->dev;
-       int num = 1;
-       int ret, i;
-
-       if (cmd) {
-               hclge_cmd_setup_basic_desc(&desc[0], cmd, false);
-               if (flag) {
-                       desc[0].flag |= cpu_to_le16(flag);
-                       hclge_cmd_setup_basic_desc(&desc[1], cmd, false);
-                       num = 2;
-               }
-               if (desc_src) {
-                       for (i = 0; i < 6; i++) {
-                               desc[0].data[i] = desc_src[0].data[i];
-                               if (flag)
-                                       desc[1].data[i] = desc_src[1].data[i];
-                       }
-               }
-       } else {
-               hclge_cmd_reuse_desc(&desc[0], false);
-               if (flag) {
-                       desc[0].flag |= cpu_to_le16(flag);
-                       hclge_cmd_reuse_desc(&desc[1], false);
-                       num = 2;
-               }
-       }
-       ret = hclge_cmd_send(&hdev->hw, &desc[0], num);
-       if (ret)
-               dev_err(dev, "clear error cmd failed (%d)\n", ret);
-
-       return ret;
-}
-
 static int hclge_enable_common_error(struct hclge_dev *hdev, bool en)
 {
        struct device *dev = &hdev->pdev->dev;
@@ -665,368 +599,23 @@ int hclge_enable_tm_hw_error(struct hclge_dev *hdev, bool en)
        return ret;
 }
 
-static void hclge_process_common_error(struct hclge_dev *hdev,
-                                      enum hclge_err_int_type type)
-{
-       struct device *dev = &hdev->pdev->dev;
-       struct hclge_desc desc[2];
-       u32 err_sts;
-       int ret;
-
-       /* read err sts */
-       ret = hclge_cmd_query_error(hdev, &desc[0],
-                                   HCLGE_COMMON_ECC_INT_CFG,
-                                   HCLGE_CMD_FLAG_NEXT, 0, 0);
-       if (ret) {
-               dev_err(dev,
-                       "failed(=%d) to query COMMON error interrupt status\n",
-                       ret);
-               return;
-       }
-
-       /* log err */
-       err_sts = (le32_to_cpu(desc[0].data[0])) & HCLGE_IMP_TCM_ECC_INT_MASK;
-       hclge_log_error(dev, &hclge_imp_tcm_ecc_int[0], err_sts);
-
-       err_sts = (le32_to_cpu(desc[0].data[1])) & HCLGE_CMDQ_ECC_INT_MASK;
-       hclge_log_error(dev, &hclge_cmdq_nic_mem_ecc_int[0], err_sts);
-
-       err_sts = (le32_to_cpu(desc[0].data[1]) >> HCLGE_CMDQ_ROC_ECC_INT_SHIFT)
-                  & HCLGE_CMDQ_ECC_INT_MASK;
-       hclge_log_error(dev, &hclge_cmdq_rocee_mem_ecc_int[0], err_sts);
-
-       if ((le32_to_cpu(desc[0].data[3])) & BIT(0))
-               dev_warn(dev, "imp_rd_data_poison_err found\n");
-
-       err_sts = (le32_to_cpu(desc[0].data[3]) >> HCLGE_TQP_ECC_INT_SHIFT) &
-                  HCLGE_TQP_ECC_INT_MASK;
-       hclge_log_error(dev, &hclge_tqp_int_ecc_int[0], err_sts);
-
-       err_sts = (le32_to_cpu(desc[0].data[5])) &
-                  HCLGE_IMP_ITCM4_ECC_INT_MASK;
-       hclge_log_error(dev, &hclge_imp_itcm4_ecc_int[0], err_sts);
-
-       /* clear error interrupts */
-       desc[1].data[0] = cpu_to_le32(HCLGE_IMP_TCM_ECC_CLR_MASK);
-       desc[1].data[1] = cpu_to_le32(HCLGE_CMDQ_NIC_ECC_CLR_MASK |
-                               HCLGE_CMDQ_ROCEE_ECC_CLR_MASK);
-       desc[1].data[3] = cpu_to_le32(HCLGE_TQP_IMP_ERR_CLR_MASK);
-       desc[1].data[5] = cpu_to_le32(HCLGE_IMP_ITCM4_ECC_CLR_MASK);
-
-       ret = hclge_cmd_clear_error(hdev, &desc[0], NULL, 0,
-                                   HCLGE_CMD_FLAG_NEXT);
-       if (ret)
-               dev_err(dev,
-                       "failed(%d) to clear COMMON error interrupt status\n",
-                       ret);
-}
-
-static void hclge_process_ncsi_error(struct hclge_dev *hdev,
-                                    enum hclge_err_int_type type)
-{
-       struct device *dev = &hdev->pdev->dev;
-       struct hclge_desc desc_rd;
-       struct hclge_desc desc_wr;
-       u32 err_sts;
-       int ret;
-
-       if (hdev->pdev->revision < 0x21)
-               return;
-
-       /* read NCSI error status */
-       ret = hclge_cmd_query_error(hdev, &desc_rd, HCLGE_NCSI_INT_QUERY,
-                                   0, 1, HCLGE_NCSI_ERR_INT_TYPE);
-       if (ret) {
-               dev_err(dev,
-                       "failed(=%d) to query NCSI error interrupt status\n",
-                       ret);
-               return;
-       }
-
-       /* log err */
-       err_sts = le32_to_cpu(desc_rd.data[0]);
-       hclge_log_error(dev, &hclge_ncsi_err_int[0], err_sts);
-
-       /* clear err int */
-       ret = hclge_cmd_clear_error(hdev, &desc_wr, &desc_rd,
-                                   HCLGE_NCSI_INT_CLR, 0);
-       if (ret)
-               dev_err(dev, "failed(=%d) to clear NCSI interrupt status\n",
-                       ret);
-}
-
-static void hclge_process_igu_egu_error(struct hclge_dev *hdev,
-                                       enum hclge_err_int_type int_type)
-{
-       struct device *dev = &hdev->pdev->dev;
-       struct hclge_desc desc_rd;
-       struct hclge_desc desc_wr;
-       u32 err_sts;
-       int ret;
-
-       /* read IGU common err sts */
-       ret = hclge_cmd_query_error(hdev, &desc_rd,
-                                   HCLGE_IGU_COMMON_INT_QUERY,
-                                   0, 1, int_type);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to query IGU common int status\n",
-                       ret);
-               return;
-       }
-
-       /* log err */
-       err_sts = le32_to_cpu(desc_rd.data[0]) &
-                                  HCLGE_IGU_COM_INT_MASK;
-       hclge_log_error(dev, &hclge_igu_com_err_int[0], err_sts);
-
-       /* clear err int */
-       ret = hclge_cmd_clear_error(hdev, &desc_wr, &desc_rd,
-                                   HCLGE_IGU_COMMON_INT_CLR, 0);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to clear IGU common int status\n",
-                       ret);
-               return;
-       }
-
-       /* read IGU-EGU TNL err sts */
-       ret = hclge_cmd_query_error(hdev, &desc_rd,
-                                   HCLGE_IGU_EGU_TNL_INT_QUERY,
-                                   0, 1, int_type);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to query IGU-EGU TNL int status\n",
-                       ret);
-               return;
-       }
-
-       /* log err */
-       err_sts = le32_to_cpu(desc_rd.data[0]) &
-                                  HCLGE_IGU_EGU_TNL_INT_MASK;
-       hclge_log_error(dev, &hclge_igu_egu_tnl_err_int[0], err_sts);
-
-       /* clear err int */
-       ret = hclge_cmd_clear_error(hdev, &desc_wr, &desc_rd,
-                                   HCLGE_IGU_EGU_TNL_INT_CLR, 0);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to clear IGU-EGU TNL int status\n",
-                       ret);
-               return;
-       }
-
-       hclge_process_ncsi_error(hdev, HCLGE_ERR_INT_RAS_NFE);
-}
-
-static int hclge_log_and_clear_ppp_error(struct hclge_dev *hdev, u32 cmd,
-                                        enum hclge_err_int_type int_type)
-{
-       struct device *dev = &hdev->pdev->dev;
-       const struct hclge_hw_error *hw_err_lst1, *hw_err_lst2, *hw_err_lst3;
-       struct hclge_desc desc[2];
-       u32 err_sts;
-       int ret;
-
-       /* read PPP INT sts */
-       ret = hclge_cmd_query_error(hdev, &desc[0], cmd,
-                                   HCLGE_CMD_FLAG_NEXT, 5, int_type);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to query PPP interrupt status\n",
-                       ret);
-               return -EIO;
-       }
-
-       /* log error */
-       if (cmd == HCLGE_PPP_CMD0_INT_CMD) {
-               hw_err_lst1 = &hclge_ppp_mpf_int0[0];
-               hw_err_lst2 = &hclge_ppp_mpf_int1[0];
-               hw_err_lst3 = &hclge_ppp_pf_int[0];
-       } else if (cmd == HCLGE_PPP_CMD1_INT_CMD) {
-               hw_err_lst1 = &hclge_ppp_mpf_int2[0];
-               hw_err_lst2 = &hclge_ppp_mpf_int3[0];
-       } else {
-               dev_err(dev, "invalid command(=%d)\n", cmd);
-               return -EINVAL;
-       }
-
-       err_sts = le32_to_cpu(desc[0].data[2]);
-       if (err_sts)
-               hclge_log_error(dev, hw_err_lst1, err_sts);
-
-       err_sts = le32_to_cpu(desc[0].data[3]);
-       if (err_sts)
-               hclge_log_error(dev, hw_err_lst2, err_sts);
-
-       if (cmd == HCLGE_PPP_CMD0_INT_CMD) {
-               err_sts = (le32_to_cpu(desc[0].data[4]) >> 8) & 0x3;
-               if (err_sts)
-                       hclge_log_error(dev, hw_err_lst3, err_sts);
-       }
-
-       /* clear PPP INT */
-       ret = hclge_cmd_clear_error(hdev, &desc[0], NULL, 0,
-                                   HCLGE_CMD_FLAG_NEXT);
-       if (ret) {
-               dev_err(dev, "failed(=%d) to clear PPP interrupt status\n",
-                       ret);
-               return -EIO;
-       }
-
-       return 0;
-}
-
-static void hclge_process_ppp_error(struct hclge_dev *hdev,
-                                   enum hclge_err_int_type int_type)
-{
-       struct device *dev = &hdev->pdev->dev;
-       int ret;
-
-       /* read PPP INT0,1 sts */
-       ret = hclge_log_and_clear_ppp_error(hdev, HCLGE_PPP_CMD0_INT_CMD,
-                                           int_type);
-       if (ret < 0) {
-               dev_err(dev, "failed(=%d) to clear PPP interrupt 0,1 status\n",
-                       ret);
-               return;
-       }
-
-       /* read err PPP INT2,3 sts */
-       ret = hclge_log_and_clear_ppp_error(hdev, HCLGE_PPP_CMD1_INT_CMD,
-                                           int_type);
-       if (ret < 0)
-               dev_err(dev, "failed(=%d) to clear PPP interrupt 2,3 status\n",
-                       ret);
-}
-
-static void hclge_process_tm_sch_error(struct hclge_dev *hdev)
-{
-       struct device *dev = &hdev->pdev->dev;
-       const struct hclge_tm_sch_ecc_info *tm_sch_ecc_info;
-       struct hclge_desc desc;
-       u32 ecc_info;
-       u8 module_no;
-       u8 ram_no;
-       int ret;
-
-       /* read TM scheduler errors */
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_SCH_MBIT_ECC_INFO_CMD, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read SCH mbit ECC err info\n", ret);
-               return;
-       }
-       ecc_info = le32_to_cpu(desc.data[0]);
-
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_SCH_ECC_ERR_RINT_CMD, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read SCH ECC err status\n", ret);
-               return;
-       }
-
-       /* log TM scheduler errors */
-       if (le32_to_cpu(desc.data[0])) {
-               hclge_log_error(dev, &hclge_tm_sch_err_int[0],
-                               le32_to_cpu(desc.data[0]));
-               if (le32_to_cpu(desc.data[0]) & 0x2) {
-                       module_no = (ecc_info >> 20) & 0xF;
-                       ram_no = (ecc_info >> 16) & 0xF;
-                       tm_sch_ecc_info =
-                               &hclge_tm_sch_ecc_err[module_no][ram_no];
-                       dev_warn(dev, "ecc err module:ram=%s\n",
-                                tm_sch_ecc_info->name);
-                       dev_warn(dev, "ecc memory address = 0x%x\n",
-                                ecc_info & 0xFFFF);
-               }
-       }
-
-       /* clear TM scheduler errors */
-       ret = hclge_cmd_clear_error(hdev, &desc, NULL, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to clear TM SCH error status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_SCH_ECC_ERR_RINT_CE, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read SCH CE status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_clear_error(hdev, &desc, NULL, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to clear TM SCH CE status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_SCH_ECC_ERR_RINT_NFE, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read SCH NFE status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_clear_error(hdev, &desc, NULL, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to clear TM SCH NFE status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_SCH_ECC_ERR_RINT_FE, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read SCH FE status\n", ret);
-               return;
-       }
-
-       ret = hclge_cmd_clear_error(hdev, &desc, NULL, 0, 0);
-       if (ret)
-               dev_err(dev, "failed(%d) to clear TM SCH FE status\n", ret);
-}
-
-static void hclge_process_tm_qcn_error(struct hclge_dev *hdev)
-{
-       struct device *dev = &hdev->pdev->dev;
-       struct hclge_desc desc;
-       int ret;
-
-       /* read QCN errors */
-       ret = hclge_cmd_query_error(hdev, &desc,
-                                   HCLGE_TM_QCN_MEM_INT_INFO_CMD, 0, 0, 0);
-       if (ret) {
-               dev_err(dev, "failed(%d) to read QCN ECC err status\n", ret);
-               return;
-       }
-
-       /* log QCN errors */
-       if (le32_to_cpu(desc.data[0]))
-               hclge_log_error(dev, &hclge_qcn_ecc_err_int[0],
-                               le32_to_cpu(desc.data[0]));
-
-       /* clear QCN errors */
-       ret = hclge_cmd_clear_error(hdev, &desc, NULL, 0, 0);
-       if (ret)
-               dev_err(dev, "failed(%d) to clear QCN error status\n", ret);
-}
-
-static void hclge_process_tm_error(struct hclge_dev *hdev,
-                                  enum hclge_err_int_type type)
-{
-       hclge_process_tm_sch_error(hdev);
-       hclge_process_tm_qcn_error(hdev);
-}
-
 static const struct hclge_hw_blk hw_blk[] = {
-       { .msk = BIT(0), .name = "IGU_EGU",
+       {
+         .msk = BIT(0), .name = "IGU_EGU",
          .enable_error = hclge_enable_igu_egu_error,
-         .process_error = hclge_process_igu_egu_error, },
-       { .msk = BIT(5), .name = "COMMON",
-         .enable_error = hclge_enable_common_error,
-         .process_error = hclge_process_common_error, },
-       { .msk = BIT(4), .name = "TM",
-         .enable_error = hclge_enable_tm_hw_error,
-         .process_error = hclge_process_tm_error, },
-       { .msk = BIT(1), .name = "PPP",
+       },
+       {
+         .msk = BIT(1), .name = "PPP",
          .enable_error = hclge_enable_ppp_error,
-         .process_error = hclge_process_ppp_error, },
+       },
+       {
+         .msk = BIT(4), .name = "TM",
+         .enable_error = hclge_enable_tm_hw_error,
+       },
+       {
+         .msk = BIT(5), .name = "COMMON",
+         .enable_error = hclge_enable_common_error,
+       },
        { /* sentinel */ }
 };
 
@@ -1056,28 +645,13 @@ pci_ers_result_t hclge_process_ras_hw_error(struct hnae3_ae_dev *ae_dev)
 {
        struct hclge_dev *hdev = ae_dev->priv;
        struct device *dev = &hdev->pdev->dev;
-       u32 sts, val;
-       int i = 0;
+       u32 sts;
 
        sts = hclge_read_dev(&hdev->hw, HCLGE_RAS_PF_OTHER_INT_STS_REG);
 
-       /* Processing Non-fatal errors */
-       if (sts & HCLGE_RAS_REG_NFE_MASK) {
-               val = (sts >> HCLGE_RAS_REG_NFE_SHIFT) & 0xFF;
-               i = 0;
-               while (hw_blk[i].name) {
-                       if (!(hw_blk[i].msk & val)) {
-                               i++;
-                               continue;
-                       }
-                       dev_warn(dev, "%s ras non-fatal error identified\n",
-                                hw_blk[i].name);
-                       if (hw_blk[i].process_error)
-                               hw_blk[i].process_error(hdev,
-                                                        HCLGE_ERR_INT_RAS_NFE);
-                       i++;
-               }
-       }
+       /* Handling Non-fatal RAS errors */
+       if (sts & HCLGE_RAS_REG_NFE_MASK)
+               dev_warn(dev, "HNS Non-Fatal RAS error identified\n");
 
        return PCI_ERS_RESULT_NEED_RESET;
 }