net/i40e: remove summarized global register change info

The summarized global register change info will be logged
no matter if there's real global register change. Since
only real changes are logged now, there's no need to
summarize global register change info, otherwise will
cause misunderstanding.

Signed-off-by: Beilei Xing <beilei.xing@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index 1c8dfcab69ade49739e57908259146a50c2f92d2..9585c67394eddf87edf85d6d90f58a4e5726333b 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -734,7 +734,6 @@ static inline void i40e_GLQF_reg_init(struct i40e_hw *hw)
         */
        I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(40), 0x00000029);
        I40E_WRITE_GLB_REG(hw, I40E_GLQF_PIT(9), 0x00009420);
-       i40e_global_cfg_warning(I40E_WARNING_QINQ_PARSER);
 }
 
 static inline void i40e_config_automask(struct i40e_pf *pf)
@@ -1306,7 +1305,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused)
                PMD_INIT_LOG(DEBUG,
                             "Global register 0x%08x is changed with 0x28",
                             I40E_GLQF_L3_MAP(40));
-               i40e_global_cfg_warning(I40E_WARNING_QINQ_CLOUD_FILTER);
        }
 
        /* Need the special FW version to support floating VEB */
@@ -1593,7 +1591,6 @@ void i40e_flex_payload_reg_set_default(struct i40e_hw *hw)
        I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(33), 0x00000000);
        I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(34), 0x00000000);
        I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(35), 0x00000000);
-       i40e_global_cfg_warning(I40E_WARNING_DIS_FLX_PLD);
 }
 
 static int
@@ -3508,8 +3505,6 @@ i40e_vlan_tpid_set_by_registers(struct rte_eth_dev *dev,
                    "Global register 0x%08x is changed with value 0x%08x",
                    I40E_GL_SWT_L2TAGCTRL(reg_id), (uint32_t)reg_w);
 
-       i40e_global_cfg_warning(I40E_WARNING_TPID);
-
        return 0;
 }
 
@@ -3804,7 +3799,6 @@ i40e_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
                I40E_WRITE_GLB_REG(hw, I40E_GLRPB_GLW,
                                   pf->fc_conf.low_water[I40E_MAX_TRAFFIC_CLASS]
                                   << I40E_KILOSHIFT);
-               i40e_global_cfg_warning(I40E_WARNING_FLOW_CTL);
        } else {
                PMD_DRV_LOG(ERR,
                            "Water marker configuration is not supported.");
@@ -7617,14 +7611,13 @@ i40e_status_code i40e_replace_mpls_l1_filter(struct i40e_pf *pf)
        status = i40e_aq_replace_cloud_filters(hw, &filter_replace,
                                               &filter_replace_buf);
        if (!status && (filter_replace.old_filter_type !=
-                       filter_replace.new_filter_type)) {
-               i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+                       filter_replace.new_filter_type))
                PMD_DRV_LOG(WARNING, "i40e device %s changed cloud l1 type."
                            " original: 0x%x, new: 0x%x",
                            dev->device->name,
                            filter_replace.old_filter_type,
                            filter_replace.new_filter_type);
-       }
+
        return status;
 }
 
@@ -7693,14 +7686,13 @@ i40e_status_code i40e_replace_mpls_cloud_filter(struct i40e_pf *pf)
        status = i40e_aq_replace_cloud_filters(hw, &filter_replace,
                                               &filter_replace_buf);
        if (!status && (filter_replace.old_filter_type !=
-                       filter_replace.new_filter_type)) {
-               i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+                       filter_replace.new_filter_type))
                PMD_DRV_LOG(WARNING, "i40e device %s changed cloud filter type."
                            " original: 0x%x, new: 0x%x",
                            dev->device->name,
                            filter_replace.old_filter_type,
                            filter_replace.new_filter_type);
-       }
+
        return status;
 }
 
@@ -7782,14 +7774,13 @@ i40e_replace_gtp_l1_filter(struct i40e_pf *pf)
        status = i40e_aq_replace_cloud_filters(hw, &filter_replace,
                                               &filter_replace_buf);
        if (!status && (filter_replace.old_filter_type !=
-                       filter_replace.new_filter_type)) {
-               i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+                       filter_replace.new_filter_type))
                PMD_DRV_LOG(WARNING, "i40e device %s changed cloud l1 type."
                            " original: 0x%x, new: 0x%x",
                            dev->device->name,
                            filter_replace.old_filter_type,
                            filter_replace.new_filter_type);
-       }
+
        return status;
 }
 
@@ -7856,14 +7847,13 @@ i40e_status_code i40e_replace_gtp_cloud_filter(struct i40e_pf *pf)
        status = i40e_aq_replace_cloud_filters(hw, &filter_replace,
                                               &filter_replace_buf);
        if (!status && (filter_replace.old_filter_type !=
-                       filter_replace.new_filter_type)) {
-               i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+                       filter_replace.new_filter_type))
                PMD_DRV_LOG(WARNING, "i40e device %s changed cloud filter type."
                            " original: 0x%x, new: 0x%x",
                            dev->device->name,
                            filter_replace.old_filter_type,
                            filter_replace.new_filter_type);
-       }
+
        return status;
 }
 
@@ -8423,7 +8413,6 @@ i40e_dev_set_gre_key_len(struct i40e_hw *hw, uint8_t len)
                PMD_DRV_LOG(DEBUG, "Global register 0x%08x is changed "
                            "with value 0x%08x",
                            I40E_GL_PRS_FVBM(2), reg);
-               i40e_global_cfg_warning(I40E_WARNING_GRE_KEY_LEN);
        } else {
                ret = 0;
        }
@@ -8689,7 +8678,6 @@ i40e_set_hash_filter_global_config(struct i40e_hw *hw,
                                                          I40E_GLQF_HSYM(j),
                                                          reg);
                        }
-                       i40e_global_cfg_warning(I40E_WARNING_HSYM);
                }
        }
 
@@ -8715,7 +8703,6 @@ i40e_set_hash_filter_global_config(struct i40e_hw *hw,
                goto out;
 
        i40e_write_global_rx_ctl(hw, I40E_GLQF_CTL, reg);
-       i40e_global_cfg_warning(I40E_WARNING_QF_CTL);
 
 out:
        I40E_WRITE_FLUSH(hw);
@@ -9392,12 +9379,6 @@ i40e_filter_input_set_init(struct i40e_pf *pf)
                        pf->hash_input_set[pctype] = input_set;
                pf->fdir.input_set[pctype] = input_set;
        }
-
-       if (!pf->support_multi_driver) {
-               i40e_global_cfg_warning(I40E_WARNING_HASH_INSET);
-               i40e_global_cfg_warning(I40E_WARNING_FD_MSK);
-               i40e_global_cfg_warning(I40E_WARNING_HASH_MSK);
-       }
 }
 
 int
@@ -9463,7 +9444,6 @@ i40e_hash_filter_inset_select(struct i40e_hw *hw,
        i40e_check_write_global_reg(hw, I40E_GLQF_HASH_INSET(1, pctype),
                                    (uint32_t)((inset_reg >>
                                    I40E_32_BIT_WIDTH) & UINT32_MAX));
-       i40e_global_cfg_warning(I40E_WARNING_HASH_INSET);
 
        for (i = 0; i < num; i++)
                i40e_check_write_global_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
@@ -9472,7 +9452,6 @@ i40e_hash_filter_inset_select(struct i40e_hw *hw,
        for (i = num; i < I40E_INSET_MASK_NUM_REG; i++)
                i40e_check_write_global_reg(hw, I40E_GLQF_HASH_MSK(i, pctype),
                                            0);
-       i40e_global_cfg_warning(I40E_WARNING_HASH_MSK);
        I40E_WRITE_FLUSH(hw);
 
        pf->hash_input_set[pctype] = input_set;
@@ -9553,7 +9532,6 @@ i40e_fdir_filter_inset_select(struct i40e_pf *pf,
                        i40e_check_write_global_reg(hw,
                                                    I40E_GLQF_FD_MSK(i, pctype),
                                                    0);
-               i40e_global_cfg_warning(I40E_WARNING_FD_MSK);
        } else {
                PMD_DRV_LOG(ERR, "FDIR bit mask is not supported.");
        }
@@ -12314,14 +12292,13 @@ i40e_cloud_filter_qinq_create(struct i40e_pf *pf)
        ret = i40e_aq_replace_cloud_filters(hw, &filter_replace,
                        &filter_replace_buf);
        if (!ret && (filter_replace.old_filter_type !=
-                    filter_replace.new_filter_type)) {
-               i40e_global_cfg_warning(I40E_WARNING_RPL_CLD_FILTER);
+                    filter_replace.new_filter_type))
                PMD_DRV_LOG(WARNING, "i40e device %s changed cloud filter type."
                            " original: 0x%x, new: 0x%x",
                            dev->device->name,
                            filter_replace.old_filter_type,
                            filter_replace.new_filter_type);
-       }
+
        return ret;
 }
 

diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 2d6009223de7b3ebb4913d2b3cf569cf87555260..79bfc67fcbf0fcaa8cc0a7e1677ccda989d27cf3 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -1114,22 +1114,6 @@ struct i40e_valid_pattern {
        parse_filter_t parse_filter;
 };
 
-enum I40E_WARNING_IDX {
-       I40E_WARNING_DIS_FLX_PLD,
-       I40E_WARNING_ENA_FLX_PLD,
-       I40E_WARNING_QINQ_PARSER,
-       I40E_WARNING_QINQ_CLOUD_FILTER,
-       I40E_WARNING_TPID,
-       I40E_WARNING_FLOW_CTL,
-       I40E_WARNING_GRE_KEY_LEN,
-       I40E_WARNING_QF_CTL,
-       I40E_WARNING_HASH_INSET,
-       I40E_WARNING_HSYM,
-       I40E_WARNING_HASH_MSK,
-       I40E_WARNING_FD_MSK,
-       I40E_WARNING_RPL_CLD_FILTER,
-};
-
 int i40e_dev_switch_queues(struct i40e_pf *pf, bool on);
 int i40e_vsi_release(struct i40e_vsi *vsi);
 struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf,
@@ -1351,33 +1335,6 @@ i40e_calc_itr_interval(int16_t interval, bool is_pf, bool is_multi_drv)
        return interval / 2;
 }
 
-static inline void
-i40e_global_cfg_warning(enum I40E_WARNING_IDX idx)
-{
-       const char *warning;
-       static const char *const warning_list[] = {
-               [I40E_WARNING_DIS_FLX_PLD] = "disable FDIR flexible payload",
-               [I40E_WARNING_ENA_FLX_PLD] = "enable FDIR flexible payload",
-               [I40E_WARNING_QINQ_PARSER] = "support QinQ parser",
-               [I40E_WARNING_QINQ_CLOUD_FILTER] = "support QinQ cloud filter",
-               [I40E_WARNING_TPID] = "support TPID configuration",
-               [I40E_WARNING_FLOW_CTL] = "configure water marker",
-               [I40E_WARNING_GRE_KEY_LEN] = "support GRE key length setting",
-               [I40E_WARNING_QF_CTL] = "support hash function setting",
-               [I40E_WARNING_HASH_INSET] = "configure hash input set",
-               [I40E_WARNING_HSYM] = "set symmetric hash",
-               [I40E_WARNING_HASH_MSK] = "configure hash mask",
-               [I40E_WARNING_FD_MSK] = "configure fdir mask",
-               [I40E_WARNING_RPL_CLD_FILTER] = "replace cloud filter",
-       };
-
-       warning = warning_list[idx];
-
-       RTE_LOG(WARNING, PMD,
-               "Global register is changed during %s\n",
-               warning);
-}
-
 #define I40E_VALID_FLOW(flow_type) \
        ((flow_type) == RTE_ETH_FLOW_FRAG_IPV4 || \
        (flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_TCP || \

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index a4a61d1c3f3db53e7dbd8c4788f8bbcb77b7c5ec..d41601a1765d1f9874e298dc0620832fc9de0cba 100644 (file)
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -526,7 +526,6 @@ i40e_set_flx_pld_cfg(struct i40e_pf *pf,
                          (num << I40E_GLQF_ORT_FIELD_CNT_SHIFT) |
                          (layer_idx * I40E_MAX_FLXPLD_FIED);
                I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(33 + layer_idx), flx_ort);
-               i40e_global_cfg_warning(I40E_WARNING_ENA_FLX_PLD);
        }
 
        for (i = 0; i < num; i++) {

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 89de6a59d8b0c0ac49d82fb9082207b2e5273a22..c67b264de21476185dd13603822f3c2652041f76 100644 (file)
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -2263,7 +2263,6 @@ i40e_flow_set_fdir_flex_pit(struct i40e_pf *pf,
                          (raw_id << I40E_GLQF_ORT_FIELD_CNT_SHIFT) |
                          (layer_idx * I40E_MAX_FLXPLD_FIED);
                I40E_WRITE_GLB_REG(hw, I40E_GLQF_ORT(33 + layer_idx), flx_ort);
-               i40e_global_cfg_warning(I40E_WARNING_ENA_FLX_PLD);
        }
 
        /* Set flex pit */

diff --git a/drivers/net/i40e/rte_pmd_i40e.c b/drivers/net/i40e/rte_pmd_i40e.c
index 7aa1a75187cc52901e0aea07d1e9828bfa94a989..921dfc0d87d9917a5102b57d3cfc65fea361a08d 100644 (file)
--- a/drivers/net/i40e/rte_pmd_i40e.c
+++ b/drivers/net/i40e/rte_pmd_i40e.c
@@ -3162,8 +3162,6 @@ rte_pmd_i40e_inset_set(uint16_t port, uint8_t pctype,
                        i40e_check_write_global_reg(hw,
                                                  I40E_GLQF_HASH_MSK(i, pctype),
                                                  mask_reg[i]);
-               i40e_global_cfg_warning(I40E_WARNING_HASH_INSET);
-               i40e_global_cfg_warning(I40E_WARNING_HASH_MSK);
                break;
        case INSET_FDIR:
                i40e_check_write_reg(hw, I40E_PRTQF_FD_INSET(pctype, 0),
@@ -3175,7 +3173,6 @@ rte_pmd_i40e_inset_set(uint16_t port, uint8_t pctype,
                        i40e_check_write_global_reg(hw,
                                                    I40E_GLQF_FD_MSK(i, pctype),
                                                    mask_reg[i]);
-               i40e_global_cfg_warning(I40E_WARNING_FD_MSK);
                break;
        case INSET_FDIR_FLX:
                i40e_check_write_reg(hw, I40E_PRTQF_FD_FLXINSET(pctype),