Print this page
9724 qede needs updates for newer GCC

*** 31,40 **** --- 31,44 ---- * See the License for the specific language governing permissions and * limitations under the License. */ + /* + * Copyright 2018 Joyent, Inc. + */ + #include "bcm_osal.h" #include "ecore.h" #include "ecore_status.h" #include "nvm_map.h" #include "nvm_cfg.h"
*** 360,370 **** u32 cmd, u32 param, u32 *o_mcp_resp, u32 *o_mcp_param) { u32 delay = CHIP_MCP_RESP_ITER_US; u32 max_retries = ECORE_DRV_MB_MAX_RETRIES; ! u32 seq, cnt = 1, actual_mb_seq; enum _ecore_status_t rc = ECORE_SUCCESS; #ifndef ASIC_ONLY if (CHIP_REV_IS_EMUL(p_hwfn->p_dev)) delay = EMUL_MCP_RESP_ITER_US; --- 364,374 ---- u32 cmd, u32 param, u32 *o_mcp_resp, u32 *o_mcp_param) { u32 delay = CHIP_MCP_RESP_ITER_US; u32 max_retries = ECORE_DRV_MB_MAX_RETRIES; ! u32 seq, cnt = 1, actual_mb_seq __unused; enum _ecore_status_t rc = ECORE_SUCCESS; #ifndef ASIC_ONLY if (CHIP_REV_IS_EMUL(p_hwfn->p_dev)) delay = EMUL_MCP_RESP_ITER_US;
*** 1431,1441 **** static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, enum MFW_DRV_MSG_TYPE type) { ! enum ecore_mcp_protocol_type stats_type; union ecore_mcp_protocol_stats stats; struct ecore_mcp_mb_params mb_params; u32 hsi_param; enum _ecore_status_t rc; --- 1435,1445 ---- static void ecore_mcp_send_protocol_stats(struct ecore_hwfn *p_hwfn, struct ecore_ptt *p_ptt, enum MFW_DRV_MSG_TYPE type) { ! enum ecore_mcp_protocol_type stats_type __unused; union ecore_mcp_protocol_stats stats; struct ecore_mcp_mb_params mb_params; u32 hsi_param; enum _ecore_status_t rc;
*** 3126,3136 **** struct ecore_ptt *p_ptt, u32 port, u32 addr, u32 offset, u32 len, u8 *p_buf) { struct ecore_mcp_nvm_params params; - enum _ecore_status_t rc; u32 bytes_left, bytes_to_copy, buf_size; OSAL_MEMSET(&params, 0, sizeof(struct ecore_mcp_nvm_params)); params.nvm_common.offset = (port << DRV_MB_PARAM_TRANSCEIVER_PORT_SHIFT) | --- 3130,3139 ----
*** 3151,3161 **** params.nvm_common.offset |= ((addr + offset) << DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT); params.nvm_common.offset |= (bytes_to_copy << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT); ! rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params); if ((params.nvm_common.resp & FW_MSG_CODE_MASK) == FW_MSG_CODE_TRANSCEIVER_NOT_PRESENT) { return ECORE_NODEV; } else if ((params.nvm_common.resp & FW_MSG_CODE_MASK) != FW_MSG_CODE_TRANSCEIVER_DIAG_OK) --- 3154,3164 ---- params.nvm_common.offset |= ((addr + offset) << DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT); params.nvm_common.offset |= (bytes_to_copy << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT); ! (void) ecore_mcp_nvm_command(p_hwfn, p_ptt, &params); if ((params.nvm_common.resp & FW_MSG_CODE_MASK) == FW_MSG_CODE_TRANSCEIVER_NOT_PRESENT) { return ECORE_NODEV; } else if ((params.nvm_common.resp & FW_MSG_CODE_MASK) != FW_MSG_CODE_TRANSCEIVER_DIAG_OK)
*** 3172,3182 **** struct ecore_ptt *p_ptt, u32 port, u32 addr, u32 offset, u32 len, u8 *p_buf) { struct ecore_mcp_nvm_params params; - enum _ecore_status_t rc; u32 buf_idx, buf_size; OSAL_MEMSET(&params, 0, sizeof(struct ecore_mcp_nvm_params)); params.nvm_common.offset = (port << DRV_MB_PARAM_TRANSCEIVER_PORT_SHIFT) | --- 3175,3184 ----
*** 3195,3205 **** DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT); params.nvm_common.offset |= (buf_size << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT); params.nvm_wr.buf_size = buf_size; params.nvm_wr.buf = (u32 *)&p_buf[buf_idx]; ! rc = ecore_mcp_nvm_command(p_hwfn, p_ptt, &params); if ((params.nvm_common.resp & FW_MSG_CODE_MASK) == FW_MSG_CODE_TRANSCEIVER_NOT_PRESENT) { return ECORE_NODEV; } else if ((params.nvm_common.resp & FW_MSG_CODE_MASK) != FW_MSG_CODE_TRANSCEIVER_DIAG_OK) --- 3197,3207 ---- DRV_MB_PARAM_TRANSCEIVER_OFFSET_SHIFT); params.nvm_common.offset |= (buf_size << DRV_MB_PARAM_TRANSCEIVER_SIZE_SHIFT); params.nvm_wr.buf_size = buf_size; params.nvm_wr.buf = (u32 *)&p_buf[buf_idx]; ! (void) ecore_mcp_nvm_command(p_hwfn, p_ptt, &params); if ((params.nvm_common.resp & FW_MSG_CODE_MASK) == FW_MSG_CODE_TRANSCEIVER_NOT_PRESENT) { return ECORE_NODEV; } else if ((params.nvm_common.resp & FW_MSG_CODE_MASK) != FW_MSG_CODE_TRANSCEIVER_DIAG_OK)