/******************** Doorbell Recovery end ****************/
 
+/********************************** NIG LLH ***********************************/
+
+enum qed_llh_filter_type {
+       QED_LLH_FILTER_TYPE_MAC,
+       QED_LLH_FILTER_TYPE_PROTOCOL,
+};
+
+struct qed_llh_mac_filter {
+       u8 addr[ETH_ALEN];
+};
+
+struct qed_llh_protocol_filter {
+       enum qed_llh_prot_filter_type_t type;
+       u16 source_port_or_eth_type;
+       u16 dest_port;
+};
+
+union qed_llh_filter {
+       struct qed_llh_mac_filter mac;
+       struct qed_llh_protocol_filter protocol;
+};
+
+struct qed_llh_filter_info {
+       bool b_enabled;
+       u32 ref_cnt;
+       enum qed_llh_filter_type type;
+       union qed_llh_filter filter;
+};
+
+struct qed_llh_info {
+       /* Number of LLH filters banks */
+       u8 num_ppfid;
+
+#define MAX_NUM_PPFID   8
+       u8 ppfid_array[MAX_NUM_PPFID];
+
+       /* Array of filters arrays:
+        * "num_ppfid" elements of filters banks, where each is an array of
+        * "NIG_REG_LLH_FUNC_FILTER_EN_SIZE" filters.
+        */
+       struct qed_llh_filter_info **pp_filters;
+};
+
+static void qed_llh_free(struct qed_dev *cdev)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+       u32 i;
+
+       if (p_llh_info) {
+               if (p_llh_info->pp_filters)
+                       for (i = 0; i < p_llh_info->num_ppfid; i++)
+                               kfree(p_llh_info->pp_filters[i]);
+
+               kfree(p_llh_info->pp_filters);
+       }
+
+       kfree(p_llh_info);
+       cdev->p_llh_info = NULL;
+}
+
+static int qed_llh_alloc(struct qed_dev *cdev)
+{
+       struct qed_llh_info *p_llh_info;
+       u32 size, i;
+
+       p_llh_info = kzalloc(sizeof(*p_llh_info), GFP_KERNEL);
+       if (!p_llh_info)
+               return -ENOMEM;
+       cdev->p_llh_info = p_llh_info;
+
+       for (i = 0; i < MAX_NUM_PPFID; i++) {
+               if (!(cdev->ppfid_bitmap & (0x1 << i)))
+                       continue;
+
+               p_llh_info->ppfid_array[p_llh_info->num_ppfid] = i;
+               DP_VERBOSE(cdev, QED_MSG_SP, "ppfid_array[%d] = %hhd\n",
+                          p_llh_info->num_ppfid, i);
+               p_llh_info->num_ppfid++;
+       }
+
+       size = p_llh_info->num_ppfid * sizeof(*p_llh_info->pp_filters);
+       p_llh_info->pp_filters = kzalloc(size, GFP_KERNEL);
+       if (!p_llh_info->pp_filters)
+               return -ENOMEM;
+
+       size = NIG_REG_LLH_FUNC_FILTER_EN_SIZE *
+           sizeof(**p_llh_info->pp_filters);
+       for (i = 0; i < p_llh_info->num_ppfid; i++) {
+               p_llh_info->pp_filters[i] = kzalloc(size, GFP_KERNEL);
+               if (!p_llh_info->pp_filters[i])
+                       return -ENOMEM;
+       }
+
+       return 0;
+}
+
+static int qed_llh_shadow_sanity(struct qed_dev *cdev,
+                                u8 ppfid, u8 filter_idx, const char *action)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+
+       if (ppfid >= p_llh_info->num_ppfid) {
+               DP_NOTICE(cdev,
+                         "LLH shadow [%s]: using ppfid %d while only %d ppfids are available\n",
+                         action, ppfid, p_llh_info->num_ppfid);
+               return -EINVAL;
+       }
+
+       if (filter_idx >= NIG_REG_LLH_FUNC_FILTER_EN_SIZE) {
+               DP_NOTICE(cdev,
+                         "LLH shadow [%s]: using filter_idx %d while only %d filters are available\n",
+                         action, filter_idx, NIG_REG_LLH_FUNC_FILTER_EN_SIZE);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+#define QED_LLH_INVALID_FILTER_IDX      0xff
+
+static int
+qed_llh_shadow_search_filter(struct qed_dev *cdev,
+                            u8 ppfid,
+                            union qed_llh_filter *p_filter, u8 *p_filter_idx)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+       struct qed_llh_filter_info *p_filters;
+       int rc;
+       u8 i;
+
+       rc = qed_llh_shadow_sanity(cdev, ppfid, 0, "search");
+       if (rc)
+               return rc;
+
+       *p_filter_idx = QED_LLH_INVALID_FILTER_IDX;
+
+       p_filters = p_llh_info->pp_filters[ppfid];
+       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
+               if (!memcmp(p_filter, &p_filters[i].filter,
+                           sizeof(*p_filter))) {
+                       *p_filter_idx = i;
+                       break;
+               }
+       }
+
+       return 0;
+}
+
+static int
+qed_llh_shadow_get_free_idx(struct qed_dev *cdev, u8 ppfid, u8 *p_filter_idx)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+       struct qed_llh_filter_info *p_filters;
+       int rc;
+       u8 i;
+
+       rc = qed_llh_shadow_sanity(cdev, ppfid, 0, "get_free_idx");
+       if (rc)
+               return rc;
+
+       *p_filter_idx = QED_LLH_INVALID_FILTER_IDX;
+
+       p_filters = p_llh_info->pp_filters[ppfid];
+       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
+               if (!p_filters[i].b_enabled) {
+                       *p_filter_idx = i;
+                       break;
+               }
+       }
+
+       return 0;
+}
+
+static int
+__qed_llh_shadow_add_filter(struct qed_dev *cdev,
+                           u8 ppfid,
+                           u8 filter_idx,
+                           enum qed_llh_filter_type type,
+                           union qed_llh_filter *p_filter, u32 *p_ref_cnt)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+       struct qed_llh_filter_info *p_filters;
+       int rc;
+
+       rc = qed_llh_shadow_sanity(cdev, ppfid, filter_idx, "add");
+       if (rc)
+               return rc;
+
+       p_filters = p_llh_info->pp_filters[ppfid];
+       if (!p_filters[filter_idx].ref_cnt) {
+               p_filters[filter_idx].b_enabled = true;
+               p_filters[filter_idx].type = type;
+               memcpy(&p_filters[filter_idx].filter, p_filter,
+                      sizeof(p_filters[filter_idx].filter));
+       }
+
+       *p_ref_cnt = ++p_filters[filter_idx].ref_cnt;
+
+       return 0;
+}
+
+static int
+qed_llh_shadow_add_filter(struct qed_dev *cdev,
+                         u8 ppfid,
+                         enum qed_llh_filter_type type,
+                         union qed_llh_filter *p_filter,
+                         u8 *p_filter_idx, u32 *p_ref_cnt)
+{
+       int rc;
+
+       /* Check if the same filter already exist */
+       rc = qed_llh_shadow_search_filter(cdev, ppfid, p_filter, p_filter_idx);
+       if (rc)
+               return rc;
+
+       /* Find a new entry in case of a new filter */
+       if (*p_filter_idx == QED_LLH_INVALID_FILTER_IDX) {
+               rc = qed_llh_shadow_get_free_idx(cdev, ppfid, p_filter_idx);
+               if (rc)
+                       return rc;
+       }
+
+       /* No free entry was found */
+       if (*p_filter_idx == QED_LLH_INVALID_FILTER_IDX) {
+               DP_NOTICE(cdev,
+                         "Failed to find an empty LLH filter to utilize [ppfid %d]\n",
+                         ppfid);
+               return -EINVAL;
+       }
+
+       return __qed_llh_shadow_add_filter(cdev, ppfid, *p_filter_idx, type,
+                                          p_filter, p_ref_cnt);
+}
+
+static int
+__qed_llh_shadow_remove_filter(struct qed_dev *cdev,
+                              u8 ppfid, u8 filter_idx, u32 *p_ref_cnt)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+       struct qed_llh_filter_info *p_filters;
+       int rc;
+
+       rc = qed_llh_shadow_sanity(cdev, ppfid, filter_idx, "remove");
+       if (rc)
+               return rc;
+
+       p_filters = p_llh_info->pp_filters[ppfid];
+       if (!p_filters[filter_idx].ref_cnt) {
+               DP_NOTICE(cdev,
+                         "LLH shadow: trying to remove a filter with ref_cnt=0\n");
+               return -EINVAL;
+       }
+
+       *p_ref_cnt = --p_filters[filter_idx].ref_cnt;
+       if (!p_filters[filter_idx].ref_cnt)
+               memset(&p_filters[filter_idx],
+                      0, sizeof(p_filters[filter_idx]));
+
+       return 0;
+}
+
+static int
+qed_llh_shadow_remove_filter(struct qed_dev *cdev,
+                            u8 ppfid,
+                            union qed_llh_filter *p_filter,
+                            u8 *p_filter_idx, u32 *p_ref_cnt)
+{
+       int rc;
+
+       rc = qed_llh_shadow_search_filter(cdev, ppfid, p_filter, p_filter_idx);
+       if (rc)
+               return rc;
+
+       /* No matching filter was found */
+       if (*p_filter_idx == QED_LLH_INVALID_FILTER_IDX) {
+               DP_NOTICE(cdev, "Failed to find a filter in the LLH shadow\n");
+               return -EINVAL;
+       }
+
+       return __qed_llh_shadow_remove_filter(cdev, ppfid, *p_filter_idx,
+                                             p_ref_cnt);
+}
+
+static int qed_llh_abs_ppfid(struct qed_dev *cdev, u8 ppfid, u8 *p_abs_ppfid)
+{
+       struct qed_llh_info *p_llh_info = cdev->p_llh_info;
+
+       if (ppfid >= p_llh_info->num_ppfid) {
+               DP_NOTICE(cdev,
+                         "ppfid %d is not valid, available indices are 0..%hhd\n",
+                         ppfid, p_llh_info->num_ppfid - 1);
+               return -EINVAL;
+       }
+
+       *p_abs_ppfid = p_llh_info->ppfid_array[ppfid];
+
+       return 0;
+}
+
+static int
+qed_llh_set_engine_affin(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
+{
+       struct qed_dev *cdev = p_hwfn->cdev;
+       enum qed_eng eng;
+       u8 ppfid;
+       int rc;
+
+       rc = qed_mcp_get_engine_config(p_hwfn, p_ptt);
+       if (rc != 0 && rc != -EOPNOTSUPP) {
+               DP_NOTICE(p_hwfn,
+                         "Failed to get the engine affinity configuration\n");
+               return rc;
+       }
+
+       /* RoCE PF is bound to a single engine */
+       if (QED_IS_ROCE_PERSONALITY(p_hwfn)) {
+               eng = cdev->fir_affin ? QED_ENG1 : QED_ENG0;
+               rc = qed_llh_set_roce_affinity(cdev, eng);
+               if (rc) {
+                       DP_NOTICE(cdev,
+                                 "Failed to set the RoCE engine affinity\n");
+                       return rc;
+               }
+
+               DP_VERBOSE(cdev,
+                          QED_MSG_SP,
+                          "LLH: Set the engine affinity of RoCE packets as %d\n",
+                          eng);
+       }
+
+       /* Storage PF is bound to a single engine while L2 PF uses both */
+       if (QED_IS_FCOE_PERSONALITY(p_hwfn) || QED_IS_ISCSI_PERSONALITY(p_hwfn))
+               eng = cdev->fir_affin ? QED_ENG1 : QED_ENG0;
+       else                    /* L2_PERSONALITY */
+               eng = QED_BOTH_ENG;
+
+       for (ppfid = 0; ppfid < cdev->p_llh_info->num_ppfid; ppfid++) {
+               rc = qed_llh_set_ppfid_affinity(cdev, ppfid, eng);
+               if (rc) {
+                       DP_NOTICE(cdev,
+                                 "Failed to set the engine affinity of ppfid %d\n",
+                                 ppfid);
+                       return rc;
+               }
+       }
+
+       DP_VERBOSE(cdev, QED_MSG_SP,
+                  "LLH: Set the engine affinity of non-RoCE packets as %d\n",
+                  eng);
+
+       return 0;
+}
+
+static int qed_llh_hw_init_pf(struct qed_hwfn *p_hwfn,
+                             struct qed_ptt *p_ptt)
+{
+       struct qed_dev *cdev = p_hwfn->cdev;
+       u8 ppfid, abs_ppfid;
+       int rc;
+
+       for (ppfid = 0; ppfid < cdev->p_llh_info->num_ppfid; ppfid++) {
+               u32 addr;
+
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       return rc;
+
+               addr = NIG_REG_LLH_PPFID2PFID_TBL_0 + abs_ppfid * 0x4;
+               qed_wr(p_hwfn, p_ptt, addr, p_hwfn->rel_pf_id);
+       }
+
+       if (test_bit(QED_MF_LLH_MAC_CLSS, &cdev->mf_bits) &&
+           !QED_IS_FCOE_PERSONALITY(p_hwfn)) {
+               rc = qed_llh_add_mac_filter(cdev, 0,
+                                           p_hwfn->hw_info.hw_mac_addr);
+               if (rc)
+                       DP_NOTICE(cdev,
+                                 "Failed to add an LLH filter with the primary MAC\n");
+       }
+
+       if (QED_IS_CMT(cdev)) {
+               rc = qed_llh_set_engine_affin(p_hwfn, p_ptt);
+               if (rc)
+                       return rc;
+       }
+
+       return 0;
+}
+
+u8 qed_llh_get_num_ppfid(struct qed_dev *cdev)
+{
+       return cdev->p_llh_info->num_ppfid;
+}
+
+#define NIG_REG_PPF_TO_ENGINE_SEL_ROCE_MASK             0x3
+#define NIG_REG_PPF_TO_ENGINE_SEL_ROCE_SHIFT            0
+#define NIG_REG_PPF_TO_ENGINE_SEL_NON_ROCE_MASK         0x3
+#define NIG_REG_PPF_TO_ENGINE_SEL_NON_ROCE_SHIFT        2
+
+int qed_llh_set_ppfid_affinity(struct qed_dev *cdev, u8 ppfid, enum qed_eng eng)
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       u32 addr, val, eng_sel;
+       u8 abs_ppfid;
+       int rc = 0;
+
+       if (!p_ptt)
+               return -EAGAIN;
+
+       if (!QED_IS_CMT(cdev))
+               goto out;
+
+       rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+       if (rc)
+               goto out;
+
+       switch (eng) {
+       case QED_ENG0:
+               eng_sel = 0;
+               break;
+       case QED_ENG1:
+               eng_sel = 1;
+               break;
+       case QED_BOTH_ENG:
+               eng_sel = 2;
+               break;
+       default:
+               DP_NOTICE(cdev, "Invalid affinity value for ppfid [%d]\n", eng);
+               rc = -EINVAL;
+               goto out;
+       }
+
+       addr = NIG_REG_PPF_TO_ENGINE_SEL + abs_ppfid * 0x4;
+       val = qed_rd(p_hwfn, p_ptt, addr);
+       SET_FIELD(val, NIG_REG_PPF_TO_ENGINE_SEL_NON_ROCE, eng_sel);
+       qed_wr(p_hwfn, p_ptt, addr, val);
+
+       /* The iWARP affinity is set as the affinity of ppfid 0 */
+       if (!ppfid && QED_IS_IWARP_PERSONALITY(p_hwfn))
+               cdev->iwarp_affin = (eng == QED_ENG1) ? 1 : 0;
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+
+       return rc;
+}
+
+int qed_llh_set_roce_affinity(struct qed_dev *cdev, enum qed_eng eng)
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       u32 addr, val, eng_sel;
+       u8 ppfid, abs_ppfid;
+       int rc = 0;
+
+       if (!p_ptt)
+               return -EAGAIN;
+
+       if (!QED_IS_CMT(cdev))
+               goto out;
+
+       switch (eng) {
+       case QED_ENG0:
+               eng_sel = 0;
+               break;
+       case QED_ENG1:
+               eng_sel = 1;
+               break;
+       case QED_BOTH_ENG:
+               eng_sel = 2;
+               qed_wr(p_hwfn, p_ptt, NIG_REG_LLH_ENG_CLS_ROCE_QP_SEL,
+                      0xf);  /* QP bit 15 */
+               break;
+       default:
+               DP_NOTICE(cdev, "Invalid affinity value for RoCE [%d]\n", eng);
+               rc = -EINVAL;
+               goto out;
+       }
+
+       for (ppfid = 0; ppfid < cdev->p_llh_info->num_ppfid; ppfid++) {
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       goto out;
+
+               addr = NIG_REG_PPF_TO_ENGINE_SEL + abs_ppfid * 0x4;
+               val = qed_rd(p_hwfn, p_ptt, addr);
+               SET_FIELD(val, NIG_REG_PPF_TO_ENGINE_SEL_ROCE, eng_sel);
+               qed_wr(p_hwfn, p_ptt, addr, val);
+       }
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+
+       return rc;
+}
+
+struct qed_llh_filter_details {
+       u64 value;
+       u32 mode;
+       u32 protocol_type;
+       u32 hdr_sel;
+       u32 enable;
+};
+
+static int
+qed_llh_access_filter(struct qed_hwfn *p_hwfn,
+                     struct qed_ptt *p_ptt,
+                     u8 abs_ppfid,
+                     u8 filter_idx,
+                     struct qed_llh_filter_details *p_details)
+{
+       struct qed_dmae_params params = {0};
+       u32 addr;
+       u8 pfid;
+       int rc;
+
+       /* The NIG/LLH registers that are accessed in this function have only 16
+        * rows which are exposed to a PF. I.e. only the 16 filters of its
+        * default ppfid. Accessing filters of other ppfids requires pretending
+        * to another PFs.
+        * The calculation of PPFID->PFID in AH is based on the relative index
+        * of a PF on its port.
+        * For BB the pfid is actually the abs_ppfid.
+        */
+       if (QED_IS_BB(p_hwfn->cdev))
+               pfid = abs_ppfid;
+       else
+               pfid = abs_ppfid * p_hwfn->cdev->num_ports_in_engine +
+                   MFW_PORT(p_hwfn);
+
+       /* Filter enable - should be done first when removing a filter */
+       if (!p_details->enable) {
+               qed_fid_pretend(p_hwfn, p_ptt,
+                               pfid << PXP_PRETEND_CONCRETE_FID_PFID_SHIFT);
+
+               addr = NIG_REG_LLH_FUNC_FILTER_EN + filter_idx * 0x4;
+               qed_wr(p_hwfn, p_ptt, addr, p_details->enable);
+
+               qed_fid_pretend(p_hwfn, p_ptt,
+                               p_hwfn->rel_pf_id <<
+                               PXP_PRETEND_CONCRETE_FID_PFID_SHIFT);
+       }
+
+       /* Filter value */
+       addr = NIG_REG_LLH_FUNC_FILTER_VALUE + 2 * filter_idx * 0x4;
+
+       params.flags = QED_DMAE_FLAG_PF_DST;
+       params.dst_pfid = pfid;
+       rc = qed_dmae_host2grc(p_hwfn,
+                              p_ptt,
+                              (u64)(uintptr_t)&p_details->value,
+                              addr, 2 /* size_in_dwords */,
+                              ¶ms);
+       if (rc)
+               return rc;
+
+       qed_fid_pretend(p_hwfn, p_ptt,
+                       pfid << PXP_PRETEND_CONCRETE_FID_PFID_SHIFT);
+
+       /* Filter mode */
+       addr = NIG_REG_LLH_FUNC_FILTER_MODE + filter_idx * 0x4;
+       qed_wr(p_hwfn, p_ptt, addr, p_details->mode);
+
+       /* Filter protocol type */
+       addr = NIG_REG_LLH_FUNC_FILTER_PROTOCOL_TYPE + filter_idx * 0x4;
+       qed_wr(p_hwfn, p_ptt, addr, p_details->protocol_type);
+
+       /* Filter header select */
+       addr = NIG_REG_LLH_FUNC_FILTER_HDR_SEL + filter_idx * 0x4;
+       qed_wr(p_hwfn, p_ptt, addr, p_details->hdr_sel);
+
+       /* Filter enable - should be done last when adding a filter */
+       if (p_details->enable) {
+               addr = NIG_REG_LLH_FUNC_FILTER_EN + filter_idx * 0x4;
+               qed_wr(p_hwfn, p_ptt, addr, p_details->enable);
+       }
+
+       qed_fid_pretend(p_hwfn, p_ptt,
+                       p_hwfn->rel_pf_id <<
+                       PXP_PRETEND_CONCRETE_FID_PFID_SHIFT);
+
+       return 0;
+}
+
+static int
+qed_llh_add_filter(struct qed_hwfn *p_hwfn,
+                  struct qed_ptt *p_ptt,
+                  u8 abs_ppfid,
+                  u8 filter_idx, u8 filter_prot_type, u32 high, u32 low)
+{
+       struct qed_llh_filter_details filter_details;
+
+       filter_details.enable = 1;
+       filter_details.value = ((u64)high << 32) | low;
+       filter_details.hdr_sel = 0;
+       filter_details.protocol_type = filter_prot_type;
+       /* Mode: 0: MAC-address classification 1: protocol classification */
+       filter_details.mode = filter_prot_type ? 1 : 0;
+
+       return qed_llh_access_filter(p_hwfn, p_ptt, abs_ppfid, filter_idx,
+                                    &filter_details);
+}
+
+static int
+qed_llh_remove_filter(struct qed_hwfn *p_hwfn,
+                     struct qed_ptt *p_ptt, u8 abs_ppfid, u8 filter_idx)
+{
+       struct qed_llh_filter_details filter_details = {0};
+
+       return qed_llh_access_filter(p_hwfn, p_ptt, abs_ppfid, filter_idx,
+                                    &filter_details);
+}
+
+int qed_llh_add_mac_filter(struct qed_dev *cdev,
+                          u8 ppfid, u8 mac_addr[ETH_ALEN])
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       union qed_llh_filter filter = {};
+       u8 filter_idx, abs_ppfid;
+       u32 high, low, ref_cnt;
+       int rc = 0;
+
+       if (!p_ptt)
+               return -EAGAIN;
+
+       if (!test_bit(QED_MF_LLH_MAC_CLSS, &cdev->mf_bits))
+               goto out;
+
+       memcpy(filter.mac.addr, mac_addr, ETH_ALEN);
+       rc = qed_llh_shadow_add_filter(cdev, ppfid,
+                                      QED_LLH_FILTER_TYPE_MAC,
+                                      &filter, &filter_idx, &ref_cnt);
+       if (rc)
+               goto err;
+
+       /* Configure the LLH only in case of a new the filter */
+       if (ref_cnt == 1) {
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       goto err;
+
+               high = mac_addr[1] | (mac_addr[0] << 8);
+               low = mac_addr[5] | (mac_addr[4] << 8) | (mac_addr[3] << 16) |
+                     (mac_addr[2] << 24);
+               rc = qed_llh_add_filter(p_hwfn, p_ptt, abs_ppfid, filter_idx,
+                                       0, high, low);
+               if (rc)
+                       goto err;
+       }
+
+       DP_VERBOSE(cdev,
+                  QED_MSG_SP,
+                  "LLH: Added MAC filter [%pM] to ppfid %hhd [abs %hhd] at idx %hhd [ref_cnt %d]\n",
+                  mac_addr, ppfid, abs_ppfid, filter_idx, ref_cnt);
+
+       goto out;
+
+err:   DP_NOTICE(cdev,
+                 "LLH: Failed to add MAC filter [%pM] to ppfid %hhd\n",
+                 mac_addr, ppfid);
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+
+       return rc;
+}
+
+static int
+qed_llh_protocol_filter_stringify(struct qed_dev *cdev,
+                                 enum qed_llh_prot_filter_type_t type,
+                                 u16 source_port_or_eth_type,
+                                 u16 dest_port, u8 *str, size_t str_len)
+{
+       switch (type) {
+       case QED_LLH_FILTER_ETHERTYPE:
+               snprintf(str, str_len, "Ethertype 0x%04x",
+                        source_port_or_eth_type);
+               break;
+       case QED_LLH_FILTER_TCP_SRC_PORT:
+               snprintf(str, str_len, "TCP src port 0x%04x",
+                        source_port_or_eth_type);
+               break;
+       case QED_LLH_FILTER_UDP_SRC_PORT:
+               snprintf(str, str_len, "UDP src port 0x%04x",
+                        source_port_or_eth_type);
+               break;
+       case QED_LLH_FILTER_TCP_DEST_PORT:
+               snprintf(str, str_len, "TCP dst port 0x%04x", dest_port);
+               break;
+       case QED_LLH_FILTER_UDP_DEST_PORT:
+               snprintf(str, str_len, "UDP dst port 0x%04x", dest_port);
+               break;
+       case QED_LLH_FILTER_TCP_SRC_AND_DEST_PORT:
+               snprintf(str, str_len, "TCP src/dst ports 0x%04x/0x%04x",
+                        source_port_or_eth_type, dest_port);
+               break;
+       case QED_LLH_FILTER_UDP_SRC_AND_DEST_PORT:
+               snprintf(str, str_len, "UDP src/dst ports 0x%04x/0x%04x",
+                        source_port_or_eth_type, dest_port);
+               break;
+       default:
+               DP_NOTICE(cdev,
+                         "Non valid LLH protocol filter type %d\n", type);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static int
+qed_llh_protocol_filter_to_hilo(struct qed_dev *cdev,
+                               enum qed_llh_prot_filter_type_t type,
+                               u16 source_port_or_eth_type,
+                               u16 dest_port, u32 *p_high, u32 *p_low)
+{
+       *p_high = 0;
+       *p_low = 0;
+
+       switch (type) {
+       case QED_LLH_FILTER_ETHERTYPE:
+               *p_high = source_port_or_eth_type;
+               break;
+       case QED_LLH_FILTER_TCP_SRC_PORT:
+       case QED_LLH_FILTER_UDP_SRC_PORT:
+               *p_low = source_port_or_eth_type << 16;
+               break;
+       case QED_LLH_FILTER_TCP_DEST_PORT:
+       case QED_LLH_FILTER_UDP_DEST_PORT:
+               *p_low = dest_port;
+               break;
+       case QED_LLH_FILTER_TCP_SRC_AND_DEST_PORT:
+       case QED_LLH_FILTER_UDP_SRC_AND_DEST_PORT:
+               *p_low = (source_port_or_eth_type << 16) | dest_port;
+               break;
+       default:
+               DP_NOTICE(cdev,
+                         "Non valid LLH protocol filter type %d\n", type);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+int
+qed_llh_add_protocol_filter(struct qed_dev *cdev,
+                           u8 ppfid,
+                           enum qed_llh_prot_filter_type_t type,
+                           u16 source_port_or_eth_type, u16 dest_port)
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       u8 filter_idx, abs_ppfid, str[32], type_bitmap;
+       union qed_llh_filter filter = {};
+       u32 high, low, ref_cnt;
+       int rc = 0;
+
+       if (!p_ptt)
+               return -EAGAIN;
+
+       if (!test_bit(QED_MF_LLH_PROTO_CLSS, &cdev->mf_bits))
+               goto out;
+
+       rc = qed_llh_protocol_filter_stringify(cdev, type,
+                                              source_port_or_eth_type,
+                                              dest_port, str, sizeof(str));
+       if (rc)
+               goto err;
+
+       filter.protocol.type = type;
+       filter.protocol.source_port_or_eth_type = source_port_or_eth_type;
+       filter.protocol.dest_port = dest_port;
+       rc = qed_llh_shadow_add_filter(cdev,
+                                      ppfid,
+                                      QED_LLH_FILTER_TYPE_PROTOCOL,
+                                      &filter, &filter_idx, &ref_cnt);
+       if (rc)
+               goto err;
+
+       /* Configure the LLH only in case of a new the filter */
+       if (ref_cnt == 1) {
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       goto err;
+
+               rc = qed_llh_protocol_filter_to_hilo(cdev, type,
+                                                    source_port_or_eth_type,
+                                                    dest_port, &high, &low);
+               if (rc)
+                       goto err;
+
+               type_bitmap = 0x1 << type;
+               rc = qed_llh_add_filter(p_hwfn, p_ptt, abs_ppfid,
+                                       filter_idx, type_bitmap, high, low);
+               if (rc)
+                       goto err;
+       }
+
+       DP_VERBOSE(cdev,
+                  QED_MSG_SP,
+                  "LLH: Added protocol filter [%s] to ppfid %hhd [abs %hhd] at idx %hhd [ref_cnt %d]\n",
+                  str, ppfid, abs_ppfid, filter_idx, ref_cnt);
+
+       goto out;
+
+err:   DP_NOTICE(p_hwfn,
+                 "LLH: Failed to add protocol filter [%s] to ppfid %hhd\n",
+                 str, ppfid);
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+
+       return rc;
+}
+
+void qed_llh_remove_mac_filter(struct qed_dev *cdev,
+                              u8 ppfid, u8 mac_addr[ETH_ALEN])
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       union qed_llh_filter filter = {};
+       u8 filter_idx, abs_ppfid;
+       int rc = 0;
+       u32 ref_cnt;
+
+       if (!p_ptt)
+               return;
+
+       if (!test_bit(QED_MF_LLH_MAC_CLSS, &cdev->mf_bits))
+               goto out;
+
+       ether_addr_copy(filter.mac.addr, mac_addr);
+       rc = qed_llh_shadow_remove_filter(cdev, ppfid, &filter, &filter_idx,
+                                         &ref_cnt);
+       if (rc)
+               goto err;
+
+       /* Remove from the LLH in case the filter is not in use */
+       if (!ref_cnt) {
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       goto err;
+
+               rc = qed_llh_remove_filter(p_hwfn, p_ptt, abs_ppfid,
+                                          filter_idx);
+               if (rc)
+                       goto err;
+       }
+
+       DP_VERBOSE(cdev,
+                  QED_MSG_SP,
+                  "LLH: Removed MAC filter [%pM] from ppfid %hhd [abs %hhd] at idx %hhd [ref_cnt %d]\n",
+                  mac_addr, ppfid, abs_ppfid, filter_idx, ref_cnt);
+
+       goto out;
+
+err:   DP_NOTICE(cdev,
+                 "LLH: Failed to remove MAC filter [%pM] from ppfid %hhd\n",
+                 mac_addr, ppfid);
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+}
+
+void qed_llh_remove_protocol_filter(struct qed_dev *cdev,
+                                   u8 ppfid,
+                                   enum qed_llh_prot_filter_type_t type,
+                                   u16 source_port_or_eth_type, u16 dest_port)
+{
+       struct qed_hwfn *p_hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *p_ptt = qed_ptt_acquire(p_hwfn);
+       u8 filter_idx, abs_ppfid, str[32];
+       union qed_llh_filter filter = {};
+       int rc = 0;
+       u32 ref_cnt;
+
+       if (!p_ptt)
+               return;
+
+       if (!test_bit(QED_MF_LLH_PROTO_CLSS, &cdev->mf_bits))
+               goto out;
+
+       rc = qed_llh_protocol_filter_stringify(cdev, type,
+                                              source_port_or_eth_type,
+                                              dest_port, str, sizeof(str));
+       if (rc)
+               goto err;
+
+       filter.protocol.type = type;
+       filter.protocol.source_port_or_eth_type = source_port_or_eth_type;
+       filter.protocol.dest_port = dest_port;
+       rc = qed_llh_shadow_remove_filter(cdev, ppfid, &filter, &filter_idx,
+                                         &ref_cnt);
+       if (rc)
+               goto err;
+
+       /* Remove from the LLH in case the filter is not in use */
+       if (!ref_cnt) {
+               rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+               if (rc)
+                       goto err;
+
+               rc = qed_llh_remove_filter(p_hwfn, p_ptt, abs_ppfid,
+                                          filter_idx);
+               if (rc)
+                       goto err;
+       }
+
+       DP_VERBOSE(cdev,
+                  QED_MSG_SP,
+                  "LLH: Removed protocol filter [%s] from ppfid %hhd [abs %hhd] at idx %hhd [ref_cnt %d]\n",
+                  str, ppfid, abs_ppfid, filter_idx, ref_cnt);
+
+       goto out;
+
+err:   DP_NOTICE(cdev,
+                 "LLH: Failed to remove protocol filter [%s] from ppfid %hhd\n",
+                 str, ppfid);
+out:
+       qed_ptt_release(p_hwfn, p_ptt);
+}
+
+/******************************* NIG LLH - End ********************************/
+
 #define QED_MIN_DPIS            (4)
 #define QED_MIN_PWM_REGION      (QED_WID_SIZE * QED_MIN_DPIS)
 
        kfree(cdev->reset_stats);
        cdev->reset_stats = NULL;
 
+       qed_llh_free(cdev);
+
        for_each_hwfn(cdev, i) {
                struct qed_hwfn *p_hwfn = &cdev->hwfns[i];
 
                        goto alloc_err;
        }
 
+       rc = qed_llh_alloc(cdev);
+       if (rc) {
+               DP_NOTICE(cdev,
+                         "Failed to allocate memory for the llh_info structure\n");
+               goto alloc_err;
+       }
+
        cdev->reset_stats = kzalloc(sizeof(*cdev->reset_stats), GFP_KERNEL);
        if (!cdev->reset_stats)
                goto alloc_no_mem;
 {
        int rc = 0;
 
+       /* In CMT the gate should be cleared by the 2nd hwfn */
+       if (!QED_IS_CMT(p_hwfn->cdev) || !IS_LEAD_HWFN(p_hwfn))
+               STORE_RT_REG(p_hwfn, NIG_REG_BRB_GATE_DNTFWD_PORT_RT_OFFSET, 0);
+
        rc = qed_init_run(p_hwfn, p_ptt, PHASE_PORT, p_hwfn->port_id, hw_mode);
        if (rc)
                return rc;
        if (rc)
                return rc;
 
+       /* Use the leading hwfn since in CMT only NIG #0 is operational */
+       if (IS_LEAD_HWFN(p_hwfn)) {
+               rc = qed_llh_hw_init_pf(p_hwfn, p_ptt);
+               if (rc)
+                       return rc;
+       }
+
        if (b_hw_start) {
                /* enable interrupts */
                qed_int_igu_enable(p_hwfn, p_ptt, int_mode);
                qed_wr(p_hwfn, p_ptt, DORQ_REG_PF_DB_ENABLE, 0);
                qed_wr(p_hwfn, p_ptt, QM_REG_PF_EN, 0);
 
+               if (IS_LEAD_HWFN(p_hwfn) &&
+                   test_bit(QED_MF_LLH_MAC_CLSS, &cdev->mf_bits) &&
+                   !QED_IS_FCOE_PERSONALITY(p_hwfn))
+                       qed_llh_remove_mac_filter(cdev, 0,
+                                                 p_hwfn->hw_info.hw_mac_addr);
+
                if (!cdev->recov_in_prog) {
                        rc = qed_mcp_unload_done(p_hwfn, p_ptt);
                        if (rc) {
        return 0;
 }
 
+static int qed_hw_get_ppfid_bitmap(struct qed_hwfn *p_hwfn,
+                                  struct qed_ptt *p_ptt)
+{
+       struct qed_dev *cdev = p_hwfn->cdev;
+       u8 native_ppfid_idx;
+       int rc;
+
+       /* Calculation of BB/AH is different for native_ppfid_idx */
+       if (QED_IS_BB(cdev))
+               native_ppfid_idx = p_hwfn->rel_pf_id;
+       else
+               native_ppfid_idx = p_hwfn->rel_pf_id /
+                   cdev->num_ports_in_engine;
+
+       rc = qed_mcp_get_ppfid_bitmap(p_hwfn, p_ptt);
+       if (rc != 0 && rc != -EOPNOTSUPP)
+               return rc;
+       else if (rc == -EOPNOTSUPP)
+               cdev->ppfid_bitmap = 0x1 << native_ppfid_idx;
+
+       if (!(cdev->ppfid_bitmap & (0x1 << native_ppfid_idx))) {
+               DP_INFO(p_hwfn,
+                       "Fix the PPFID bitmap to inculde the native PPFID [native_ppfid_idx %hhd, orig_bitmap 0x%hhx]\n",
+                       native_ppfid_idx, cdev->ppfid_bitmap);
+               cdev->ppfid_bitmap = 0x1 << native_ppfid_idx;
+       }
+
+       return 0;
+}
+
 static int qed_hw_get_resc(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
 {
        struct qed_resc_unlock_params resc_unlock_params;
                                "Failed to release the resource lock for the resource allocation commands\n");
        }
 
+       /* PPFID bitmap */
+       if (IS_LEAD_HWFN(p_hwfn)) {
+               rc = qed_hw_get_ppfid_bitmap(p_hwfn, p_ptt);
+               if (rc)
+                       return rc;
+       }
+
        /* Sanity for ILT */
        if ((b_ah && (RESC_END(p_hwfn, QED_ILT) > PXP_NUM_ILT_RECORDS_K2)) ||
            (!b_ah && (RESC_END(p_hwfn, QED_ILT) > PXP_NUM_ILT_RECORDS_BB))) {
        return 0;
 }
 
-static void qed_llh_mac_to_filter(u32 *p_high, u32 *p_low,
-                                 u8 *p_filter)
-{
-       *p_high = p_filter[1] | (p_filter[0] << 8);
-       *p_low = p_filter[5] | (p_filter[4] << 8) |
-                (p_filter[3] << 16) | (p_filter[2] << 24);
-}
-
-int qed_llh_add_mac_filter(struct qed_hwfn *p_hwfn,
-                          struct qed_ptt *p_ptt, u8 *p_filter)
-{
-       u32 high = 0, low = 0, en;
-       int i;
-
-       if (!test_bit(QED_MF_LLH_MAC_CLSS, &p_hwfn->cdev->mf_bits))
-               return 0;
-
-       qed_llh_mac_to_filter(&high, &low, p_filter);
-
-       /* Find a free entry and utilize it */
-       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
-               en = qed_rd(p_hwfn, p_ptt,
-                           NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32));
-               if (en)
-                       continue;
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      2 * i * sizeof(u32), low);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      (2 * i + 1) * sizeof(u32), high);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_MODE + i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_PROTOCOL_TYPE +
-                      i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32), 1);
-               break;
-       }
-       if (i >= NIG_REG_LLH_FUNC_FILTER_EN_SIZE) {
-               DP_NOTICE(p_hwfn,
-                         "Failed to find an empty LLH filter to utilize\n");
-               return -EINVAL;
-       }
-
-       DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                  "mac: %pM is added at %d\n",
-                  p_filter, i);
-
-       return 0;
-}
-
-void qed_llh_remove_mac_filter(struct qed_hwfn *p_hwfn,
-                              struct qed_ptt *p_ptt, u8 *p_filter)
-{
-       u32 high = 0, low = 0;
-       int i;
-
-       if (!test_bit(QED_MF_LLH_MAC_CLSS, &p_hwfn->cdev->mf_bits))
-               return;
-
-       qed_llh_mac_to_filter(&high, &low, p_filter);
-
-       /* Find the entry and clean it */
-       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
-               if (qed_rd(p_hwfn, p_ptt,
-                          NIG_REG_LLH_FUNC_FILTER_VALUE +
-                          2 * i * sizeof(u32)) != low)
-                       continue;
-               if (qed_rd(p_hwfn, p_ptt,
-                          NIG_REG_LLH_FUNC_FILTER_VALUE +
-                          (2 * i + 1) * sizeof(u32)) != high)
-                       continue;
-
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE + 2 * i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      (2 * i + 1) * sizeof(u32), 0);
-
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "mac: %pM is removed from %d\n",
-                          p_filter, i);
-               break;
-       }
-       if (i >= NIG_REG_LLH_FUNC_FILTER_EN_SIZE)
-               DP_NOTICE(p_hwfn, "Tried to remove a non-configured filter\n");
-}
-
-int
-qed_llh_add_protocol_filter(struct qed_hwfn *p_hwfn,
-                           struct qed_ptt *p_ptt,
-                           u16 source_port_or_eth_type,
-                           u16 dest_port, enum qed_llh_port_filter_type_t type)
-{
-       u32 high = 0, low = 0, en;
-       int i;
-
-       if (!test_bit(QED_MF_LLH_PROTO_CLSS, &p_hwfn->cdev->mf_bits))
-               return 0;
-
-       switch (type) {
-       case QED_LLH_FILTER_ETHERTYPE:
-               high = source_port_or_eth_type;
-               break;
-       case QED_LLH_FILTER_TCP_SRC_PORT:
-       case QED_LLH_FILTER_UDP_SRC_PORT:
-               low = source_port_or_eth_type << 16;
-               break;
-       case QED_LLH_FILTER_TCP_DEST_PORT:
-       case QED_LLH_FILTER_UDP_DEST_PORT:
-               low = dest_port;
-               break;
-       case QED_LLH_FILTER_TCP_SRC_AND_DEST_PORT:
-       case QED_LLH_FILTER_UDP_SRC_AND_DEST_PORT:
-               low = (source_port_or_eth_type << 16) | dest_port;
-               break;
-       default:
-               DP_NOTICE(p_hwfn,
-                         "Non valid LLH protocol filter type %d\n", type);
-               return -EINVAL;
-       }
-       /* Find a free entry and utilize it */
-       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
-               en = qed_rd(p_hwfn, p_ptt,
-                           NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32));
-               if (en)
-                       continue;
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      2 * i * sizeof(u32), low);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      (2 * i + 1) * sizeof(u32), high);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_MODE + i * sizeof(u32), 1);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_PROTOCOL_TYPE +
-                      i * sizeof(u32), 1 << type);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32), 1);
-               break;
-       }
-       if (i >= NIG_REG_LLH_FUNC_FILTER_EN_SIZE) {
-               DP_NOTICE(p_hwfn,
-                         "Failed to find an empty LLH filter to utilize\n");
-               return -EINVAL;
-       }
-       switch (type) {
-       case QED_LLH_FILTER_ETHERTYPE:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "ETH type %x is added at %d\n",
-                          source_port_or_eth_type, i);
-               break;
-       case QED_LLH_FILTER_TCP_SRC_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "TCP src port %x is added at %d\n",
-                          source_port_or_eth_type, i);
-               break;
-       case QED_LLH_FILTER_UDP_SRC_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "UDP src port %x is added at %d\n",
-                          source_port_or_eth_type, i);
-               break;
-       case QED_LLH_FILTER_TCP_DEST_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "TCP dst port %x is added at %d\n", dest_port, i);
-               break;
-       case QED_LLH_FILTER_UDP_DEST_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "UDP dst port %x is added at %d\n", dest_port, i);
-               break;
-       case QED_LLH_FILTER_TCP_SRC_AND_DEST_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "TCP src/dst ports %x/%x are added at %d\n",
-                          source_port_or_eth_type, dest_port, i);
-               break;
-       case QED_LLH_FILTER_UDP_SRC_AND_DEST_PORT:
-               DP_VERBOSE(p_hwfn, NETIF_MSG_HW,
-                          "UDP src/dst ports %x/%x are added at %d\n",
-                          source_port_or_eth_type, dest_port, i);
-               break;
-       }
-       return 0;
-}
-
-void
-qed_llh_remove_protocol_filter(struct qed_hwfn *p_hwfn,
-                              struct qed_ptt *p_ptt,
-                              u16 source_port_or_eth_type,
-                              u16 dest_port,
-                              enum qed_llh_port_filter_type_t type)
-{
-       u32 high = 0, low = 0;
-       int i;
-
-       if (!test_bit(QED_MF_LLH_PROTO_CLSS, &p_hwfn->cdev->mf_bits))
-               return;
-
-       switch (type) {
-       case QED_LLH_FILTER_ETHERTYPE:
-               high = source_port_or_eth_type;
-               break;
-       case QED_LLH_FILTER_TCP_SRC_PORT:
-       case QED_LLH_FILTER_UDP_SRC_PORT:
-               low = source_port_or_eth_type << 16;
-               break;
-       case QED_LLH_FILTER_TCP_DEST_PORT:
-       case QED_LLH_FILTER_UDP_DEST_PORT:
-               low = dest_port;
-               break;
-       case QED_LLH_FILTER_TCP_SRC_AND_DEST_PORT:
-       case QED_LLH_FILTER_UDP_SRC_AND_DEST_PORT:
-               low = (source_port_or_eth_type << 16) | dest_port;
-               break;
-       default:
-               DP_NOTICE(p_hwfn,
-                         "Non valid LLH protocol filter type %d\n", type);
-               return;
-       }
-
-       for (i = 0; i < NIG_REG_LLH_FUNC_FILTER_EN_SIZE; i++) {
-               if (!qed_rd(p_hwfn, p_ptt,
-                           NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32)))
-                       continue;
-               if (!qed_rd(p_hwfn, p_ptt,
-                           NIG_REG_LLH_FUNC_FILTER_MODE + i * sizeof(u32)))
-                       continue;
-               if (!(qed_rd(p_hwfn, p_ptt,
-                            NIG_REG_LLH_FUNC_FILTER_PROTOCOL_TYPE +
-                            i * sizeof(u32)) & BIT(type)))
-                       continue;
-               if (qed_rd(p_hwfn, p_ptt,
-                          NIG_REG_LLH_FUNC_FILTER_VALUE +
-                          2 * i * sizeof(u32)) != low)
-                       continue;
-               if (qed_rd(p_hwfn, p_ptt,
-                          NIG_REG_LLH_FUNC_FILTER_VALUE +
-                          (2 * i + 1) * sizeof(u32)) != high)
-                       continue;
-
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_EN + i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_MODE + i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_PROTOCOL_TYPE +
-                      i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE + 2 * i * sizeof(u32), 0);
-               qed_wr(p_hwfn, p_ptt,
-                      NIG_REG_LLH_FUNC_FILTER_VALUE +
-                      (2 * i + 1) * sizeof(u32), 0);
-               break;
-       }
-
-       if (i >= NIG_REG_LLH_FUNC_FILTER_EN_SIZE)
-               DP_NOTICE(p_hwfn, "Tried to remove a non-configured filter\n");
-}
-
 static int qed_set_coalesce(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
                            u32 hw_addr, void *p_eth_qzone,
                            size_t eth_qzone_size, u8 timeset)