Imported Upstream version 17.05
[deb_dpdk.git] / drivers / net / qede / base / ecore_init_fw_funcs.c
index de08650..004ab35 100644 (file)
 #include "ecore_hsi_init_tool.h"
 #include "ecore_iro.h"
 #include "ecore_init_fw_funcs.h"
-enum CmInterfaceEnum {
-       MCM_SEC,
-       MCM_PRI,
-       UCM_SEC,
-       UCM_PRI,
-       TCM_SEC,
-       TCM_PRI,
-       YCM_SEC,
-       YCM_PRI,
-       XCM_SEC,
-       XCM_PRI,
-       NUM_OF_CM_INTERFACES
+
+#define CDU_VALIDATION_DEFAULT_CFG 61
+
+static u16 con_region_offsets[3][E4_NUM_OF_CONNECTION_TYPES] = {
+       { 400,  336,  352,  304,  304,  384,  416,  352}, /* region 3 offsets */
+       { 528,  496,  416,  448,  448,  512,  544,  480}, /* region 4 offsets */
+       { 608,  544,  496,  512,  576,  592,  624,  560}  /* region 5 offsets */
+};
+static u16 task_region_offsets[1][E4_NUM_OF_CONNECTION_TYPES] = {
+       { 240,  240,  112,    0,    0,    0,    0,   96}  /* region 1 offsets */
 };
-/* general constants */
-#define QM_PQ_MEM_4KB(pq_size) \
-(pq_size ? DIV_ROUND_UP((pq_size + 1) * QM_PQ_ELEMENT_SIZE, 0x1000) : 0)
-#define QM_PQ_SIZE_256B(pq_size) \
-(pq_size ? DIV_ROUND_UP(pq_size, 0x100) - 1 : 0)
-#define QM_INVALID_PQ_ID                       0xffff
-/* feature enable */
-#define QM_BYPASS_EN                           1
-#define QM_BYTE_CRD_EN                         1
-/* other PQ constants */
-#define QM_OTHER_PQS_PER_PF                    4
-/* WFQ constants */
-#define QM_WFQ_UPPER_BOUND                     62500000
+
+/* General constants */
+#define QM_PQ_MEM_4KB(pq_size) (pq_size ? DIV_ROUND_UP((pq_size + 1) * \
+                               QM_PQ_ELEMENT_SIZE, 0x1000) : 0)
+#define QM_PQ_SIZE_256B(pq_size) (pq_size ? DIV_ROUND_UP(pq_size, 0x100) - 1 : \
+                                 0)
+#define QM_INVALID_PQ_ID               0xffff
+
+/* Feature enable */
+#define QM_BYPASS_EN                   1
+#define QM_BYTE_CRD_EN                 1
+
+/* Other PQ constants */
+#define QM_OTHER_PQS_PER_PF            4
+
+/* WFQ constants: */
+
+/* Upper bound in MB, 10 * burst size of 1ms in 50Gbps */
+#define QM_WFQ_UPPER_BOUND             62500000
+
+/* Bit  of VOQ in WFQ VP PQ map */
 #define QM_WFQ_VP_PQ_VOQ_SHIFT         0
+
+/* Bit  of PF in WFQ VP PQ map */
 #define QM_WFQ_VP_PQ_PF_SHIFT          5
+
+/* 0x9000 = 4*9*1024 */
 #define QM_WFQ_INC_VAL(weight)         ((weight) * 0x9000)
-#define QM_WFQ_MAX_INC_VAL                     43750000
-/* RL constants */
-#define QM_RL_UPPER_BOUND                      62500000
-#define QM_RL_PERIOD                           5
+
+/* 0.7 * upper bound (62500000) */
+#define QM_WFQ_MAX_INC_VAL             43750000
+
+/* RL constants: */
+
+/* Upper bound is set to 10 * burst size of 1ms in 50Gbps */
+#define QM_RL_UPPER_BOUND              62500000
+
+/* Period in us */
+#define QM_RL_PERIOD                   5
+
+/* Period in 25MHz cycles */
 #define QM_RL_PERIOD_CLK_25M           (25 * QM_RL_PERIOD)
-#define QM_RL_MAX_INC_VAL                      43750000
-/* RL increment value - the factor of 1.01 was added after seeing only
- * 99% factor reached in a 25Gbps port with DPDK RFC 2544 test.
- * In this scenario the PF RL was reducing the line rate to 99% although
- * the credit increment value was the correct one and FW calculated
- * correct packet sizes. The reason for the inaccuracy of the RL is
- * unknown at this point.
+
+/* 0.7 * upper bound (62500000) */
+#define QM_RL_MAX_INC_VAL              43750000
+
+/* RL increment value - rate is specified in mbps. the factor of 1.01 was
+ * added after seeing only 99% factor reached in a 25Gbps port with DPDK RFC
+ * 2544 test. In this scenario the PF RL was reducing the line rate to 99%
+ * although the credit increment value was the correct one and FW calculated
+ * correct packet sizes. The reason for the inaccuracy of the RL is unknown at
+ * this point.
  */
-/* rate in mbps */
 #define QM_RL_INC_VAL(rate) OSAL_MAX_T(u32, (u32)(((rate ? rate : 1000000) * \
-                                       QM_RL_PERIOD * 101) / (8 * 100)), 1)
+                                      QM_RL_PERIOD * 101) / (8 * 100)), 1)
+
 /* AFullOprtnstcCrdMask constants */
 #define QM_OPPOR_LINE_VOQ_DEF          1
 #define QM_OPPOR_FW_STOP_DEF           0
 #define QM_OPPOR_PQ_EMPTY_DEF          1
-/* Command Queue constants */
-#define PBF_CMDQ_PURE_LB_LINES                 150
+
+/* Command Queue constants: */
+
+/* Pure LB CmdQ lines (+spare) */
+#define PBF_CMDQ_PURE_LB_LINES         150
+
 #define PBF_CMDQ_LINES_RT_OFFSET(voq) \
-(PBF_REG_YCMD_QS_NUM_LINES_VOQ0_RT_OFFSET + \
-voq * (PBF_REG_YCMD_QS_NUM_LINES_VOQ1_RT_OFFSET \
-- PBF_REG_YCMD_QS_NUM_LINES_VOQ0_RT_OFFSET))
+       (PBF_REG_YCMD_QS_NUM_LINES_VOQ0_RT_OFFSET + voq * \
+        (PBF_REG_YCMD_QS_NUM_LINES_VOQ1_RT_OFFSET - \
+         PBF_REG_YCMD_QS_NUM_LINES_VOQ0_RT_OFFSET))
+
 #define PBF_BTB_GUARANTEED_RT_OFFSET(voq) \
-(PBF_REG_BTB_GUARANTEED_VOQ0_RT_OFFSET + voq * \
-(PBF_REG_BTB_GUARANTEED_VOQ1_RT_OFFSET - PBF_REG_BTB_GUARANTEED_VOQ0_RT_OFFSET))
+       (PBF_REG_BTB_GUARANTEED_VOQ0_RT_OFFSET + voq * \
+        (PBF_REG_BTB_GUARANTEED_VOQ1_RT_OFFSET - \
+         PBF_REG_BTB_GUARANTEED_VOQ0_RT_OFFSET))
+
 #define QM_VOQ_LINE_CRD(pbf_cmd_lines) \
 ((((pbf_cmd_lines) - 4) * 2) | QM_LINE_CRD_REG_SIGN_BIT)
+
 /* BTB: blocks constants (block size = 256B) */
-#define BTB_JUMBO_PKT_BLOCKS 38        /* 256B blocks in 9700B packet */
-/* headroom per-port */
-#define BTB_HEADROOM_BLOCKS BTB_JUMBO_PKT_BLOCKS
+
+/* 256B blocks in 9700B packet */
+#define BTB_JUMBO_PKT_BLOCKS           38
+
+/* Headroom per-port */
+#define BTB_HEADROOM_BLOCKS            BTB_JUMBO_PKT_BLOCKS
 #define BTB_PURE_LB_FACTOR             10
-#define BTB_PURE_LB_RATIO              7 /* factored (hence really 0.7) */
+
+/* Factored (hence really 0.7) */
+#define BTB_PURE_LB_RATIO              7
+
 /* QM stop command constants */
-#define QM_STOP_PQ_MASK_WIDTH                  32
-#define QM_STOP_CMD_ADDR                               0x2
-#define QM_STOP_CMD_STRUCT_SIZE                        2
+#define QM_STOP_PQ_MASK_WIDTH          32
+#define QM_STOP_CMD_ADDR               2
+#define QM_STOP_CMD_STRUCT_SIZE                2
 #define QM_STOP_CMD_PAUSE_MASK_OFFSET  0
 #define QM_STOP_CMD_PAUSE_MASK_SHIFT   0
-#define QM_STOP_CMD_PAUSE_MASK_MASK            0xffffffff /* @DPDK */
-#define QM_STOP_CMD_GROUP_ID_OFFSET            1
-#define QM_STOP_CMD_GROUP_ID_SHIFT             16
-#define QM_STOP_CMD_GROUP_ID_MASK              15
-#define QM_STOP_CMD_PQ_TYPE_OFFSET             1
-#define QM_STOP_CMD_PQ_TYPE_SHIFT              24
-#define QM_STOP_CMD_PQ_TYPE_MASK               1
-#define QM_STOP_CMD_MAX_POLL_COUNT             100
-#define QM_STOP_CMD_POLL_PERIOD_US             500
+#define QM_STOP_CMD_PAUSE_MASK_MASK    0xffffffff /* @DPDK */
+#define QM_STOP_CMD_GROUP_ID_OFFSET    1
+#define QM_STOP_CMD_GROUP_ID_SHIFT     16
+#define QM_STOP_CMD_GROUP_ID_MASK      15
+#define QM_STOP_CMD_PQ_TYPE_OFFSET     1
+#define QM_STOP_CMD_PQ_TYPE_SHIFT      24
+#define QM_STOP_CMD_PQ_TYPE_MASK       1
+#define QM_STOP_CMD_MAX_POLL_COUNT     100
+#define QM_STOP_CMD_POLL_PERIOD_US     500
+
 /* QM command macros */
-#define QM_CMD_STRUCT_SIZE(cmd)        cmd##_STRUCT_SIZE
+#define QM_CMD_STRUCT_SIZE(cmd) cmd##_STRUCT_SIZE
 #define QM_CMD_SET_FIELD(var, cmd, field, value) \
-SET_FIELD(var[cmd##_##field##_OFFSET], cmd##_##field, value)
+       SET_FIELD(var[cmd##_##field##_OFFSET], cmd##_##field, value)
+
 /* QM: VOQ macros */
 #define PHYS_VOQ(port, tc, max_phys_tcs_per_port) \
-((port) * (max_phys_tcs_per_port) + (tc))
-#define LB_VOQ(port)                           (MAX_PHYS_VOQS + (port))
+       ((port) * (max_phys_tcs_per_port) + (tc))
+#define LB_VOQ(port)                            (MAX_PHYS_VOQS + (port))
 #define VOQ(port, tc, max_phys_tcs_per_port) \
-((tc) < LB_TC ? PHYS_VOQ(port, tc, max_phys_tcs_per_port) : LB_VOQ(port))
+       ((tc) < LB_TC ? PHYS_VOQ(port, tc, max_phys_tcs_per_port) : \
+                                LB_VOQ(port))
+
+
 /******************** INTERNAL IMPLEMENTATION *********************/
+
 /* Prepare PF RL enable/disable runtime init values */
 static void ecore_enable_pf_rl(struct ecore_hwfn *p_hwfn, bool pf_rl_en)
 {
        STORE_RT_REG(p_hwfn, QM_REG_RLPFENABLE_RT_OFFSET, pf_rl_en ? 1 : 0);
        if (pf_rl_en) {
-               /* enable RLs for all VOQs */
+               /* Enable RLs for all VOQs */
                STORE_RT_REG(p_hwfn, QM_REG_RLPFVOQENABLE_RT_OFFSET,
                             (1 << MAX_NUM_VOQS) - 1);
-               /* write RL period */
+
+               /* Write RL period */
                STORE_RT_REG(p_hwfn, QM_REG_RLPFPERIOD_RT_OFFSET,
                             QM_RL_PERIOD_CLK_25M);
                STORE_RT_REG(p_hwfn, QM_REG_RLPFPERIODTIMER_RT_OFFSET,
                             QM_RL_PERIOD_CLK_25M);
-               /* set credit threshold for QM bypass flow */
+
+               /* Set credit threshold for QM bypass flow */
                if (QM_BYPASS_EN)
                        STORE_RT_REG(p_hwfn, QM_REG_AFULLQMBYPTHRPFRL_RT_OFFSET,
                                     QM_RL_UPPER_BOUND);
@@ -133,7 +177,8 @@ static void ecore_enable_pf_rl(struct ecore_hwfn *p_hwfn, bool pf_rl_en)
 static void ecore_enable_pf_wfq(struct ecore_hwfn *p_hwfn, bool pf_wfq_en)
 {
        STORE_RT_REG(p_hwfn, QM_REG_WFQPFENABLE_RT_OFFSET, pf_wfq_en ? 1 : 0);
-       /* set credit threshold for QM bypass flow */
+
+       /* Set credit threshold for QM bypass flow */
        if (pf_wfq_en && QM_BYPASS_EN)
                STORE_RT_REG(p_hwfn, QM_REG_AFULLQMBYPTHRPFWFQ_RT_OFFSET,
                             QM_WFQ_UPPER_BOUND);
@@ -145,12 +190,13 @@ static void ecore_enable_vport_rl(struct ecore_hwfn *p_hwfn, bool vport_rl_en)
        STORE_RT_REG(p_hwfn, QM_REG_RLGLBLENABLE_RT_OFFSET,
                     vport_rl_en ? 1 : 0);
        if (vport_rl_en) {
-               /* write RL period (use timer 0 only) */
+               /* Write RL period (use timer 0 only) */
                STORE_RT_REG(p_hwfn, QM_REG_RLGLBLPERIOD_0_RT_OFFSET,
                             QM_RL_PERIOD_CLK_25M);
                STORE_RT_REG(p_hwfn, QM_REG_RLGLBLPERIODTIMER_0_RT_OFFSET,
                             QM_RL_PERIOD_CLK_25M);
-               /* set credit threshold for QM bypass flow */
+
+               /* Set credit threshold for QM bypass flow */
                if (QM_BYPASS_EN)
                        STORE_RT_REG(p_hwfn,
                                     QM_REG_AFULLQMBYPTHRGLBLRL_RT_OFFSET,
@@ -163,7 +209,8 @@ static void ecore_enable_vport_wfq(struct ecore_hwfn *p_hwfn, bool vport_wfq_en)
 {
        STORE_RT_REG(p_hwfn, QM_REG_WFQVPENABLE_RT_OFFSET,
                     vport_wfq_en ? 1 : 0);
-       /* set credit threshold for QM bypass flow */
+
+       /* Set credit threshold for QM bypass flow */
        if (vport_wfq_en && QM_BYPASS_EN)
                STORE_RT_REG(p_hwfn, QM_REG_AFULLQMBYPTHRVPWFQ_RT_OFFSET,
                             QM_WFQ_UPPER_BOUND);
@@ -176,13 +223,9 @@ static void ecore_cmdq_lines_voq_rt_init(struct ecore_hwfn *p_hwfn,
                                         u8 voq, u16 cmdq_lines)
 {
        u32 qm_line_crd;
-       /* In A0 - Limit the size of pbf queue so that only 511 commands
-        * with the minimum size of 4 (FCoE minimum size)
-        */
-       bool is_bb_a0 = ECORE_IS_BB_A0(p_hwfn->p_dev);
-       if (is_bb_a0)
-               cmdq_lines = OSAL_MIN_T(u32, cmdq_lines, 1022);
+
        qm_line_crd = QM_VOQ_LINE_CRD(cmdq_lines);
+
        OVERWRITE_RT_REG(p_hwfn, PBF_CMDQ_LINES_RT_OFFSET(voq),
                         (u32)cmdq_lines);
        STORE_RT_REG(p_hwfn, QM_REG_VOQCRDLINE_RT_OFFSET + voq, qm_line_crd);
@@ -198,38 +241,43 @@ static void ecore_cmdq_lines_rt_init(struct ecore_hwfn *p_hwfn,
                                     port_params[MAX_NUM_PORTS])
 {
        u8 tc, voq, port_id, num_tcs_in_port;
-       /* clear PBF lines for all VOQs */
+
+       /* Clear PBF lines for all VOQs */
        for (voq = 0; voq < MAX_NUM_VOQS; voq++)
                STORE_RT_REG(p_hwfn, PBF_CMDQ_LINES_RT_OFFSET(voq), 0);
+
        for (port_id = 0; port_id < max_ports_per_engine; port_id++) {
-               if (port_params[port_id].active) {
-                       u16 phys_lines, phys_lines_per_tc;
-                       /* find #lines to divide between active physical TCs */
-                       phys_lines =
-                           port_params[port_id].num_pbf_cmd_lines -
-                           PBF_CMDQ_PURE_LB_LINES;
-                       /* find #lines per active physical TC */
-                       num_tcs_in_port = 0;
-                       for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++) {
-                               if (((port_params[port_id].active_phys_tcs >>
-                                               tc) & 0x1) == 1)
-                                       num_tcs_in_port++;
-                       }
-                       phys_lines_per_tc = phys_lines / num_tcs_in_port;
-                       /* init registers per active TC */
-                       for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++) {
-                               if (((port_params[port_id].active_phys_tcs >>
-                                                       tc) & 0x1) == 1) {
-                                       voq = PHYS_VOQ(port_id, tc,
-                                                       max_phys_tcs_per_port);
-                                       ecore_cmdq_lines_voq_rt_init(p_hwfn,
-                                                       voq, phys_lines_per_tc);
-                               }
+               u16 phys_lines, phys_lines_per_tc;
+
+               if (!port_params[port_id].active)
+                       continue;
+
+               /* Find #lines to divide between the active physical TCs */
+               phys_lines = port_params[port_id].num_pbf_cmd_lines -
+                            PBF_CMDQ_PURE_LB_LINES;
+
+               /* Find #lines per active physical TC */
+               num_tcs_in_port = 0;
+               for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++)
+                       if (((port_params[port_id].active_phys_tcs >> tc) &
+                             0x1) == 1)
+                               num_tcs_in_port++;
+               phys_lines_per_tc = phys_lines / num_tcs_in_port;
+
+               /* Init registers per active TC */
+               for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++) {
+                       if (((port_params[port_id].active_phys_tcs >> tc) &
+                             0x1) == 1) {
+                               voq = PHYS_VOQ(port_id, tc,
+                                              max_phys_tcs_per_port);
+                               ecore_cmdq_lines_voq_rt_init(p_hwfn, voq,
+                                                            phys_lines_per_tc);
                        }
-                       /* init registers for pure LB TC */
-                       ecore_cmdq_lines_voq_rt_init(p_hwfn, LB_VOQ(port_id),
-                                                    PBF_CMDQ_PURE_LB_LINES);
                }
+
+               /* Init registers for pure LB TC */
+               ecore_cmdq_lines_voq_rt_init(p_hwfn, LB_VOQ(port_id),
+                                            PBF_CMDQ_PURE_LB_LINES);
        }
 }
 
@@ -259,50 +307,51 @@ static void ecore_btb_blocks_rt_init(struct ecore_hwfn *p_hwfn,
                                     struct init_qm_port_params
                                     port_params[MAX_NUM_PORTS])
 {
-       u8 tc, voq, port_id, num_tcs_in_port;
        u32 usable_blocks, pure_lb_blocks, phys_blocks;
+       u8 tc, voq, port_id, num_tcs_in_port;
+
        for (port_id = 0; port_id < max_ports_per_engine; port_id++) {
-               if (port_params[port_id].active) {
-                       /* subtract headroom blocks */
-                       usable_blocks =
-                           port_params[port_id].num_btb_blocks -
-                           BTB_HEADROOM_BLOCKS;
-/* find blocks per physical TC. use factor to avoid floating arithmethic */
-
-                       num_tcs_in_port = 0;
-                       for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++)
-                               if (((port_params[port_id].active_phys_tcs >>
-                                                               tc) & 0x1) == 1)
-                                       num_tcs_in_port++;
-                       pure_lb_blocks =
-                           (usable_blocks * BTB_PURE_LB_FACTOR) /
-                           (num_tcs_in_port *
-                            BTB_PURE_LB_FACTOR + BTB_PURE_LB_RATIO);
-                       pure_lb_blocks =
-                           OSAL_MAX_T(u32, BTB_JUMBO_PKT_BLOCKS,
-                                      pure_lb_blocks / BTB_PURE_LB_FACTOR);
-                       phys_blocks =
-                           (usable_blocks -
-                            pure_lb_blocks) /
-                            num_tcs_in_port;
-                       /* init physical TCs */
-                       for (tc = 0;
-                            tc < NUM_OF_PHYS_TCS;
-                            tc++) {
-                               if (((port_params[port_id].active_phys_tcs >>
-                                                       tc) & 0x1) == 1) {
-                                       voq = PHYS_VOQ(port_id, tc,
-                                                      max_phys_tcs_per_port);
-                                       STORE_RT_REG(p_hwfn,
+               if (!port_params[port_id].active)
+                       continue;
+
+               /* Subtract headroom blocks */
+               usable_blocks = port_params[port_id].num_btb_blocks -
+                               BTB_HEADROOM_BLOCKS;
+
+               /* Find blocks per physical TC. use factor to avoid floating
+                * arithmethic.
+                */
+               num_tcs_in_port = 0;
+               for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++)
+                       if (((port_params[port_id].active_phys_tcs >> tc) &
+                             0x1) == 1)
+                               num_tcs_in_port++;
+
+               pure_lb_blocks = (usable_blocks * BTB_PURE_LB_FACTOR) /
+                                 (num_tcs_in_port * BTB_PURE_LB_FACTOR +
+                                  BTB_PURE_LB_RATIO);
+               pure_lb_blocks = OSAL_MAX_T(u32, BTB_JUMBO_PKT_BLOCKS,
+                                           pure_lb_blocks /
+                                           BTB_PURE_LB_FACTOR);
+               phys_blocks = (usable_blocks - pure_lb_blocks) /
+                             num_tcs_in_port;
+
+               /* Init physical TCs */
+               for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++) {
+                       if (((port_params[port_id].active_phys_tcs >> tc) &
+                             0x1) == 1) {
+                               voq = PHYS_VOQ(port_id, tc,
+                                              max_phys_tcs_per_port);
+                               STORE_RT_REG(p_hwfn,
                                             PBF_BTB_GUARANTEED_RT_OFFSET(voq),
                                             phys_blocks);
-                               }
                        }
-                       /* init pure LB TC */
-                       STORE_RT_REG(p_hwfn,
-                                    PBF_BTB_GUARANTEED_RT_OFFSET(
-                                       LB_VOQ(port_id)), pure_lb_blocks);
                }
+
+               /* Init pure LB TC */
+               STORE_RT_REG(p_hwfn,
+                            PBF_BTB_GUARANTEED_RT_OFFSET(LB_VOQ(port_id)),
+                            pure_lb_blocks);
        }
 }
 
@@ -323,59 +372,69 @@ static void ecore_tx_pq_map_rt_init(struct ecore_hwfn *p_hwfn,
                                    struct init_qm_pq_params *pq_params,
                                    struct init_qm_vport_params *vport_params)
 {
-       u16 i, pq_id, pq_group;
-       u16 num_pqs = num_pf_pqs + num_vf_pqs;
-       u16 first_pq_group = start_pq / QM_PF_QUEUE_GROUP_SIZE;
-       u16 last_pq_group = (start_pq + num_pqs - 1) / QM_PF_QUEUE_GROUP_SIZE;
-       bool is_bb_a0 = ECORE_IS_BB_A0(p_hwfn->p_dev);
-       /* a bit per Tx PQ indicating if the PQ is associated with a VF */
+       /* A bit per Tx PQ indicating if the PQ is associated with a VF */
        u32 tx_pq_vf_mask[MAX_QM_TX_QUEUES / QM_PF_QUEUE_GROUP_SIZE] = { 0 };
-       u32 tx_pq_vf_mask_width = is_bb_a0 ? 32 : QM_PF_QUEUE_GROUP_SIZE;
-       u32 num_tx_pq_vf_masks = MAX_QM_TX_QUEUES / tx_pq_vf_mask_width;
-       u32 pq_mem_4kb = QM_PQ_MEM_4KB(num_pf_cids);
-       u32 vport_pq_mem_4kb = QM_PQ_MEM_4KB(num_vf_cids);
-       u32 mem_addr_4kb = base_mem_addr_4kb;
-       /* set mapping from PQ group to PF */
+       u32 num_tx_pq_vf_masks = MAX_QM_TX_QUEUES / QM_PF_QUEUE_GROUP_SIZE;
+       u16 num_pqs, first_pq_group, last_pq_group, i, pq_id, pq_group;
+       u32 pq_mem_4kb, vport_pq_mem_4kb, mem_addr_4kb;
+
+       num_pqs = num_pf_pqs + num_vf_pqs;
+
+       first_pq_group = start_pq / QM_PF_QUEUE_GROUP_SIZE;
+       last_pq_group = (start_pq + num_pqs - 1) / QM_PF_QUEUE_GROUP_SIZE;
+
+       pq_mem_4kb = QM_PQ_MEM_4KB(num_pf_cids);
+       vport_pq_mem_4kb = QM_PQ_MEM_4KB(num_vf_cids);
+       mem_addr_4kb = base_mem_addr_4kb;
+
+       /* Set mapping from PQ group to PF */
        for (pq_group = first_pq_group; pq_group <= last_pq_group; pq_group++)
                STORE_RT_REG(p_hwfn, QM_REG_PQTX2PF_0_RT_OFFSET + pq_group,
                             (u32)(pf_id));
-       /* set PQ sizes */
+
+       /* Set PQ sizes */
        STORE_RT_REG(p_hwfn, QM_REG_MAXPQSIZE_0_RT_OFFSET,
                     QM_PQ_SIZE_256B(num_pf_cids));
        STORE_RT_REG(p_hwfn, QM_REG_MAXPQSIZE_1_RT_OFFSET,
                     QM_PQ_SIZE_256B(num_vf_cids));
-       /* go over all Tx PQs */
+
+       /* Go over all Tx PQs */
        for (i = 0, pq_id = start_pq; i < num_pqs; i++, pq_id++) {
-               struct qm_rf_pq_map tx_pq_map;
-               u8 voq =
-                   VOQ(port_id, pq_params[i].tc_id, max_phys_tcs_per_port);
-               bool is_vf_pq = (i >= num_pf_pqs);
-               /* added to avoid compilation warning */
                u32 max_qm_global_rls = MAX_QM_GLOBAL_RLS;
-               bool rl_valid = pq_params[i].rl_valid &&
-                               pq_params[i].vport_id < max_qm_global_rls;
-               /* update first Tx PQ of VPORT/TC */
-               u8 vport_id_in_pf = pq_params[i].vport_id - start_vport;
-               u16 first_tx_pq_id =
-                   vport_params[vport_id_in_pf].first_tx_pq_id[pq_params[i].
-                                                               tc_id];
+               struct qm_rf_pq_map tx_pq_map;
+               bool is_vf_pq, rl_valid;
+               u8 voq, vport_id_in_pf;
+               u16 first_tx_pq_id;
+
+               voq = VOQ(port_id, pq_params[i].tc_id, max_phys_tcs_per_port);
+               is_vf_pq = (i >= num_pf_pqs);
+               rl_valid = pq_params[i].rl_valid && pq_params[i].vport_id <
+                          max_qm_global_rls;
+
+               /* Update first Tx PQ of VPORT/TC */
+               vport_id_in_pf = pq_params[i].vport_id - start_vport;
+               first_tx_pq_id =
+               vport_params[vport_id_in_pf].first_tx_pq_id[pq_params[i].tc_id];
                if (first_tx_pq_id == QM_INVALID_PQ_ID) {
-                       /* create new VP PQ */
+                       /* Create new VP PQ */
                        vport_params[vport_id_in_pf].
                            first_tx_pq_id[pq_params[i].tc_id] = pq_id;
                        first_tx_pq_id = pq_id;
-                       /* map VP PQ to VOQ and PF */
+
+                       /* Map VP PQ to VOQ and PF */
                        STORE_RT_REG(p_hwfn,
                                     QM_REG_WFQVPMAP_RT_OFFSET + first_tx_pq_id,
                                     (voq << QM_WFQ_VP_PQ_VOQ_SHIFT) | (pf_id <<
                                                        QM_WFQ_VP_PQ_PF_SHIFT));
                }
-               /* check RL ID */
+
+               /* Check RL ID */
                if (pq_params[i].rl_valid && pq_params[i].vport_id >=
                                                        max_qm_global_rls)
                        DP_NOTICE(p_hwfn, true,
-                                 "Invalid VPORT ID for rate limiter config");
-               /* fill PQ map entry */
+                                 "Invalid VPORT ID for rate limiter config\n");
+
+               /* Fill PQ map entry */
                OSAL_MEMSET(&tx_pq_map, 0, sizeof(tx_pq_map));
                SET_FIELD(tx_pq_map.reg, QM_RF_PQ_MAP_PQ_VALID, 1);
                SET_FIELD(tx_pq_map.reg, QM_RF_PQ_MAP_RL_VALID,
@@ -386,44 +445,30 @@ static void ecore_tx_pq_map_rt_init(struct ecore_hwfn *p_hwfn,
                SET_FIELD(tx_pq_map.reg, QM_RF_PQ_MAP_VOQ, voq);
                SET_FIELD(tx_pq_map.reg, QM_RF_PQ_MAP_WRR_WEIGHT_GROUP,
                          pq_params[i].wrr_group);
-               /* write PQ map entry to CAM */
+
+               /* Write PQ map entry to CAM */
                STORE_RT_REG(p_hwfn, QM_REG_TXPQMAP_RT_OFFSET + pq_id,
                             *((u32 *)&tx_pq_map));
-               /* set base address */
+
+               /* Set base address */
                STORE_RT_REG(p_hwfn, QM_REG_BASEADDRTXPQ_RT_OFFSET + pq_id,
                             mem_addr_4kb);
-               /* check if VF PQ */
+
+               /* If VF PQ, add indication to PQ VF mask */
                if (is_vf_pq) {
-                       /* if PQ is associated with a VF, add indication to PQ
-                        * VF mask
-                        */
-                       tx_pq_vf_mask[pq_id / tx_pq_vf_mask_width] |=
-                           (1 << (pq_id % tx_pq_vf_mask_width));
+                       tx_pq_vf_mask[pq_id / QM_PF_QUEUE_GROUP_SIZE] |=
+                               (1 << (pq_id % QM_PF_QUEUE_GROUP_SIZE));
                        mem_addr_4kb += vport_pq_mem_4kb;
                } else {
                        mem_addr_4kb += pq_mem_4kb;
                }
        }
-       /* store Tx PQ VF mask to size select register */
-       for (i = 0; i < num_tx_pq_vf_masks; i++) {
-               if (tx_pq_vf_mask[i]) {
-                       if (is_bb_a0) {
-                               /* A0-only: perform read-modify-write
-                                *(fixed in B0)
-                                */
-                               u32 curr_mask =
-                                   is_first_pf ? 0 : ecore_rd(p_hwfn, p_ptt,
-                                                      QM_REG_MAXPQSIZETXSEL_0
-                                                               + i * 4);
-                               STORE_RT_REG(p_hwfn,
-                                            QM_REG_MAXPQSIZETXSEL_0_RT_OFFSET +
-                                            i, curr_mask | tx_pq_vf_mask[i]);
-                       } else
-                               STORE_RT_REG(p_hwfn,
-                                            QM_REG_MAXPQSIZETXSEL_0_RT_OFFSET +
-                                            i, tx_pq_vf_mask[i]);
-               }
-       }
+
+       /* Store Tx PQ VF mask to size select register */
+       for (i = 0; i < num_tx_pq_vf_masks; i++)
+               if (tx_pq_vf_mask[i])
+                       STORE_RT_REG(p_hwfn, QM_REG_MAXPQSIZETXSEL_0_RT_OFFSET +
+                                    i, tx_pq_vf_mask[i]);
 }
 
 /* Prepare Other PQ mapping runtime init values for the specified PF */
@@ -433,20 +478,26 @@ static void ecore_other_pq_map_rt_init(struct ecore_hwfn *p_hwfn,
                                       u32 num_pf_cids,
                                       u32 num_tids, u32 base_mem_addr_4kb)
 {
-       u16 i, pq_id;
-/* a single other PQ grp is used in each PF, where PQ group i is used in PF i */
-
-       u16 pq_group = pf_id;
-       u32 pq_size = num_pf_cids + num_tids;
-       u32 pq_mem_4kb = QM_PQ_MEM_4KB(pq_size);
-       u32 mem_addr_4kb = base_mem_addr_4kb;
-       /* map PQ group to PF */
+       u32 pq_size, pq_mem_4kb, mem_addr_4kb;
+       u16 i, pq_id, pq_group;
+
+       /* A single other PQ group is used in each PF, where PQ group i is used
+        * in PF i.
+        */
+       pq_group = pf_id;
+       pq_size = num_pf_cids + num_tids;
+       pq_mem_4kb = QM_PQ_MEM_4KB(pq_size);
+       mem_addr_4kb = base_mem_addr_4kb;
+
+       /* Map PQ group to PF */
        STORE_RT_REG(p_hwfn, QM_REG_PQOTHER2PF_0_RT_OFFSET + pq_group,
                     (u32)(pf_id));
-       /* set PQ sizes */
+
+       /* Set PQ sizes */
        STORE_RT_REG(p_hwfn, QM_REG_MAXPQSIZE_2_RT_OFFSET,
                     QM_PQ_SIZE_256B(pq_size));
-       /* set base address */
+
+       /* Set base address */
        for (i = 0, pq_id = pf_id * QM_PF_QUEUE_GROUP_SIZE;
             i < QM_OTHER_PQS_PER_PF; i++, pq_id++) {
                STORE_RT_REG(p_hwfn, QM_REG_BASEADDROTHERPQ_RT_OFFSET + pq_id,
@@ -454,7 +505,10 @@ static void ecore_other_pq_map_rt_init(struct ecore_hwfn *p_hwfn,
                mem_addr_4kb += pq_mem_4kb;
        }
 }
-/* Prepare PF WFQ runtime init values for specified PF. Return -1 on error. */
+
+/* Prepare PF WFQ runtime init values for the specified PF.
+ * Return -1 on error.
+ */
 static int ecore_pf_wfq_rt_init(struct ecore_hwfn *p_hwfn,
                                u8 port_id,
                                u8 pf_id,
@@ -463,76 +517,89 @@ static int ecore_pf_wfq_rt_init(struct ecore_hwfn *p_hwfn,
                                u16 num_tx_pqs,
                                struct init_qm_pq_params *pq_params)
 {
+       u32 inc_val, crd_reg_offset;
+       u8 voq;
        u16 i;
-       u32 inc_val;
-       u32 crd_reg_offset =
-           (pf_id <
-            MAX_NUM_PFS_BB ? QM_REG_WFQPFCRD_RT_OFFSET :
-            QM_REG_WFQPFCRD_MSB_RT_OFFSET) + (pf_id % MAX_NUM_PFS_BB);
+
+       crd_reg_offset = (pf_id < MAX_NUM_PFS_BB ? QM_REG_WFQPFCRD_RT_OFFSET :
+                         QM_REG_WFQPFCRD_MSB_RT_OFFSET) +
+                        (pf_id % MAX_NUM_PFS_BB);
+
        inc_val = QM_WFQ_INC_VAL(pf_wfq);
-       if (inc_val == 0 || inc_val > QM_WFQ_MAX_INC_VAL) {
-               DP_NOTICE(p_hwfn, true, "Invalid PF WFQ weight configuration");
+       if (!inc_val || inc_val > QM_WFQ_MAX_INC_VAL) {
+               DP_NOTICE(p_hwfn, true,
+                         "Invalid PF WFQ weight configuration\n");
                return -1;
        }
+
        for (i = 0; i < num_tx_pqs; i++) {
-               u8 voq =
-                   VOQ(port_id, pq_params[i].tc_id, max_phys_tcs_per_port);
+               voq = VOQ(port_id, pq_params[i].tc_id, max_phys_tcs_per_port);
                OVERWRITE_RT_REG(p_hwfn, crd_reg_offset + voq * MAX_NUM_PFS_BB,
                                 (u32)QM_WFQ_CRD_REG_SIGN_BIT);
        }
+
        STORE_RT_REG(p_hwfn, QM_REG_WFQPFUPPERBOUND_RT_OFFSET + pf_id,
                     QM_WFQ_UPPER_BOUND | (u32)QM_WFQ_CRD_REG_SIGN_BIT);
        STORE_RT_REG(p_hwfn, QM_REG_WFQPFWEIGHT_RT_OFFSET + pf_id, inc_val);
        return 0;
 }
-/* Prepare PF RL runtime init values for specified PF. Return -1 on error. */
+
+/* Prepare PF RL runtime init values for the specified PF.
+ * Return -1 on error.
+ */
 static int ecore_pf_rl_rt_init(struct ecore_hwfn *p_hwfn, u8 pf_id, u32 pf_rl)
 {
-       u32 inc_val = QM_RL_INC_VAL(pf_rl);
+       u32 inc_val;
+
+       inc_val = QM_RL_INC_VAL(pf_rl);
        if (inc_val > QM_RL_MAX_INC_VAL) {
-               DP_NOTICE(p_hwfn, true, "Invalid PF rate limit configuration");
+               DP_NOTICE(p_hwfn, true,
+                         "Invalid PF rate limit configuration\n");
                return -1;
        }
+
        STORE_RT_REG(p_hwfn, QM_REG_RLPFCRD_RT_OFFSET + pf_id,
                     (u32)QM_RL_CRD_REG_SIGN_BIT);
        STORE_RT_REG(p_hwfn, QM_REG_RLPFUPPERBOUND_RT_OFFSET + pf_id,
                     QM_RL_UPPER_BOUND | (u32)QM_RL_CRD_REG_SIGN_BIT);
        STORE_RT_REG(p_hwfn, QM_REG_RLPFINCVAL_RT_OFFSET + pf_id, inc_val);
+
        return 0;
 }
-/* Prepare VPORT WFQ runtime init values for the specified VPORTs. Return -1 on
- * error.
+
+/* Prepare VPORT WFQ runtime init values for the specified VPORTs.
+ * Return -1 on error.
  */
 static int ecore_vp_wfq_rt_init(struct ecore_hwfn *p_hwfn,
                                u8 num_vports,
                                struct init_qm_vport_params *vport_params)
 {
-       u8 tc, i;
+       u16 vport_pq_id;
        u32 inc_val;
-       /* go over all PF VPORTs */
+       u8 tc, i;
+
+       /* Go over all PF VPORTs */
        for (i = 0; i < num_vports; i++) {
-               if (vport_params[i].vport_wfq) {
-                       inc_val = QM_WFQ_INC_VAL(vport_params[i].vport_wfq);
-                       if (inc_val > QM_WFQ_MAX_INC_VAL) {
-                               DP_NOTICE(p_hwfn, true,
-                                         "Invalid VPORT WFQ weight config");
-                               return -1;
-                       }
-                       /* each VPORT can have several VPORT PQ IDs for
-                        * different TCs
-                        */
-                       for (tc = 0; tc < NUM_OF_TCS; tc++) {
-                               u16 vport_pq_id =
-                                   vport_params[i].first_tx_pq_id[tc];
-                               if (vport_pq_id != QM_INVALID_PQ_ID) {
-                                       STORE_RT_REG(p_hwfn,
-                                                 QM_REG_WFQVPCRD_RT_OFFSET +
-                                                 vport_pq_id,
-                                                 (u32)QM_WFQ_CRD_REG_SIGN_BIT);
-                                       STORE_RT_REG(p_hwfn,
-                                               QM_REG_WFQVPWEIGHT_RT_OFFSET
-                                                    + vport_pq_id, inc_val);
-                               }
+               if (!vport_params[i].vport_wfq)
+                       continue;
+
+               inc_val = QM_WFQ_INC_VAL(vport_params[i].vport_wfq);
+               if (inc_val > QM_WFQ_MAX_INC_VAL) {
+                       DP_NOTICE(p_hwfn, true,
+                                 "Invalid VPORT WFQ weight configuration\n");
+                       return -1;
+               }
+
+               /* Each VPORT can have several VPORT PQ IDs for various TCs */
+               for (tc = 0; tc < NUM_OF_TCS; tc++) {
+                       vport_pq_id = vport_params[i].first_tx_pq_id[tc];
+                       if (vport_pq_id != QM_INVALID_PQ_ID) {
+                               STORE_RT_REG(p_hwfn, QM_REG_WFQVPCRD_RT_OFFSET +
+                                            vport_pq_id,
+                                            (u32)QM_WFQ_CRD_REG_SIGN_BIT);
+                               STORE_RT_REG(p_hwfn,
+                                            QM_REG_WFQVPWEIGHT_RT_OFFSET +
+                                            vport_pq_id, inc_val);
                        }
                }
        }
@@ -548,19 +615,23 @@ static int ecore_vport_rl_rt_init(struct ecore_hwfn *p_hwfn,
                                  struct init_qm_vport_params *vport_params)
 {
        u8 i, vport_id;
+       u32 inc_val;
+
        if (start_vport + num_vports >= MAX_QM_GLOBAL_RLS) {
                DP_NOTICE(p_hwfn, true,
-                         "Invalid VPORT ID for rate limiter configuration");
+                         "Invalid VPORT ID for rate limiter configuration\n");
                return -1;
        }
-       /* go over all PF VPORTs */
+
+       /* Go over all PF VPORTs */
        for (i = 0, vport_id = start_vport; i < num_vports; i++, vport_id++) {
                u32 inc_val = QM_RL_INC_VAL(vport_params[i].vport_rl);
                if (inc_val > QM_RL_MAX_INC_VAL) {
                        DP_NOTICE(p_hwfn, true,
-                                 "Invalid VPORT rate-limit configuration");
+                                 "Invalid VPORT rate-limit configuration\n");
                        return -1;
                }
+
                STORE_RT_REG(p_hwfn, QM_REG_RLGLBLCRD_RT_OFFSET + vport_id,
                             (u32)QM_RL_CRD_REG_SIGN_BIT);
                STORE_RT_REG(p_hwfn,
@@ -569,6 +640,7 @@ static int ecore_vport_rl_rt_init(struct ecore_hwfn *p_hwfn,
                STORE_RT_REG(p_hwfn, QM_REG_RLGLBLINCVAL_RT_OFFSET + vport_id,
                             inc_val);
        }
+
        return 0;
 }
 
@@ -576,17 +648,20 @@ static bool ecore_poll_on_qm_cmd_ready(struct ecore_hwfn *p_hwfn,
                                       struct ecore_ptt *p_ptt)
 {
        u32 reg_val, i;
-       for (i = 0, reg_val = 0; i < QM_STOP_CMD_MAX_POLL_COUNT && reg_val == 0;
+
+       for (i = 0, reg_val = 0; i < QM_STOP_CMD_MAX_POLL_COUNT && !reg_val;
             i++) {
                OSAL_UDELAY(QM_STOP_CMD_POLL_PERIOD_US);
                reg_val = ecore_rd(p_hwfn, p_ptt, QM_REG_SDMCMDREADY);
        }
-       /* check if timeout while waiting for SDM command ready */
+
+       /* Check if timeout while waiting for SDM command ready */
        if (i == QM_STOP_CMD_MAX_POLL_COUNT) {
                DP_VERBOSE(p_hwfn, ECORE_MSG_DEBUG,
                           "Timeout waiting for QM SDM cmd ready signal\n");
                return false;
        }
+
        return true;
 }
 
@@ -596,15 +671,19 @@ static bool ecore_send_qm_cmd(struct ecore_hwfn *p_hwfn,
 {
        if (!ecore_poll_on_qm_cmd_ready(p_hwfn, p_ptt))
                return false;
+
        ecore_wr(p_hwfn, p_ptt, QM_REG_SDMCMDADDR, cmd_addr);
        ecore_wr(p_hwfn, p_ptt, QM_REG_SDMCMDDATALSB, cmd_data_lsb);
        ecore_wr(p_hwfn, p_ptt, QM_REG_SDMCMDDATAMSB, cmd_data_msb);
        ecore_wr(p_hwfn, p_ptt, QM_REG_SDMCMDGO, 1);
        ecore_wr(p_hwfn, p_ptt, QM_REG_SDMCMDGO, 0);
+
        return ecore_poll_on_qm_cmd_ready(p_hwfn, p_ptt);
 }
 
+
 /******************** INTERFACE IMPLEMENTATION *********************/
+
 u32 ecore_qm_pf_mem_size(u8 pf_id,
                         u32 num_pf_cids,
                         u32 num_vf_cids,
@@ -625,32 +704,42 @@ int ecore_qm_common_rt_init(struct ecore_hwfn *p_hwfn,
                            struct init_qm_port_params
                            port_params[MAX_NUM_PORTS])
 {
-       /* init AFullOprtnstcCrdMask */
-       u32 mask =
-           (QM_OPPOR_LINE_VOQ_DEF << QM_RF_OPPORTUNISTIC_MASK_LINEVOQ_SHIFT) |
-           (QM_BYTE_CRD_EN << QM_RF_OPPORTUNISTIC_MASK_BYTEVOQ_SHIFT) |
-           (pf_wfq_en << QM_RF_OPPORTUNISTIC_MASK_PFWFQ_SHIFT) |
-           (vport_wfq_en << QM_RF_OPPORTUNISTIC_MASK_VPWFQ_SHIFT) |
-           (pf_rl_en << QM_RF_OPPORTUNISTIC_MASK_PFRL_SHIFT) |
-           (vport_rl_en << QM_RF_OPPORTUNISTIC_MASK_VPQCNRL_SHIFT) |
-           (QM_OPPOR_FW_STOP_DEF << QM_RF_OPPORTUNISTIC_MASK_FWPAUSE_SHIFT) |
-           (QM_OPPOR_PQ_EMPTY_DEF <<
-            QM_RF_OPPORTUNISTIC_MASK_QUEUEEMPTY_SHIFT);
+       u32 mask;
+
+       /* Init AFullOprtnstcCrdMask */
+       mask = (QM_OPPOR_LINE_VOQ_DEF <<
+               QM_RF_OPPORTUNISTIC_MASK_LINEVOQ_SHIFT) |
+               (QM_BYTE_CRD_EN << QM_RF_OPPORTUNISTIC_MASK_BYTEVOQ_SHIFT) |
+               (pf_wfq_en << QM_RF_OPPORTUNISTIC_MASK_PFWFQ_SHIFT) |
+               (vport_wfq_en << QM_RF_OPPORTUNISTIC_MASK_VPWFQ_SHIFT) |
+               (pf_rl_en << QM_RF_OPPORTUNISTIC_MASK_PFRL_SHIFT) |
+               (vport_rl_en << QM_RF_OPPORTUNISTIC_MASK_VPQCNRL_SHIFT) |
+               (QM_OPPOR_FW_STOP_DEF <<
+                QM_RF_OPPORTUNISTIC_MASK_FWPAUSE_SHIFT) |
+               (QM_OPPOR_PQ_EMPTY_DEF <<
+                QM_RF_OPPORTUNISTIC_MASK_QUEUEEMPTY_SHIFT);
        STORE_RT_REG(p_hwfn, QM_REG_AFULLOPRTNSTCCRDMASK_RT_OFFSET, mask);
-       /* enable/disable PF RL */
+
+       /* Enable/disable PF RL */
        ecore_enable_pf_rl(p_hwfn, pf_rl_en);
-       /* enable/disable PF WFQ */
+
+       /* Enable/disable PF WFQ */
        ecore_enable_pf_wfq(p_hwfn, pf_wfq_en);
-       /* enable/disable VPORT RL */
+
+       /* Enable/disable VPORT RL */
        ecore_enable_vport_rl(p_hwfn, vport_rl_en);
-       /* enable/disable VPORT WFQ */
+
+       /* Enable/disable VPORT WFQ */
        ecore_enable_vport_wfq(p_hwfn, vport_wfq_en);
-       /* init PBF CMDQ line credit */
+
+       /* Init PBF CMDQ line credit */
        ecore_cmdq_lines_rt_init(p_hwfn, max_ports_per_engine,
                                 max_phys_tcs_per_port, port_params);
-       /* init BTB blocks in PBF */
+
+       /* Init BTB blocks in PBF */
        ecore_btb_blocks_rt_init(p_hwfn, max_ports_per_engine,
                                 max_phys_tcs_per_port, port_params);
+
        return 0;
 }
 
@@ -673,66 +762,86 @@ int ecore_qm_pf_rt_init(struct ecore_hwfn *p_hwfn,
                        struct init_qm_pq_params *pq_params,
                        struct init_qm_vport_params *vport_params)
 {
+       u32 other_mem_size_4kb;
        u8 tc, i;
-       u32 other_mem_size_4kb =
-           QM_PQ_MEM_4KB(num_pf_cids + num_tids) * QM_OTHER_PQS_PER_PF;
-       /* clear first Tx PQ ID array for each VPORT */
+
+       other_mem_size_4kb = QM_PQ_MEM_4KB(num_pf_cids + num_tids) *
+                            QM_OTHER_PQS_PER_PF;
+
+       /* Clear first Tx PQ ID array for each VPORT */
        for (i = 0; i < num_vports; i++)
                for (tc = 0; tc < NUM_OF_TCS; tc++)
                        vport_params[i].first_tx_pq_id[tc] = QM_INVALID_PQ_ID;
-       /* map Other PQs (if any) */
+
+       /* Map Other PQs (if any) */
 #if QM_OTHER_PQS_PER_PF > 0
        ecore_other_pq_map_rt_init(p_hwfn, port_id, pf_id, num_pf_cids,
                                   num_tids, 0);
 #endif
-       /* map Tx PQs */
+
+       /* Map Tx PQs */
        ecore_tx_pq_map_rt_init(p_hwfn, p_ptt, port_id, pf_id,
                                max_phys_tcs_per_port, is_first_pf, num_pf_cids,
                                num_vf_cids, start_pq, num_pf_pqs, num_vf_pqs,
                                start_vport, other_mem_size_4kb, pq_params,
                                vport_params);
-       /* init PF WFQ */
+
+       /* Init PF WFQ */
        if (pf_wfq)
                if (ecore_pf_wfq_rt_init
                    (p_hwfn, port_id, pf_id, pf_wfq, max_phys_tcs_per_port,
-                    num_pf_pqs + num_vf_pqs, pq_params) != 0)
+                    num_pf_pqs + num_vf_pqs, pq_params))
                        return -1;
-       /* init PF RL */
-       if (ecore_pf_rl_rt_init(p_hwfn, pf_id, pf_rl) != 0)
+
+       /* Init PF RL */
+       if (ecore_pf_rl_rt_init(p_hwfn, pf_id, pf_rl))
                return -1;
-       /* set VPORT WFQ */
-       if (ecore_vp_wfq_rt_init(p_hwfn, num_vports, vport_params) != 0)
+
+       /* Set VPORT WFQ */
+       if (ecore_vp_wfq_rt_init(p_hwfn, num_vports, vport_params))
                return -1;
-       /* set VPORT RL */
+
+       /* Set VPORT RL */
        if (ecore_vport_rl_rt_init
-           (p_hwfn, start_vport, num_vports, vport_params) != 0)
+           (p_hwfn, start_vport, num_vports, vport_params))
                return -1;
+
        return 0;
 }
 
 int ecore_init_pf_wfq(struct ecore_hwfn *p_hwfn,
                      struct ecore_ptt *p_ptt, u8 pf_id, u16 pf_wfq)
 {
-       u32 inc_val = QM_WFQ_INC_VAL(pf_wfq);
-       if (inc_val == 0 || inc_val > QM_WFQ_MAX_INC_VAL) {
-               DP_NOTICE(p_hwfn, true, "Invalid PF WFQ weight configuration");
+       u32 inc_val;
+
+       inc_val = QM_WFQ_INC_VAL(pf_wfq);
+       if (!inc_val || inc_val > QM_WFQ_MAX_INC_VAL) {
+               DP_NOTICE(p_hwfn, true,
+                         "Invalid PF WFQ weight configuration\n");
                return -1;
        }
+
        ecore_wr(p_hwfn, p_ptt, QM_REG_WFQPFWEIGHT + pf_id * 4, inc_val);
+
        return 0;
 }
 
 int ecore_init_pf_rl(struct ecore_hwfn *p_hwfn,
                     struct ecore_ptt *p_ptt, u8 pf_id, u32 pf_rl)
 {
-       u32 inc_val = QM_RL_INC_VAL(pf_rl);
+       u32 inc_val;
+
+       inc_val = QM_RL_INC_VAL(pf_rl);
        if (inc_val > QM_RL_MAX_INC_VAL) {
-               DP_NOTICE(p_hwfn, true, "Invalid PF rate limit configuration");
+               DP_NOTICE(p_hwfn, true,
+                         "Invalid PF rate limit configuration\n");
                return -1;
        }
+
        ecore_wr(p_hwfn, p_ptt, QM_REG_RLPFCRD + pf_id * 4,
                 (u32)QM_RL_CRD_REG_SIGN_BIT);
        ecore_wr(p_hwfn, p_ptt, QM_REG_RLPFINCVAL + pf_id * 4, inc_val);
+
        return 0;
 }
 
@@ -740,20 +849,25 @@ int ecore_init_vport_wfq(struct ecore_hwfn *p_hwfn,
                         struct ecore_ptt *p_ptt,
                         u16 first_tx_pq_id[NUM_OF_TCS], u16 vport_wfq)
 {
+       u16 vport_pq_id;
+       u32 inc_val;
        u8 tc;
-       u32 inc_val = QM_WFQ_INC_VAL(vport_wfq);
-       if (inc_val == 0 || inc_val > QM_WFQ_MAX_INC_VAL) {
+
+       inc_val = QM_WFQ_INC_VAL(vport_wfq);
+       if (!inc_val || inc_val > QM_WFQ_MAX_INC_VAL) {
                DP_NOTICE(p_hwfn, true,
-                         "Invalid VPORT WFQ weight configuration");
+                         "Invalid VPORT WFQ weight configuration\n");
                return -1;
        }
+
        for (tc = 0; tc < NUM_OF_TCS; tc++) {
-               u16 vport_pq_id = first_tx_pq_id[tc];
+               vport_pq_id = first_tx_pq_id[tc];
                if (vport_pq_id != QM_INVALID_PQ_ID) {
                        ecore_wr(p_hwfn, p_ptt,
                                 QM_REG_WFQVPWEIGHT + vport_pq_id * 4, inc_val);
                }
        }
+
        return 0;
 }
 
@@ -761,20 +875,24 @@ int ecore_init_vport_rl(struct ecore_hwfn *p_hwfn,
                        struct ecore_ptt *p_ptt, u8 vport_id, u32 vport_rl)
 {
        u32 inc_val, max_qm_global_rls = MAX_QM_GLOBAL_RLS;
+
        if (vport_id >= max_qm_global_rls) {
                DP_NOTICE(p_hwfn, true,
-                         "Invalid VPORT ID for rate limiter configuration");
+                         "Invalid VPORT ID for rate limiter configuration\n");
                return -1;
        }
+
        inc_val = QM_RL_INC_VAL(vport_rl);
        if (inc_val > QM_RL_MAX_INC_VAL) {
                DP_NOTICE(p_hwfn, true,
-                         "Invalid VPORT rate-limit configuration");
+                         "Invalid VPORT rate-limit configuration\n");
                return -1;
        }
+
        ecore_wr(p_hwfn, p_ptt, QM_REG_RLGLBLCRD + vport_id * 4,
                 (u32)QM_RL_CRD_REG_SIGN_BIT);
        ecore_wr(p_hwfn, p_ptt, QM_REG_RLGLBLINCVAL + vport_id * 4, inc_val);
+
        return 0;
 }
 
@@ -784,15 +902,20 @@ bool ecore_send_qm_stop_cmd(struct ecore_hwfn *p_hwfn,
                            bool is_tx_pq, u16 start_pq, u16 num_pqs)
 {
        u32 cmd_arr[QM_CMD_STRUCT_SIZE(QM_STOP_CMD)] = { 0 };
-       u32 pq_mask = 0, last_pq = start_pq + num_pqs - 1, pq_id;
-       /* set command's PQ type */
+       u32 pq_mask = 0, last_pq, pq_id;
+
+       last_pq = start_pq + num_pqs - 1;
+
+       /* Set command's PQ type */
        QM_CMD_SET_FIELD(cmd_arr, QM_STOP_CMD, PQ_TYPE, is_tx_pq ? 0 : 1);
-       /* go over requested PQs */
+
+       /* Go over requested PQs */
        for (pq_id = start_pq; pq_id <= last_pq; pq_id++) {
-               /* set PQ bit in mask (stop command only) */
+               /* Set PQ bit in mask (stop command only) */
                if (!is_release_cmd)
                        pq_mask |= (1 << (pq_id % QM_STOP_PQ_MASK_WIDTH));
-               /* if last PQ or end of PQ mask, write command */
+
+               /* If last PQ or end of PQ mask, write command */
                if ((pq_id == last_pq) ||
                    (pq_id % QM_STOP_PQ_MASK_WIDTH ==
                    (QM_STOP_PQ_MASK_WIDTH - 1))) {
@@ -807,68 +930,92 @@ bool ecore_send_qm_stop_cmd(struct ecore_hwfn *p_hwfn,
                        pq_mask = 0;
                }
        }
+
        return true;
 }
 
+
 /* NIG: ETS configuration constants */
 #define NIG_TX_ETS_CLIENT_OFFSET       4
 #define NIG_LB_ETS_CLIENT_OFFSET       1
 #define NIG_ETS_MIN_WFQ_BYTES          1600
+
 /* NIG: ETS constants */
 #define NIG_ETS_UP_BOUND(weight, mtu) \
-(2 * ((weight) > (mtu) ? (weight) : (mtu)))
+       (2 * ((weight) > (mtu) ? (weight) : (mtu)))
+
 /* NIG: RL constants */
-#define NIG_RL_BASE_TYPE                       1       /* byte base type */
-#define NIG_RL_PERIOD                          1       /* in us */
+
+/* Byte base type value */
+#define NIG_RL_BASE_TYPE               1
+
+/* Period in us */
+#define NIG_RL_PERIOD                  1
+
+/* Period in 25MHz cycles */
 #define NIG_RL_PERIOD_CLK_25M          (25 * NIG_RL_PERIOD)
+
+/* Rate in mbps */
 #define NIG_RL_INC_VAL(rate)           (((rate) * NIG_RL_PERIOD) / 8)
+
 #define NIG_RL_MAX_VAL(inc_val, mtu) \
-(2 * ((inc_val) > (mtu) ? (inc_val) : (mtu)))
+       (2 * ((inc_val) > (mtu) ? (inc_val) : (mtu)))
+
 /* NIG: packet prioritry configuration constants */
-#define NIG_PRIORITY_MAP_TC_BITS 4
+#define NIG_PRIORITY_MAP_TC_BITS       4
+
+
 void ecore_init_nig_ets(struct ecore_hwfn *p_hwfn,
                        struct ecore_ptt *p_ptt,
                        struct init_ets_req *req, bool is_lb)
 {
-       u8 tc, sp_tc_map = 0, wfq_tc_map = 0;
-       u8 num_tc = is_lb ? NUM_OF_TCS : NUM_OF_PHYS_TCS;
-       u8 tc_client_offset =
-           is_lb ? NIG_LB_ETS_CLIENT_OFFSET : NIG_TX_ETS_CLIENT_OFFSET;
-       u32 min_weight = 0xffffffff;
-       u32 tc_weight_base_addr =
-           is_lb ? NIG_REG_LB_ARB_CREDIT_WEIGHT_0 :
-           NIG_REG_TX_ARB_CREDIT_WEIGHT_0;
-       u32 tc_weight_addr_diff =
-           is_lb ? NIG_REG_LB_ARB_CREDIT_WEIGHT_1 -
-           NIG_REG_LB_ARB_CREDIT_WEIGHT_0 : NIG_REG_TX_ARB_CREDIT_WEIGHT_1 -
-           NIG_REG_TX_ARB_CREDIT_WEIGHT_0;
-       u32 tc_bound_base_addr =
-           is_lb ? NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_0 :
-           NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_0;
-       u32 tc_bound_addr_diff =
-           is_lb ? NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_1 -
-           NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_0 :
-           NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_1 -
-           NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_0;
+       u32 min_weight, tc_weight_base_addr, tc_weight_addr_diff;
+       u32 tc_bound_base_addr, tc_bound_addr_diff;
+       u8 sp_tc_map = 0, wfq_tc_map = 0;
+       u8 tc, num_tc, tc_client_offset;
+
+       num_tc = is_lb ? NUM_OF_TCS : NUM_OF_PHYS_TCS;
+       tc_client_offset = is_lb ? NIG_LB_ETS_CLIENT_OFFSET :
+                                  NIG_TX_ETS_CLIENT_OFFSET;
+       min_weight = 0xffffffff;
+       tc_weight_base_addr = is_lb ? NIG_REG_LB_ARB_CREDIT_WEIGHT_0 :
+                                     NIG_REG_TX_ARB_CREDIT_WEIGHT_0;
+       tc_weight_addr_diff = is_lb ? NIG_REG_LB_ARB_CREDIT_WEIGHT_1 -
+                                     NIG_REG_LB_ARB_CREDIT_WEIGHT_0 :
+                                     NIG_REG_TX_ARB_CREDIT_WEIGHT_1 -
+                                     NIG_REG_TX_ARB_CREDIT_WEIGHT_0;
+       tc_bound_base_addr = is_lb ? NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_0 :
+                                    NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_0;
+       tc_bound_addr_diff = is_lb ? NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_1 -
+                                    NIG_REG_LB_ARB_CREDIT_UPPER_BOUND_0 :
+                                    NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_1 -
+                                    NIG_REG_TX_ARB_CREDIT_UPPER_BOUND_0;
+
        for (tc = 0; tc < num_tc; tc++) {
                struct init_ets_tc_req *tc_req = &req->tc_req[tc];
-               /* update SP map */
+
+               /* Update SP map */
                if (tc_req->use_sp)
                        sp_tc_map |= (1 << tc);
-               if (tc_req->use_wfq) {
-                       /* update WFQ map */
-                       wfq_tc_map |= (1 << tc);
-                       /* find minimal weight */
-                       if (tc_req->weight < min_weight)
-                               min_weight = tc_req->weight;
-               }
+
+               if (!tc_req->use_wfq)
+                       continue;
+
+               /* Update WFQ map */
+               wfq_tc_map |= (1 << tc);
+
+               /* Find minimal weight */
+               if (tc_req->weight < min_weight)
+                       min_weight = tc_req->weight;
        }
-       /* write SP map */
+
+       /* Write SP map */
        ecore_wr(p_hwfn, p_ptt,
                 is_lb ? NIG_REG_LB_ARB_CLIENT_IS_STRICT :
                 NIG_REG_TX_ARB_CLIENT_IS_STRICT,
                 (sp_tc_map << tc_client_offset));
-       /* write WFQ map */
+
+       /* Write WFQ map */
        ecore_wr(p_hwfn, p_ptt,
                 is_lb ? NIG_REG_LB_ARB_CLIENT_IS_SUBJECT2WFQ :
                 NIG_REG_TX_ARB_CLIENT_IS_SUBJECT2WFQ,
@@ -876,22 +1023,23 @@ void ecore_init_nig_ets(struct ecore_hwfn *p_hwfn,
        /* write WFQ weights */
        for (tc = 0; tc < num_tc; tc++, tc_client_offset++) {
                struct init_ets_tc_req *tc_req = &req->tc_req[tc];
-               if (tc_req->use_wfq) {
-                       /* translate weight to bytes */
-                       u32 byte_weight =
-                           (NIG_ETS_MIN_WFQ_BYTES * tc_req->weight) /
-                           min_weight;
-                       /* write WFQ weight */
-                       ecore_wr(p_hwfn, p_ptt,
-                                tc_weight_base_addr +
-                                tc_weight_addr_diff * tc_client_offset,
-                                byte_weight);
-                       /* write WFQ upper bound */
-                       ecore_wr(p_hwfn, p_ptt,
-                                tc_bound_base_addr +
-                                tc_bound_addr_diff * tc_client_offset,
-                                NIG_ETS_UP_BOUND(byte_weight, req->mtu));
-               }
+               u32 byte_weight;
+
+               if (!tc_req->use_wfq)
+                       continue;
+
+               /* Translate weight to bytes */
+               byte_weight = (NIG_ETS_MIN_WFQ_BYTES * tc_req->weight) /
+                             min_weight;
+
+               /* Write WFQ weight */
+               ecore_wr(p_hwfn, p_ptt, tc_weight_base_addr +
+                        tc_weight_addr_diff * tc_client_offset, byte_weight);
+
+               /* Write WFQ upper bound */
+               ecore_wr(p_hwfn, p_ptt, tc_bound_base_addr +
+                        tc_bound_addr_diff * tc_client_offset,
+                        NIG_ETS_UP_BOUND(byte_weight, req->mtu));
        }
 }
 
@@ -899,16 +1047,18 @@ void ecore_init_nig_lb_rl(struct ecore_hwfn *p_hwfn,
                          struct ecore_ptt *p_ptt,
                          struct init_nig_lb_rl_req *req)
 {
-       u8 tc;
        u32 ctrl, inc_val, reg_offset;
-       /* disable global MAC+LB RL */
+       u8 tc;
+
+       /* Disable global MAC+LB RL */
        ctrl =
            NIG_RL_BASE_TYPE <<
            NIG_REG_TX_LB_GLBRATELIMIT_CTRL_TX_LB_GLBRATELIMIT_BASE_TYPE_SHIFT;
        ecore_wr(p_hwfn, p_ptt, NIG_REG_TX_LB_GLBRATELIMIT_CTRL, ctrl);
-       /* configure and enable global MAC+LB RL */
+
+       /* Configure and enable global MAC+LB RL */
        if (req->lb_mac_rate) {
-               /* configure  */
+               /* Configure  */
                ecore_wr(p_hwfn, p_ptt, NIG_REG_TX_LB_GLBRATELIMIT_INC_PERIOD,
                         NIG_RL_PERIOD_CLK_25M);
                inc_val = NIG_RL_INC_VAL(req->lb_mac_rate);
@@ -916,20 +1066,23 @@ void ecore_init_nig_lb_rl(struct ecore_hwfn *p_hwfn,
                         inc_val);
                ecore_wr(p_hwfn, p_ptt, NIG_REG_TX_LB_GLBRATELIMIT_MAX_VALUE,
                         NIG_RL_MAX_VAL(inc_val, req->mtu));
-               /* enable */
+
+               /* Enable */
                ctrl |=
                    1 <<
                    NIG_REG_TX_LB_GLBRATELIMIT_CTRL_TX_LB_GLBRATELIMIT_EN_SHIFT;
                ecore_wr(p_hwfn, p_ptt, NIG_REG_TX_LB_GLBRATELIMIT_CTRL, ctrl);
        }
-       /* disable global LB-only RL */
+
+       /* Disable global LB-only RL */
        ctrl =
            NIG_RL_BASE_TYPE <<
            NIG_REG_LB_BRBRATELIMIT_CTRL_LB_BRBRATELIMIT_BASE_TYPE_SHIFT;
        ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_BRBRATELIMIT_CTRL, ctrl);
-       /* configure and enable global LB-only RL */
+
+       /* Configure and enable global LB-only RL */
        if (req->lb_rate) {
-               /* configure  */
+               /* Configure  */
                ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_BRBRATELIMIT_INC_PERIOD,
                         NIG_RL_PERIOD_CLK_25M);
                inc_val = NIG_RL_INC_VAL(req->lb_rate);
@@ -937,41 +1090,41 @@ void ecore_init_nig_lb_rl(struct ecore_hwfn *p_hwfn,
                         inc_val);
                ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_BRBRATELIMIT_MAX_VALUE,
                         NIG_RL_MAX_VAL(inc_val, req->mtu));
-               /* enable */
+
+               /* Enable */
                ctrl |=
                    1 << NIG_REG_LB_BRBRATELIMIT_CTRL_LB_BRBRATELIMIT_EN_SHIFT;
                ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_BRBRATELIMIT_CTRL, ctrl);
        }
-       /* per-TC RLs */
+
+       /* Per-TC RLs */
        for (tc = 0, reg_offset = 0; tc < NUM_OF_PHYS_TCS;
             tc++, reg_offset += 4) {
-               /* disable TC RL */
+               /* Disable TC RL */
                ctrl =
                    NIG_RL_BASE_TYPE <<
                NIG_REG_LB_TCRATELIMIT_CTRL_0_LB_TCRATELIMIT_BASE_TYPE_0_SHIFT;
                ecore_wr(p_hwfn, p_ptt,
                         NIG_REG_LB_TCRATELIMIT_CTRL_0 + reg_offset, ctrl);
-               /* configure and enable TC RL */
-               if (req->tc_rate[tc]) {
-                       /* configure */
-                       ecore_wr(p_hwfn, p_ptt,
-                                NIG_REG_LB_TCRATELIMIT_INC_PERIOD_0 +
-                                reg_offset, NIG_RL_PERIOD_CLK_25M);
-                       inc_val = NIG_RL_INC_VAL(req->tc_rate[tc]);
-                       ecore_wr(p_hwfn, p_ptt,
-                                NIG_REG_LB_TCRATELIMIT_INC_VALUE_0 +
-                                reg_offset, inc_val);
-                       ecore_wr(p_hwfn, p_ptt,
-                                NIG_REG_LB_TCRATELIMIT_MAX_VALUE_0 +
-                                reg_offset, NIG_RL_MAX_VAL(inc_val, req->mtu));
-                       /* enable */
-                       ctrl |=
-                           1 <<
-               NIG_REG_LB_TCRATELIMIT_CTRL_0_LB_TCRATELIMIT_EN_0_SHIFT;
-                       ecore_wr(p_hwfn, p_ptt,
-                                NIG_REG_LB_TCRATELIMIT_CTRL_0 + reg_offset,
-                                ctrl);
-               }
+
+               /* Configure and enable TC RL */
+               if (!req->tc_rate[tc])
+                       continue;
+
+               /* Configure */
+               ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_TCRATELIMIT_INC_PERIOD_0 +
+                        reg_offset, NIG_RL_PERIOD_CLK_25M);
+               inc_val = NIG_RL_INC_VAL(req->tc_rate[tc]);
+               ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_TCRATELIMIT_INC_VALUE_0 +
+                        reg_offset, inc_val);
+               ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_TCRATELIMIT_MAX_VALUE_0 +
+                        reg_offset, NIG_RL_MAX_VAL(inc_val, req->mtu));
+
+               /* Enable */
+               ctrl |= 1 <<
+                       NIG_REG_LB_TCRATELIMIT_CTRL_0_LB_TCRATELIMIT_EN_0_SHIFT;
+               ecore_wr(p_hwfn, p_ptt, NIG_REG_LB_TCRATELIMIT_CTRL_0 +
+                        reg_offset, ctrl);
        }
 }
 
@@ -979,20 +1132,23 @@ void ecore_init_nig_pri_tc_map(struct ecore_hwfn *p_hwfn,
                               struct ecore_ptt *p_ptt,
                               struct init_nig_pri_tc_map_req *req)
 {
-       u8 pri, tc;
-       u32 pri_tc_mask = 0;
        u8 tc_pri_mask[NUM_OF_PHYS_TCS] = { 0 };
+       u32 pri_tc_mask = 0;
+       u8 pri, tc;
+
        for (pri = 0; pri < NUM_OF_VLAN_PRIORITIES; pri++) {
-               if (req->pri[pri].valid) {
-                       pri_tc_mask |=
-                           (req->pri[pri].
-                            tc_id << (pri * NIG_PRIORITY_MAP_TC_BITS));
-                       tc_pri_mask[req->pri[pri].tc_id] |= (1 << pri);
-               }
+               if (!req->pri[pri].valid)
+                       continue;
+
+               pri_tc_mask |= (req->pri[pri].tc_id <<
+                               (pri * NIG_PRIORITY_MAP_TC_BITS));
+               tc_pri_mask[req->pri[pri].tc_id] |= (1 << pri);
        }
-       /* write priority -> TC mask */
+
+       /* Write priority -> TC mask */
        ecore_wr(p_hwfn, p_ptt, NIG_REG_PKT_PRIORITY_TO_TC, pri_tc_mask);
-       /* write TC -> priority mask */
+
+       /* Write TC -> priority mask */
        for (tc = 0; tc < NUM_OF_PHYS_TCS; tc++) {
                ecore_wr(p_hwfn, p_ptt, NIG_REG_PRIORITY_FOR_TC_0 + tc * 4,
                         tc_pri_mask[tc]);
@@ -1001,110 +1157,133 @@ void ecore_init_nig_pri_tc_map(struct ecore_hwfn *p_hwfn,
        }
 }
 
+
 /* PRS: ETS configuration constants */
-#define PRS_ETS_MIN_WFQ_BYTES                  1600
+#define PRS_ETS_MIN_WFQ_BYTES          1600
 #define PRS_ETS_UP_BOUND(weight, mtu) \
-(2 * ((weight) > (mtu) ? (weight) : (mtu)))
+       (2 * ((weight) > (mtu) ? (weight) : (mtu)))
+
+
 void ecore_init_prs_ets(struct ecore_hwfn *p_hwfn,
                        struct ecore_ptt *p_ptt, struct init_ets_req *req)
 {
+       u32 tc_weight_addr_diff, tc_bound_addr_diff, min_weight = 0xffffffff;
        u8 tc, sp_tc_map = 0, wfq_tc_map = 0;
-       u32 min_weight = 0xffffffff;
-       u32 tc_weight_addr_diff =
-           PRS_REG_ETS_ARB_CREDIT_WEIGHT_1 - PRS_REG_ETS_ARB_CREDIT_WEIGHT_0;
-       u32 tc_bound_addr_diff =
-           PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_1 -
-           PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_0;
+
+       tc_weight_addr_diff = PRS_REG_ETS_ARB_CREDIT_WEIGHT_1 -
+                             PRS_REG_ETS_ARB_CREDIT_WEIGHT_0;
+       tc_bound_addr_diff = PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_1 -
+                            PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_0;
+
        for (tc = 0; tc < NUM_OF_TCS; tc++) {
                struct init_ets_tc_req *tc_req = &req->tc_req[tc];
-               /* update SP map */
+
+               /* Update SP map */
                if (tc_req->use_sp)
                        sp_tc_map |= (1 << tc);
-               if (tc_req->use_wfq) {
-                       /* update WFQ map */
-                       wfq_tc_map |= (1 << tc);
-                       /* find minimal weight */
-                       if (tc_req->weight < min_weight)
-                               min_weight = tc_req->weight;
-               }
+
+               if (!tc_req->use_wfq)
+                       continue;
+
+               /* Update WFQ map */
+               wfq_tc_map |= (1 << tc);
+
+               /* Find minimal weight */
+               if (tc_req->weight < min_weight)
+                       min_weight = tc_req->weight;
        }
+
        /* write SP map */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_ETS_ARB_CLIENT_IS_STRICT, sp_tc_map);
+
        /* write WFQ map */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_ETS_ARB_CLIENT_IS_SUBJECT2WFQ,
                 wfq_tc_map);
+
        /* write WFQ weights */
        for (tc = 0; tc < NUM_OF_TCS; tc++) {
                struct init_ets_tc_req *tc_req = &req->tc_req[tc];
-               if (tc_req->use_wfq) {
-                       /* translate weight to bytes */
-                       u32 byte_weight =
-                           (PRS_ETS_MIN_WFQ_BYTES * tc_req->weight) /
-                           min_weight;
-                       /* write WFQ weight */
-                       ecore_wr(p_hwfn, p_ptt,
-                                PRS_REG_ETS_ARB_CREDIT_WEIGHT_0 +
-                                tc * tc_weight_addr_diff, byte_weight);
-                       /* write WFQ upper bound */
-                       ecore_wr(p_hwfn, p_ptt,
-                                PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_0 +
-                                tc * tc_bound_addr_diff,
-                                PRS_ETS_UP_BOUND(byte_weight, req->mtu));
-               }
+               u32 byte_weight;
+
+               if (!tc_req->use_wfq)
+                       continue;
+
+               /* Translate weight to bytes */
+               byte_weight = (PRS_ETS_MIN_WFQ_BYTES * tc_req->weight) /
+                             min_weight;
+
+               /* Write WFQ weight */
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_ETS_ARB_CREDIT_WEIGHT_0 + tc *
+                        tc_weight_addr_diff, byte_weight);
+
+               /* Write WFQ upper bound */
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_ETS_ARB_CREDIT_UPPER_BOUND_0 +
+                        tc * tc_bound_addr_diff, PRS_ETS_UP_BOUND(byte_weight,
+                                                                  req->mtu));
        }
 }
 
+
 /* BRB: RAM configuration constants */
 #define BRB_TOTAL_RAM_BLOCKS_BB        4800
 #define BRB_TOTAL_RAM_BLOCKS_K2        5632
-#define BRB_BLOCK_SIZE                 128     /* in bytes */
+#define BRB_BLOCK_SIZE         128
 #define BRB_MIN_BLOCKS_PER_TC  9
-#define BRB_HYST_BYTES                 10240
-#define BRB_HYST_BLOCKS                        (BRB_HYST_BYTES / BRB_BLOCK_SIZE)
-/*
- * temporary big RAM allocation - should be updated
- */
+#define BRB_HYST_BYTES         10240
+#define BRB_HYST_BLOCKS                (BRB_HYST_BYTES / BRB_BLOCK_SIZE)
+
+/* Temporary big RAM allocation - should be updated */
 void ecore_init_brb_ram(struct ecore_hwfn *p_hwfn,
                        struct ecore_ptt *p_ptt, struct init_brb_ram_req *req)
 {
-       u8 port, active_ports = 0;
+       u32 tc_headroom_blocks, min_pkt_size_blocks, total_blocks;
        u32 active_port_blocks, reg_offset = 0;
-       u32 tc_headroom_blocks =
-           (u32)DIV_ROUND_UP(req->headroom_per_tc, BRB_BLOCK_SIZE);
-       u32 min_pkt_size_blocks =
-           (u32)DIV_ROUND_UP(req->min_pkt_size, BRB_BLOCK_SIZE);
-       u32 total_blocks =
-           ECORE_IS_K2(p_hwfn->
-                       p_dev) ? BRB_TOTAL_RAM_BLOCKS_K2 :
-           BRB_TOTAL_RAM_BLOCKS_BB;
-       /* find number of active ports */
+       u8 port, active_ports = 0;
+
+       tc_headroom_blocks = (u32)DIV_ROUND_UP(req->headroom_per_tc,
+                                              BRB_BLOCK_SIZE);
+       min_pkt_size_blocks = (u32)DIV_ROUND_UP(req->min_pkt_size,
+                                               BRB_BLOCK_SIZE);
+       total_blocks = ECORE_IS_K2(p_hwfn->p_dev) ? BRB_TOTAL_RAM_BLOCKS_K2 :
+                                                   BRB_TOTAL_RAM_BLOCKS_BB;
+
+       /* Find number of active ports */
        for (port = 0; port < MAX_NUM_PORTS; port++)
                if (req->num_active_tcs[port])
                        active_ports++;
+
        active_port_blocks = (u32)(total_blocks / active_ports);
+
        for (port = 0; port < req->max_ports_per_engine; port++) {
-               /* calculate per-port sizes */
-               u32 tc_guaranteed_blocks =
-                   (u32)DIV_ROUND_UP(req->guranteed_per_tc, BRB_BLOCK_SIZE);
-               u32 port_blocks =
-                   req->num_active_tcs[port] ? active_port_blocks : 0;
-               u32 port_guaranteed_blocks =
-                   req->num_active_tcs[port] * tc_guaranteed_blocks;
-               u32 port_shared_blocks = port_blocks - port_guaranteed_blocks;
-               u32 full_xoff_th =
-                   req->num_active_tcs[port] * BRB_MIN_BLOCKS_PER_TC;
-               u32 full_xon_th = full_xoff_th + min_pkt_size_blocks;
-               u32 pause_xoff_th = tc_headroom_blocks;
-               u32 pause_xon_th = pause_xoff_th + min_pkt_size_blocks;
+               u32 port_blocks, port_shared_blocks, port_guaranteed_blocks;
+               u32 full_xoff_th, full_xon_th, pause_xoff_th, pause_xon_th;
+               u32 tc_guaranteed_blocks;
                u8 tc;
-               /* init total size per port */
+
+               /* Calculate per-port sizes */
+               tc_guaranteed_blocks = (u32)DIV_ROUND_UP(req->guranteed_per_tc,
+                                                        BRB_BLOCK_SIZE);
+               port_blocks = req->num_active_tcs[port] ? active_port_blocks :
+                                                         0;
+               port_guaranteed_blocks = req->num_active_tcs[port] *
+                                        tc_guaranteed_blocks;
+               port_shared_blocks = port_blocks - port_guaranteed_blocks;
+               full_xoff_th = req->num_active_tcs[port] *
+                              BRB_MIN_BLOCKS_PER_TC;
+               full_xon_th = full_xoff_th + min_pkt_size_blocks;
+               pause_xoff_th = tc_headroom_blocks;
+               pause_xon_th = pause_xoff_th + min_pkt_size_blocks;
+
+               /* Init total size per port */
                ecore_wr(p_hwfn, p_ptt, BRB_REG_TOTAL_MAC_SIZE + port * 4,
                         port_blocks);
-               /* init shared size per port */
+
+               /* Init shared size per port */
                ecore_wr(p_hwfn, p_ptt, BRB_REG_SHARED_HR_AREA + port * 4,
                         port_shared_blocks);
+
                for (tc = 0; tc < NUM_OF_TCS; tc++, reg_offset += 4) {
-                       /* clear init values for non-active TCs */
+                       /* Clear init values for non-active TCs */
                        if (tc == req->num_active_tcs[port]) {
                                tc_guaranteed_blocks = 0;
                                full_xoff_th = 0;
@@ -1112,15 +1291,18 @@ void ecore_init_brb_ram(struct ecore_hwfn *p_hwfn,
                                pause_xoff_th = 0;
                                pause_xon_th = 0;
                        }
-                       /* init guaranteed size per TC */
+
+                       /* Init guaranteed size per TC */
                        ecore_wr(p_hwfn, p_ptt,
                                 BRB_REG_TC_GUARANTIED_0 + reg_offset,
                                 tc_guaranteed_blocks);
                        ecore_wr(p_hwfn, p_ptt,
                                 BRB_REG_MAIN_TC_GUARANTIED_HYST_0 + reg_offset,
                                 BRB_HYST_BLOCKS);
-/* init pause/full thresholds per physical TC - for loopback traffic */
 
+                       /* Init pause/full thresholds per physical TC - for
+                        * loopback traffic.
+                        */
                        ecore_wr(p_hwfn, p_ptt,
                                 BRB_REG_LB_TC_FULL_XOFF_THRESHOLD_0 +
                                 reg_offset, full_xoff_th);
@@ -1133,7 +1315,10 @@ void ecore_init_brb_ram(struct ecore_hwfn *p_hwfn,
                        ecore_wr(p_hwfn, p_ptt,
                                 BRB_REG_LB_TC_PAUSE_XON_THRESHOLD_0 +
                                 reg_offset, pause_xon_th);
-/* init pause/full thresholds per physical TC - for main traffic */
+
+                       /* Init pause/full thresholds per physical TC - for
+                        * main traffic.
+                        */
                        ecore_wr(p_hwfn, p_ptt,
                                 BRB_REG_MAIN_TC_FULL_XOFF_THRESHOLD_0 +
                                 reg_offset, full_xoff_th);
@@ -1150,23 +1335,25 @@ void ecore_init_brb_ram(struct ecore_hwfn *p_hwfn,
        }
 }
 
-/*In MF should be called once per engine to set EtherType of OuterTag*/
+/* In MF should be called once per engine to set EtherType of OuterTag */
 void ecore_set_engine_mf_ovlan_eth_type(struct ecore_hwfn *p_hwfn,
                                        struct ecore_ptt *p_ptt, u32 ethType)
 {
-       /* update PRS register */
+       /* Update PRS register */
        STORE_RT_REG(p_hwfn, PRS_REG_TAG_ETHERTYPE_0_RT_OFFSET, ethType);
-       /* update NIG register */
+
+       /* Update NIG register */
        STORE_RT_REG(p_hwfn, NIG_REG_TAG_ETHERTYPE_0_RT_OFFSET, ethType);
-       /* update PBF register */
+
+       /* Update PBF register */
        STORE_RT_REG(p_hwfn, PBF_REG_TAG_ETHERTYPE_0_RT_OFFSET, ethType);
 }
 
-/*In MF should be called once per port to set EtherType of OuterTag*/
+/* In MF should be called once per port to set EtherType of OuterTag */
 void ecore_set_port_mf_ovlan_eth_type(struct ecore_hwfn *p_hwfn,
                                      struct ecore_ptt *p_ptt, u32 ethType)
 {
-       /* update DORQ register */
+       /* Update DORQ register */
        STORE_RT_REG(p_hwfn, DORQ_REG_TAG1_ETHERTYPE_RT_OFFSET, ethType);
 }
 
@@ -1176,11 +1363,13 @@ void ecore_set_port_mf_ovlan_eth_type(struct ecore_hwfn *p_hwfn,
 void ecore_set_vxlan_dest_port(struct ecore_hwfn *p_hwfn,
                               struct ecore_ptt *p_ptt, u16 dest_port)
 {
-       /* update PRS register */
+       /* Update PRS register */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_VXLAN_PORT, dest_port);
-       /* update NIG register */
+
+       /* Update NIG register */
        ecore_wr(p_hwfn, p_ptt, NIG_REG_VXLAN_CTRL, dest_port);
-       /* update PBF register */
+
+       /* Update PBF register */
        ecore_wr(p_hwfn, p_ptt, PBF_REG_VXLAN_PORT, dest_port);
 }
 
@@ -1188,23 +1377,26 @@ void ecore_set_vxlan_enable(struct ecore_hwfn *p_hwfn,
                            struct ecore_ptt *p_ptt, bool vxlan_enable)
 {
        u32 reg_val;
-       /* update PRS register */
+
+       /* Update PRS register */
        reg_val = ecore_rd(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN);
        SET_TUNNEL_TYPE_ENABLE_BIT(reg_val,
                           PRS_REG_ENCAPSULATION_TYPE_EN_VXLAN_ENABLE_SHIFT,
                           vxlan_enable);
        ecore_wr(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN, reg_val);
        if (reg_val) {
-               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0,
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0_BB_K2,
                         (u32)PRS_ETH_TUNN_FIC_FORMAT);
        }
-       /* update NIG register */
+
+       /* Update NIG register */
        reg_val = ecore_rd(p_hwfn, p_ptt, NIG_REG_ENC_TYPE_ENABLE);
        SET_TUNNEL_TYPE_ENABLE_BIT(reg_val,
                                   NIG_REG_ENC_TYPE_ENABLE_VXLAN_ENABLE_SHIFT,
                                   vxlan_enable);
        ecore_wr(p_hwfn, p_ptt, NIG_REG_ENC_TYPE_ENABLE, reg_val);
-       /* update DORQ register */
+
+       /* Update DORQ register */
        ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_VXLAN_EN,
                 vxlan_enable ? 1 : 0);
 }
@@ -1214,7 +1406,8 @@ void ecore_set_gre_enable(struct ecore_hwfn *p_hwfn,
                          bool eth_gre_enable, bool ip_gre_enable)
 {
        u32 reg_val;
-       /* update PRS register */
+
+       /* Update PRS register */
        reg_val = ecore_rd(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN);
        SET_TUNNEL_TYPE_ENABLE_BIT(reg_val,
                   PRS_REG_ENCAPSULATION_TYPE_EN_ETH_OVER_GRE_ENABLE_SHIFT,
@@ -1224,10 +1417,11 @@ void ecore_set_gre_enable(struct ecore_hwfn *p_hwfn,
                   ip_gre_enable);
        ecore_wr(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN, reg_val);
        if (reg_val) {
-               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0,
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0_BB_K2,
                         (u32)PRS_ETH_TUNN_FIC_FORMAT);
        }
-       /* update NIG register */
+
+       /* Update NIG register */
        reg_val = ecore_rd(p_hwfn, p_ptt, NIG_REG_ENC_TYPE_ENABLE);
        SET_TUNNEL_TYPE_ENABLE_BIT(reg_val,
                   NIG_REG_ENC_TYPE_ENABLE_ETH_OVER_GRE_ENABLE_SHIFT,
@@ -1236,7 +1430,8 @@ void ecore_set_gre_enable(struct ecore_hwfn *p_hwfn,
                   NIG_REG_ENC_TYPE_ENABLE_IP_OVER_GRE_ENABLE_SHIFT,
                   ip_gre_enable);
        ecore_wr(p_hwfn, p_ptt, NIG_REG_ENC_TYPE_ENABLE, reg_val);
-       /* update DORQ registers */
+
+       /* Update DORQ registers */
        ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_GRE_ETH_EN,
                 eth_gre_enable ? 1 : 0);
        ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_GRE_IP_EN,
@@ -1246,14 +1441,13 @@ void ecore_set_gre_enable(struct ecore_hwfn *p_hwfn,
 void ecore_set_geneve_dest_port(struct ecore_hwfn *p_hwfn,
                                struct ecore_ptt *p_ptt, u16 dest_port)
 {
-       /* geneve tunnel not supported in BB_A0 */
-       if (ECORE_IS_BB_A0(p_hwfn->p_dev))
-               return;
-       /* update PRS register */
+       /* Update PRS register */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_NGE_PORT, dest_port);
-       /* update NIG register */
+
+       /* Update NIG register */
        ecore_wr(p_hwfn, p_ptt, NIG_REG_NGE_PORT, dest_port);
-       /* update PBF register */
+
+       /* Update PBF register */
        ecore_wr(p_hwfn, p_ptt, PBF_REG_NGE_PORT, dest_port);
 }
 
@@ -1262,10 +1456,8 @@ void ecore_set_geneve_enable(struct ecore_hwfn *p_hwfn,
                             bool eth_geneve_enable, bool ip_geneve_enable)
 {
        u32 reg_val;
-       /* geneve tunnel not supported in BB_A0 */
-       if (ECORE_IS_BB_A0(p_hwfn->p_dev))
-               return;
-       /* update PRS register */
+
+       /* Update PRS register */
        reg_val = ecore_rd(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN);
        SET_TUNNEL_TYPE_ENABLE_BIT(reg_val,
                   PRS_REG_ENCAPSULATION_TYPE_EN_ETH_OVER_GENEVE_ENABLE_SHIFT,
@@ -1275,42 +1467,75 @@ void ecore_set_geneve_enable(struct ecore_hwfn *p_hwfn,
                   ip_geneve_enable);
        ecore_wr(p_hwfn, p_ptt, PRS_REG_ENCAPSULATION_TYPE_EN, reg_val);
        if (reg_val) {
-               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0,
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_OUTPUT_FORMAT_4_0_BB_K2,
                         (u32)PRS_ETH_TUNN_FIC_FORMAT);
        }
-       /* update NIG register */
+
+       /* Update NIG register */
        ecore_wr(p_hwfn, p_ptt, NIG_REG_NGE_ETH_ENABLE,
                 eth_geneve_enable ? 1 : 0);
        ecore_wr(p_hwfn, p_ptt, NIG_REG_NGE_IP_ENABLE,
                 ip_geneve_enable ? 1 : 0);
-       /* comp ver */
-       reg_val = (ip_geneve_enable || eth_geneve_enable) ? 1 : 0;
-       ecore_wr(p_hwfn, p_ptt, NIG_REG_NGE_COMP_VER, reg_val);
-       ecore_wr(p_hwfn, p_ptt, PBF_REG_NGE_COMP_VER, reg_val);
-       ecore_wr(p_hwfn, p_ptt, PRS_REG_NGE_COMP_VER, reg_val);
-       /* EDPM with geneve tunnel not supported in BB_B0 */
+
+       /* EDPM with geneve tunnel not supported in BB */
        if (ECORE_IS_BB_B0(p_hwfn->p_dev))
                return;
-       /* update DORQ registers */
-       ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_NGE_ETH_EN,
+
+       /* Update DORQ registers */
+       ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_NGE_ETH_EN_K2_E5,
                 eth_geneve_enable ? 1 : 0);
-       ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_NGE_IP_EN,
+       ecore_wr(p_hwfn, p_ptt, DORQ_REG_L2_EDPM_TUNNEL_NGE_IP_EN_K2_E5,
                 ip_geneve_enable ? 1 : 0);
 }
 
+
 #define T_ETH_PACKET_ACTION_GFT_EVENTID  23
 #define PARSER_ETH_CONN_GFT_ACTION_CM_HDR  272
 #define T_ETH_PACKET_MATCH_RFS_EVENTID 25
-#define PARSER_ETH_CONN_CM_HDR (0x0)
+#define PARSER_ETH_CONN_CM_HDR 0
 #define CAM_LINE_SIZE sizeof(u32)
 #define RAM_LINE_SIZE sizeof(u64)
 #define REG_SIZE sizeof(u32)
 
+void ecore_set_rfs_mode_disable(struct ecore_hwfn *p_hwfn,
+       struct ecore_ptt *p_ptt,
+       u16 pf_id)
+{
+       union gft_cam_line_union cam_line;
+       struct gft_ram_line ram_line;
+       u32 i, *ram_line_ptr;
+
+       ram_line_ptr = (u32 *)&ram_line;
+
+       /* Stop using gft logic, disable gft search */
+       ecore_wr(p_hwfn, p_ptt, PRS_REG_SEARCH_GFT, 0);
+       ecore_wr(p_hwfn, p_ptt, PRS_REG_CM_HDR_GFT, 0x0);
+
+       /* Clean ram & cam for next rfs/gft session*/
+
+       /* Zero camline */
+       OSAL_MEMSET(&cam_line, 0, sizeof(cam_line));
+       ecore_wr(p_hwfn, p_ptt, PRS_REG_GFT_CAM + CAM_LINE_SIZE * pf_id,
+                                       cam_line.cam_line_mapped.camline);
+
+       /* Zero ramline */
+       OSAL_MEMSET(&ram_line, 0, sizeof(ram_line));
+
+       /* Each iteration write to reg */
+       for (i = 0; i < RAM_LINE_SIZE / REG_SIZE; i++)
+               ecore_wr(p_hwfn, p_ptt, PRS_REG_GFT_PROFILE_MASK_RAM +
+                        RAM_LINE_SIZE * pf_id +
+                        i * REG_SIZE, *(ram_line_ptr + i));
+}
+
+
 void ecore_set_gft_event_id_cm_hdr(struct ecore_hwfn *p_hwfn,
                                   struct ecore_ptt *p_ptt)
 {
-       /* set RFS event ID to be awakened i Tstorm By Prs */
-       u32 rfs_cm_hdr_event_id = ecore_rd(p_hwfn, p_ptt, PRS_REG_CM_HDR_GFT);
+       u32 rfs_cm_hdr_event_id;
+
+       /* Set RFS event ID to be awakened i Tstorm By Prs */
+       rfs_cm_hdr_event_id = ecore_rd(p_hwfn, p_ptt, PRS_REG_CM_HDR_GFT);
        rfs_cm_hdr_event_id |= T_ETH_PACKET_ACTION_GFT_EVENTID <<
            PRS_REG_CM_HDR_GFT_EVENT_ID_SHIFT;
        rfs_cm_hdr_event_id |= PARSER_ETH_CONN_GFT_ACTION_CM_HDR <<
@@ -1331,39 +1556,48 @@ void ecore_set_rfs_mode_enable(struct ecore_hwfn *p_hwfn,
        struct gft_ram_line ramLine;
        u32 *ramLinePointer = (u32 *)&ramLine;
        int i;
+
        if (!ipv6 && !ipv4)
                DP_NOTICE(p_hwfn, true,
                          "set_rfs_mode_enable: must accept at "
                          "least on of - ipv4 or ipv6");
+
        if (!tcp && !udp)
                DP_NOTICE(p_hwfn, true,
                          "set_rfs_mode_enable: must accept at "
                          "least on of - udp or tcp");
-       /* set RFS event ID to be awakened i Tstorm By Prs */
+
+       /* Set RFS event ID to be awakened i Tstorm By Prs */
        rfs_cm_hdr_event_id |=  T_ETH_PACKET_MATCH_RFS_EVENTID <<
            PRS_REG_CM_HDR_GFT_EVENT_ID_SHIFT;
        rfs_cm_hdr_event_id |=  PARSER_ETH_CONN_CM_HDR <<
            PRS_REG_CM_HDR_GFT_CM_HDR_SHIFT;
        ecore_wr(p_hwfn, p_ptt, PRS_REG_CM_HDR_GFT, rfs_cm_hdr_event_id);
+
        /* Configure Registers for RFS mode */
-/* enable gft search */
+
+       /* Enable gft search */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_SEARCH_GFT, 1);
        ecore_wr(p_hwfn, p_ptt, PRS_REG_LOAD_L2_FILTER, 0); /* do not load
                                                             * context only cid
                                                             * in PRS on match
                                                             */
        camLine.cam_line_mapped.camline = 0;
-       /* cam line is now valid!! */
+
+       /* Cam line is now valid!! */
        SET_FIELD(camLine.cam_line_mapped.camline,
                  GFT_CAM_LINE_MAPPED_VALID, 1);
-       /* filters are per PF!! */
+
+       /* Filters are per PF!! */
        SET_FIELD(camLine.cam_line_mapped.camline,
                  GFT_CAM_LINE_MAPPED_PF_ID_MASK, 1);
        SET_FIELD(camLine.cam_line_mapped.camline,
                  GFT_CAM_LINE_MAPPED_PF_ID, pf_id);
+
        if (!(tcp && udp)) {
                SET_FIELD(camLine.cam_line_mapped.camline,
-                         GFT_CAM_LINE_MAPPED_UPPER_PROTOCOL_TYPE_MASK, 1);
+                         GFT_CAM_LINE_MAPPED_UPPER_PROTOCOL_TYPE_MASK,
+                         GFT_CAM_LINE_MAPPED_UPPER_PROTOCOL_TYPE_MASK_MASK);
                if (tcp)
                        SET_FIELD(camLine.cam_line_mapped.camline,
                                  GFT_CAM_LINE_MAPPED_UPPER_PROTOCOL_TYPE,
@@ -1373,6 +1607,7 @@ void ecore_set_rfs_mode_enable(struct ecore_hwfn *p_hwfn,
                                  GFT_CAM_LINE_MAPPED_UPPER_PROTOCOL_TYPE,
                                  GFT_PROFILE_UDP_PROTOCOL);
        }
+
        if (!(ipv4 && ipv6)) {
                SET_FIELD(camLine.cam_line_mapped.camline,
                          GFT_CAM_LINE_MAPPED_IP_VERSION_MASK, 1);
@@ -1385,44 +1620,53 @@ void ecore_set_rfs_mode_enable(struct ecore_hwfn *p_hwfn,
                                  GFT_CAM_LINE_MAPPED_IP_VERSION,
                                  GFT_PROFILE_IPV6);
        }
-       /* write characteristics to cam */
+
+       /* Write characteristics to cam */
        ecore_wr(p_hwfn, p_ptt, PRS_REG_GFT_CAM + CAM_LINE_SIZE * pf_id,
            camLine.cam_line_mapped.camline);
        camLine.cam_line_mapped.camline =
            ecore_rd(p_hwfn, p_ptt, PRS_REG_GFT_CAM + CAM_LINE_SIZE * pf_id);
-       /* write line to RAM - compare to filter 4 tuple */
-       ramLine.low32bits = 0;
-       ramLine.high32bits = 0;
-       SET_FIELD(ramLine.high32bits, GFT_RAM_LINE_DST_IP, 1);
-       SET_FIELD(ramLine.high32bits, GFT_RAM_LINE_SRC_IP, 1);
-       SET_FIELD(ramLine.low32bits, GFT_RAM_LINE_SRC_PORT, 1);
-       SET_FIELD(ramLine.low32bits, GFT_RAM_LINE_DST_PORT, 1);
-       /* each iteration write to reg */
+
+       /* Write line to RAM - compare to filter 4 tuple */
+       ramLine.lo = 0;
+       ramLine.hi = 0;
+       SET_FIELD(ramLine.hi, GFT_RAM_LINE_DST_IP, 1);
+       SET_FIELD(ramLine.hi, GFT_RAM_LINE_SRC_IP, 1);
+       SET_FIELD(ramLine.hi, GFT_RAM_LINE_OVER_IP_PROTOCOL, 1);
+       SET_FIELD(ramLine.lo, GFT_RAM_LINE_ETHERTYPE, 1);
+       SET_FIELD(ramLine.lo, GFT_RAM_LINE_SRC_PORT, 1);
+       SET_FIELD(ramLine.lo, GFT_RAM_LINE_DST_PORT, 1);
+
+       /* Each iteration write to reg */
        for (i = 0; i < RAM_LINE_SIZE / REG_SIZE; i++)
                ecore_wr(p_hwfn, p_ptt, PRS_REG_GFT_PROFILE_MASK_RAM +
                         RAM_LINE_SIZE * pf_id +
                         i * REG_SIZE, *(ramLinePointer + i));
-       /* set default profile so that no filter match will happen */
-       ramLine.low32bits = 0xffff;
-       ramLine.high32bits = 0xffff;
+
+       /* Set default profile so that no filter match will happen */
+       ramLine.lo = 0xffff;
+       ramLine.hi = 0xffff;
        for (i = 0; i < RAM_LINE_SIZE / REG_SIZE; i++)
                ecore_wr(p_hwfn, p_ptt, PRS_REG_GFT_PROFILE_MASK_RAM +
                         RAM_LINE_SIZE * PRS_GFT_CAM_LINES_NO_MATCH +
                         i * REG_SIZE, *(ramLinePointer + i));
 }
 
-/* Configure VF zone size mode*/
+/* Configure VF zone size mode */
 void ecore_config_vf_zone_size_mode(struct ecore_hwfn *p_hwfn,
                                    struct ecore_ptt *p_ptt, u16 mode,
                                    bool runtime_init)
 {
        u32 msdm_vf_size_log = MSTORM_VF_ZONE_DEFAULT_SIZE_LOG;
        u32 msdm_vf_offset_mask;
+
        if (mode == VF_ZONE_SIZE_MODE_DOUBLE)
                msdm_vf_size_log += 1;
        else if (mode == VF_ZONE_SIZE_MODE_QUAD)
                msdm_vf_size_log += 2;
+
        msdm_vf_offset_mask = (1 << msdm_vf_size_log) - 1;
+
        if (runtime_init) {
                STORE_RT_REG(p_hwfn,
                             PGLUE_REG_B_MSDM_VF_SHIFT_B_RT_OFFSET,
@@ -1438,12 +1682,13 @@ void ecore_config_vf_zone_size_mode(struct ecore_hwfn *p_hwfn,
        }
 }
 
-/* get mstorm statistics for offset by VF zone size mode*/
+/* Get mstorm statistics for offset by VF zone size mode */
 u32 ecore_get_mstorm_queue_stat_offset(struct ecore_hwfn *p_hwfn,
                                       u16 stat_cnt_id,
                                       u16 vf_zone_size_mode)
 {
        u32 offset = MSTORM_QUEUE_STAT_OFFSET(stat_cnt_id);
+
        if ((vf_zone_size_mode != VF_ZONE_SIZE_MODE_DEFAULT) &&
            (stat_cnt_id > MAX_NUM_PFS)) {
                if (vf_zone_size_mode == VF_ZONE_SIZE_MODE_DOUBLE)
@@ -1453,16 +1698,18 @@ u32 ecore_get_mstorm_queue_stat_offset(struct ecore_hwfn *p_hwfn,
                        offset += 3 * (1 << MSTORM_VF_ZONE_DEFAULT_SIZE_LOG) *
                            (stat_cnt_id - MAX_NUM_PFS);
        }
+
        return offset;
 }
 
-/* get mstorm VF producer offset by VF zone size mode*/
+/* Get mstorm VF producer offset by VF zone size mode */
 u32 ecore_get_mstorm_eth_vf_prods_offset(struct ecore_hwfn *p_hwfn,
                                         u8 vf_id,
                                         u8 vf_queue_id,
                                         u16 vf_zone_size_mode)
 {
        u32 offset = MSTORM_ETH_VF_PRODS_OFFSET(vf_id, vf_queue_id);
+
        if (vf_zone_size_mode != VF_ZONE_SIZE_MODE_DEFAULT) {
                if (vf_zone_size_mode == VF_ZONE_SIZE_MODE_DOUBLE)
                        offset += (1 << MSTORM_VF_ZONE_DEFAULT_SIZE_LOG) *
@@ -1471,5 +1718,166 @@ u32 ecore_get_mstorm_eth_vf_prods_offset(struct ecore_hwfn *p_hwfn,
                        offset += 3 * (1 << MSTORM_VF_ZONE_DEFAULT_SIZE_LOG) *
                                  vf_id;
        }
+
        return offset;
 }
+
+/* Calculate CRC8 of first 4 bytes in buf */
+static u8 ecore_calc_crc8(const u8 *buf)
+{
+       u32 i, j, crc = 0xff << 8;
+
+       /* CRC-8 polynomial */
+       #define POLY 0x1070
+
+       for (j = 0; j < 4; j++, buf++) {
+               crc ^= (*buf << 8);
+               for (i = 0; i < 8; i++) {
+                       if (crc & 0x8000)
+                               crc ^= (POLY << 3);
+
+                        crc <<= 1;
+               }
+       }
+
+       return (u8)(crc >> 8);
+}
+
+/* Calculate and return CDU validation byte per conneciton type / region /
+ * cid
+ */
+static u8 ecore_calc_cdu_validation_byte(u8 conn_type, u8 region,
+                                        u32 cid)
+{
+       const u8 validation_cfg = CDU_VALIDATION_DEFAULT_CFG;
+       u8 crc, validation_byte = 0;
+       u32 validation_string = 0;
+       const u8 *data_to_crc_rev;
+       u8 data_to_crc[4];
+
+       data_to_crc_rev = (const u8 *)&validation_string;
+
+       /*
+        * The CRC is calculated on the String-to-compress:
+        * [31:8]  = {CID[31:20],CID[11:0]}
+        * [7:4]   = Region
+        * [3:0]   = Type
+        */
+       if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_CID) & 1)
+               validation_string |= (cid & 0xFFF00000) | ((cid & 0xFFF) << 8);
+
+       if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_REGION) & 1)
+               validation_string |= ((region & 0xF) << 4);
+
+       if ((validation_cfg >> CDU_CONTEXT_VALIDATION_CFG_USE_TYPE) & 1)
+               validation_string |= (conn_type & 0xF);
+
+       /* Convert to big-endian (ntoh())*/
+       data_to_crc[0] = data_to_crc_rev[3];
+       data_to_crc[1] = data_to_crc_rev[2];
+       data_to_crc[2] = data_to_crc_rev[1];
+       data_to_crc[3] = data_to_crc_rev[0];
+
+       crc = ecore_calc_crc8(data_to_crc);
+
+       validation_byte |= ((validation_cfg >>
+                            CDU_CONTEXT_VALIDATION_CFG_USE_ACTIVE) & 1) << 7;
+
+       if ((validation_cfg >>
+            CDU_CONTEXT_VALIDATION_CFG_VALIDATION_TYPE_SHIFT) & 1)
+               validation_byte |= ((conn_type & 0xF) << 3) | (crc & 0x7);
+       else
+               validation_byte |= crc & 0x7F;
+
+       return validation_byte;
+}
+
+/* Calcualte and set validation bytes for session context */
+void ecore_calc_session_ctx_validation(void *p_ctx_mem, u16 ctx_size,
+                                      u8 ctx_type, u32 cid)
+{
+       u8 *x_val_ptr, *t_val_ptr, *u_val_ptr, *p_ctx;
+
+       p_ctx = (u8 *)p_ctx_mem;
+       x_val_ptr = &p_ctx[con_region_offsets[0][ctx_type]];
+       t_val_ptr = &p_ctx[con_region_offsets[1][ctx_type]];
+       u_val_ptr = &p_ctx[con_region_offsets[2][ctx_type]];
+
+       OSAL_MEMSET(p_ctx, 0, ctx_size);
+
+       *x_val_ptr = ecore_calc_cdu_validation_byte(ctx_type, 3, cid);
+       *t_val_ptr = ecore_calc_cdu_validation_byte(ctx_type, 4, cid);
+       *u_val_ptr = ecore_calc_cdu_validation_byte(ctx_type, 5, cid);
+}
+
+/* Calcualte and set validation bytes for task context */
+void ecore_calc_task_ctx_validation(void *p_ctx_mem, u16 ctx_size,
+                                   u8 ctx_type, u32 tid)
+{
+       u8 *p_ctx, *region1_val_ptr;
+
+       p_ctx = (u8 *)p_ctx_mem;
+       region1_val_ptr = &p_ctx[task_region_offsets[0][ctx_type]];
+
+       OSAL_MEMSET(p_ctx, 0, ctx_size);
+
+       *region1_val_ptr = ecore_calc_cdu_validation_byte(ctx_type, 1, tid);
+}
+
+/* Memset session context to 0 while preserving validation bytes */
+void ecore_memset_session_ctx(void *p_ctx_mem, u32 ctx_size, u8 ctx_type)
+{
+       u8 *x_val_ptr, *t_val_ptr, *u_val_ptr, *p_ctx;
+       u8 x_val, t_val, u_val;
+
+       p_ctx = (u8 *)p_ctx_mem;
+       x_val_ptr = &p_ctx[con_region_offsets[0][ctx_type]];
+       t_val_ptr = &p_ctx[con_region_offsets[1][ctx_type]];
+       u_val_ptr = &p_ctx[con_region_offsets[2][ctx_type]];
+
+       x_val = *x_val_ptr;
+       t_val = *t_val_ptr;
+       u_val = *u_val_ptr;
+
+       OSAL_MEMSET(p_ctx, 0, ctx_size);
+
+       *x_val_ptr = x_val;
+       *t_val_ptr = t_val;
+       *u_val_ptr = u_val;
+}
+
+/* Memset task context to 0 while preserving validation bytes */
+void ecore_memset_task_ctx(void *p_ctx_mem, const u32 ctx_size,
+                          const u8 ctx_type)
+{
+       u8 *p_ctx, *region1_val_ptr;
+       u8 region1_val;
+
+       p_ctx = (u8 *)p_ctx_mem;
+       region1_val_ptr = &p_ctx[task_region_offsets[0][ctx_type]];
+
+       region1_val = *region1_val_ptr;
+
+       OSAL_MEMSET(p_ctx, 0, ctx_size);
+
+       *region1_val_ptr = region1_val;
+}
+
+/* Enable and configure context validation */
+void ecore_enable_context_validation(struct ecore_hwfn *p_hwfn,
+                                    struct ecore_ptt *p_ptt)
+{
+       u32 ctx_validation;
+
+       /* Enable validation for connection region 3 - bits [31:24] */
+       ctx_validation = CDU_VALIDATION_DEFAULT_CFG << 24;
+       ecore_wr(p_hwfn, p_ptt, CDU_REG_CCFC_CTX_VALID0, ctx_validation);
+
+       /* Enable validation for connection region 5 - bits [15: 8] */
+       ctx_validation = CDU_VALIDATION_DEFAULT_CFG << 8;
+       ecore_wr(p_hwfn, p_ptt, CDU_REG_CCFC_CTX_VALID1, ctx_validation);
+
+       /* Enable validation for connection region 1 - bits [15: 8] */
+       ctx_validation = CDU_VALIDATION_DEFAULT_CFG << 8;
+       ecore_wr(p_hwfn, p_ptt, CDU_REG_TCFC_CTX_VALID0, ctx_validation);
+}