net/mlx5: fix VLAN stripping indication

[dpdk.git] / drivers / net / qede / base / ecore_mcp.c

diff --git a/drivers/net/qede/base/ecore_mcp.c b/drivers/net/qede/base/ecore_mcp.c
index 500368e..f634d98 100644 (file)
--- a/drivers/net/qede/base/ecore_mcp.c
+++ b/drivers/net/qede/base/ecore_mcp.c
@@ -801,9 +801,6 @@ static void ecore_mcp_handle_link_change(struct ecore_hwfn *p_hwfn,
 
        p_link->sfp_tx_fault = !!(status & LINK_STATUS_SFP_TX_FAULT);
 
-       if (p_link->link_up)
-               ecore_dcbx_eagle_workaround(p_hwfn, p_ptt, p_link->pfc_enabled);
-
        OSAL_LINK_UPDATE(p_hwfn);
 }
 
@@ -838,11 +835,9 @@ enum _ecore_status_t ecore_mcp_set_link(struct ecore_hwfn *p_hwfn,
        if (b_up)
                DP_VERBOSE(p_hwfn, ECORE_MSG_LINK,
                           "Configuring Link: Speed 0x%08x, Pause 0x%08x,"
-                          " adv_speed 0x%08x, loopback 0x%08x,"
-                          " features 0x%08x\n",
+                          " adv_speed 0x%08x, loopback 0x%08x\n",
                           p_phy_cfg->speed, p_phy_cfg->pause,
-                          p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode,
-                          p_phy_cfg->feature_config_flags);
+                          p_phy_cfg->adv_speed, p_phy_cfg->loopback_mode);
        else
                DP_VERBOSE(p_hwfn, ECORE_MSG_LINK, "Resetting link\n");
 
@@ -936,7 +931,7 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
                hsi_param = DRV_MSG_CODE_STATS_TYPE_LAN;
                break;
        default:
-               DP_NOTICE(p_hwfn, false, "Invalid protocol type %d\n", type);
+               DP_INFO(p_hwfn, "Invalid protocol type %d\n", type);
                return;
        }
 
@@ -950,9 +945,8 @@ static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn,
        ecore_mcp_cmd_and_union(p_hwfn, p_ptt, &mb_params);
 }
 
-static void
-ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
-                       struct public_func *p_shmem_info)
+static void ecore_read_pf_bandwidth(struct ecore_hwfn *p_hwfn,
+                                   struct public_func *p_shmem_info)
 {
        struct ecore_mcp_function_info *p_info;
 
@@ -1098,16 +1092,9 @@ enum _ecore_status_t ecore_mcp_mdump_trigger(struct ecore_hwfn *p_hwfn,
 {
        u32 mcp_resp;
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
-                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
-}
-
-enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct ecore_hwfn *p_hwfn,
-                                               struct ecore_ptt *p_ptt)
-{
-       u32 mcp_resp;
+       p_hwfn->p_dev->mdump_en = true;
 
-       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_CLEAR_LOGS,
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_TRIGGER,
                                   OSAL_NULL, OSAL_NULL, &mcp_resp);
 }
 
@@ -1141,32 +1128,56 @@ ecore_mcp_mdump_get_config(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
        return rc;
 }
 
-enum _ecore_status_t ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn,
-                                             struct ecore_ptt *p_ptt)
+enum _ecore_status_t
+ecore_mcp_mdump_get_info(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt,
+                        struct ecore_mdump_info *p_mdump_info)
 {
+       u32 addr, global_offsize, global_addr;
        struct mdump_config_stc mdump_config;
        enum _ecore_status_t rc;
 
-       rc = ecore_mcp_mdump_get_config(p_hwfn, p_ptt, &mdump_config);
-       if (rc != ECORE_SUCCESS)
-               return rc;
+       OSAL_MEMSET(p_mdump_info, 0, sizeof(*p_mdump_info));
 
-       DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
-                  "MFW mdump_config: version 0x%x, config 0x%x, epoch 0x%x, num_of_logs 0x%x, valid_logs 0x%x\n",
-                  mdump_config.version, mdump_config.config, mdump_config.epoc,
-                  mdump_config.num_of_logs, mdump_config.valid_logs);
+       addr = SECTION_OFFSIZE_ADDR(p_hwfn->mcp_info->public_base,
+                                   PUBLIC_GLOBAL);
+       global_offsize = ecore_rd(p_hwfn, p_ptt, addr);
+       global_addr = SECTION_ADDR(global_offsize, 0);
+       p_mdump_info->reason = ecore_rd(p_hwfn, p_ptt,
+                                       global_addr +
+                                       OFFSETOF(struct public_global,
+                                                mdump_reason));
 
-       if (mdump_config.valid_logs > 0) {
-               DP_NOTICE(p_hwfn, false,
-                         "* * * IMPORTANT - HW ERROR register dump captured by device * * *\n");
+       if (p_mdump_info->reason) {
+               rc = ecore_mcp_mdump_get_config(p_hwfn, p_ptt, &mdump_config);
+               if (rc != ECORE_SUCCESS)
+                       return rc;
+
+               p_mdump_info->version = mdump_config.version;
+               p_mdump_info->config = mdump_config.config;
+               p_mdump_info->epoch = mdump_config.epoc;
+               p_mdump_info->num_of_logs = mdump_config.num_of_logs;
+               p_mdump_info->valid_logs = mdump_config.valid_logs;
+
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "MFW mdump info: reason %d, version 0x%x, config 0x%x, epoch 0x%x, num_of_logs 0x%x, valid_logs 0x%x\n",
+                          p_mdump_info->reason, p_mdump_info->version,
+                          p_mdump_info->config, p_mdump_info->epoch,
+                          p_mdump_info->num_of_logs, p_mdump_info->valid_logs);
+       } else {
+               DP_VERBOSE(p_hwfn, ECORE_MSG_SP,
+                          "MFW mdump info: reason %d\n", p_mdump_info->reason);
        }
 
-       return rc;
+       return ECORE_SUCCESS;
 }
 
-void ecore_mcp_mdump_enable(struct ecore_dev *p_dev, bool mdump_enable)
+enum _ecore_status_t ecore_mcp_mdump_clear_logs(struct ecore_hwfn *p_hwfn,
+                                               struct ecore_ptt *p_ptt)
 {
-       p_dev->mdump_en = mdump_enable;
+       u32 mcp_resp;
+
+       return ecore_mcp_mdump_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_MDUMP_CLEAR_LOGS,
+                                  OSAL_NULL, OSAL_NULL, &mcp_resp);
 }
 
 static void ecore_mcp_handle_critical_error(struct ecore_hwfn *p_hwfn,
@@ -1184,6 +1195,7 @@ static void ecore_mcp_handle_critical_error(struct ecore_hwfn *p_hwfn,
        if (p_hwfn->p_dev->mdump_en) {
                DP_NOTICE(p_hwfn, false,
                          "Not acknowledging the notification to allow the MFW crash dump\n");
+               p_hwfn->p_dev->mdump_en = false;
                return;
        }
 
@@ -2251,7 +2263,7 @@ enum _ecore_status_t ecore_mcp_bist_register_test(struct ecore_hwfn *p_hwfn,
 enum _ecore_status_t ecore_mcp_bist_clock_test(struct ecore_hwfn *p_hwfn,
                                               struct ecore_ptt *p_ptt)
 {
-       u32 drv_mb_param = 0, rsp, param;
+       u32 drv_mb_param, rsp, param;
        enum _ecore_status_t rc = ECORE_SUCCESS;
 
        drv_mb_param = (DRV_MB_PARAM_BIST_CLOCK_TEST <<
@@ -2442,3 +2454,12 @@ enum _ecore_status_t ecore_mcp_get_resc_info(struct ecore_hwfn *p_hwfn,
 
        return ECORE_SUCCESS;
 }
+
+enum _ecore_status_t ecore_mcp_initiate_pf_flr(struct ecore_hwfn *p_hwfn,
+                                              struct ecore_ptt *p_ptt)
+{
+       u32 mcp_resp, mcp_param;
+
+       return ecore_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_INITIATE_PF_FLR, 0,
+                            &mcp_resp, &mcp_param);
+}