qed: Add APIs for configuring grc dump config flags.

The patch adds driver support for configuring the grc dump config flags.

Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_debug.c b/drivers/net/ethernet/qlogic/qed/qed_debug.c
index 5ea6c4fc6050d76a7ce80dbe7394acfc8bbfa46e..859caa6c1a1fb0c8c4ff0b77a09a4ceb95ad4f49 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_debug.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_debug.c
@@ -1756,6 +1756,15 @@ static u32 qed_read_unaligned_dword(u8 *buf)
        return dword;
 }
 
+/* Sets the value of the specified GRC param */
+static void qed_grc_set_param(struct qed_hwfn *p_hwfn,
+                             enum dbg_grc_params grc_param, u32 val)
+{
+       struct dbg_tools_data *dev_data = &p_hwfn->dbg_info;
+
+       dev_data->grc.param_val[grc_param] = val;
+}
+
 /* Returns the value of the specified GRC param */
 static u32 qed_grc_get_param(struct qed_hwfn *p_hwfn,
                             enum dbg_grc_params grc_param)
@@ -5119,6 +5128,69 @@ bool qed_read_fw_info(struct qed_hwfn *p_hwfn,
        return false;
 }
 
+enum dbg_status qed_dbg_grc_config(struct qed_hwfn *p_hwfn,
+                                  struct qed_ptt *p_ptt,
+                                  enum dbg_grc_params grc_param, u32 val)
+{
+       enum dbg_status status;
+       int i;
+
+       DP_VERBOSE(p_hwfn, QED_MSG_DEBUG,
+                  "dbg_grc_config: paramId = %d, val = %d\n", grc_param, val);
+
+       status = qed_dbg_dev_init(p_hwfn, p_ptt);
+       if (status != DBG_STATUS_OK)
+               return status;
+
+       /* Initializes the GRC parameters (if not initialized). Needed in order
+        * to set the default parameter values for the first time.
+        */
+       qed_dbg_grc_init_params(p_hwfn);
+
+       if (grc_param >= MAX_DBG_GRC_PARAMS)
+               return DBG_STATUS_INVALID_ARGS;
+       if (val < s_grc_param_defs[grc_param].min ||
+           val > s_grc_param_defs[grc_param].max)
+               return DBG_STATUS_INVALID_ARGS;
+
+       if (s_grc_param_defs[grc_param].is_preset) {
+               /* Preset param */
+
+               /* Disabling a preset is not allowed. Call
+                * dbg_grc_set_params_default instead.
+                */
+               if (!val)
+                       return DBG_STATUS_INVALID_ARGS;
+
+               /* Update all params with the preset values */
+               for (i = 0; i < MAX_DBG_GRC_PARAMS; i++) {
+                       u32 preset_val;
+
+                       /* Skip persistent params */
+                       if (s_grc_param_defs[i].is_persistent)
+                               continue;
+
+                       /* Find preset value */
+                       if (grc_param == DBG_GRC_PARAM_EXCLUDE_ALL)
+                               preset_val =
+                                   s_grc_param_defs[i].exclude_all_preset_val;
+                       else if (grc_param == DBG_GRC_PARAM_CRASH)
+                               preset_val =
+                                   s_grc_param_defs[i].crash_preset_val;
+                       else
+                               return DBG_STATUS_INVALID_ARGS;
+
+                       qed_grc_set_param(p_hwfn,
+                                         (enum dbg_grc_params)i, preset_val);
+               }
+       } else {
+               /* Regular param - set its value */
+               qed_grc_set_param(p_hwfn, grc_param, val);
+       }
+
+       return DBG_STATUS_OK;
+}
+
 /* Assign default GRC param values */
 void qed_dbg_grc_set_params_default(struct qed_hwfn *p_hwfn)
 {
@@ -7997,9 +8069,16 @@ static u32 qed_calc_regdump_header(enum debug_print_features feature,
 int qed_dbg_all_data(struct qed_dev *cdev, void *buffer)
 {
        u8 cur_engine, omit_engine = 0, org_engine;
+       struct qed_hwfn *p_hwfn =
+               &cdev->hwfns[cdev->dbg_params.engine_for_debug];
+       struct dbg_tools_data *dev_data = &p_hwfn->dbg_info;
+       int grc_params[MAX_DBG_GRC_PARAMS], i;
        u32 offset = 0, feature_size;
        int rc;
 
+       for (i = 0; i < MAX_DBG_GRC_PARAMS; i++)
+               grc_params[i] = dev_data->grc.param_val[i];
+
        if (cdev->num_hwfns == 1)
                omit_engine = 1;
 
@@ -8087,6 +8166,9 @@ int qed_dbg_all_data(struct qed_dev *cdev, void *buffer)
                               rc);
                }
 
+               for (i = 0; i < MAX_DBG_GRC_PARAMS; i++)
+                       dev_data->grc.param_val[i] = grc_params[i];
+
                /* GRC dump - must be last because when mcp stuck it will
                 * clutter idle_chk, reg_fifo, ...
                 */

diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
index 557a12ef9815a935f2954d41b6a5730a6b7ad73c..cf3ceb62e397a0f94d762b9c6dbb5cea5271e53c 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
@@ -3024,6 +3024,21 @@ void qed_read_regs(struct qed_hwfn *p_hwfn,
  */
 bool qed_read_fw_info(struct qed_hwfn *p_hwfn,
                      struct qed_ptt *p_ptt, struct fw_info *fw_info);
+/**
+ * @brief qed_dbg_grc_config - Sets the value of a GRC parameter.
+ *
+ * @param p_hwfn -     HW device data
+ * @param grc_param -  GRC parameter
+ * @param val -                Value to set.
+ *
+ * @return error if one of the following holds:
+ *     - the version wasn't set
+ *     - grc_param is invalid
+ *     - val is outside the allowed boundaries
+ */
+enum dbg_status qed_dbg_grc_config(struct qed_hwfn *p_hwfn,
+                                  struct qed_ptt *p_ptt,
+                                  enum dbg_grc_params grc_param, u32 val);
 
 /**
  * @brief qed_dbg_grc_set_params_default - Reverts all GRC parameters to their

diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c
index c9a757177366a6a48eefd7333cd8795b8edd656b..ac1511a834d8b79099b035e4045c1a608a354767 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
@@ -2583,6 +2583,26 @@ static int qed_read_module_eeprom(struct qed_dev *cdev, char *buf,
        return rc;
 }
 
+static int qed_set_grc_config(struct qed_dev *cdev, u32 cfg_id, u32 val)
+{
+       struct qed_hwfn *hwfn = QED_LEADING_HWFN(cdev);
+       struct qed_ptt *ptt;
+       int rc = 0;
+
+       if (IS_VF(cdev))
+               return 0;
+
+       ptt = qed_ptt_acquire(hwfn);
+       if (!ptt)
+               return -EAGAIN;
+
+       rc = qed_dbg_grc_config(hwfn, ptt, cfg_id, val);
+
+       qed_ptt_release(hwfn, ptt);
+
+       return rc;
+}
+
 static u8 qed_get_affin_hwfn_idx(struct qed_dev *cdev)
 {
        return QED_AFFIN_HWFN_IDX(cdev);
@@ -2637,6 +2657,7 @@ const struct qed_common_ops qed_common_ops_pass = {
        .read_module_eeprom = &qed_read_module_eeprom,
        .get_affin_hwfn_idx = &qed_get_affin_hwfn_idx,
        .read_nvm_cfg = &qed_nvm_flash_cfg_read,
+       .set_grc_config = &qed_set_grc_config,
 };
 
 void qed_get_protocol_stats(struct qed_dev *cdev,

diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h
index 06fd9580c9e50ea97860a2241c5a5853bf199a69..e35463860c8439decc1986fbdbc9b9f2da2e5101 100644 (file)
--- a/include/linux/qed/qed_if.h
+++ b/include/linux/qed/qed_if.h
@@ -1143,6 +1143,15 @@ struct qed_common_ops {
  */
        int (*read_nvm_cfg)(struct qed_dev *cdev, u8 **buf, u32 cmd,
                            u32 entity_id);
+
+/**
+ * @brief set_grc_config - Configure value for grc config id.
+ * @param cdev
+ * @param cfg_id - grc config id
+ * @param val - grc config value
+ *
+ */
+       int (*set_grc_config)(struct qed_dev *cdev, u32 cfg_id, u32 val);
 };
 
 #define MASK_FIELD(_name, _value) \