X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fbnxt_hwrm.c;h=6a70b6e66387240372ec7ef56f88ebc0f132b167;hb=ed9726ce83eb7562b3dcfaf0ee10647ed816ae4a;hp=91421199545a2fc6e0de06942c6bbc0b2ed53fbb;hpb=705e0f32f62e3ee76ce8cd17c38091d3eb7fb965;p=dpdk.git diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 9142119954..6a70b6e663 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -75,6 +75,82 @@ static void bnxt_hwrm_set_pg_attr(struct bnxt_ring_mem_info *rmem, } } +static struct bnxt_cp_ring_info* +bnxt_get_ring_info_by_id(struct bnxt *bp, uint16_t rid, uint16_t type) +{ + struct bnxt_cp_ring_info *cp_ring = NULL; + uint16_t i; + + switch (type) { + case HWRM_RING_FREE_INPUT_RING_TYPE_RX: + case HWRM_RING_FREE_INPUT_RING_TYPE_RX_AGG: + /* FALLTHROUGH */ + for (i = 0; i < bp->rx_cp_nr_rings; i++) { + struct bnxt_rx_queue *rxq = bp->rx_queues[i]; + + if (rxq->cp_ring->cp_ring_struct->fw_ring_id == + rte_cpu_to_le_16(rid)) { + return rxq->cp_ring; + } + } + break; + case HWRM_RING_FREE_INPUT_RING_TYPE_TX: + for (i = 0; i < bp->tx_cp_nr_rings; i++) { + struct bnxt_tx_queue *txq = bp->tx_queues[i]; + + if (txq->cp_ring->cp_ring_struct->fw_ring_id == + rte_cpu_to_le_16(rid)) { + return txq->cp_ring; + } + } + break; + default: + return cp_ring; + } + return cp_ring; +} + +/* Complete a sweep of the CQ ring for the corresponding Tx/Rx/AGG ring. + * If the CMPL_BASE_TYPE_HWRM_DONE is not encountered by the last pass, + * before timeout, we force the done bit for the cleanup to proceed. + * Also if cpr is null, do nothing.. The HWRM command is not for a + * Tx/Rx/AGG ring cleanup. + */ +static int +bnxt_check_cq_hwrm_done(struct bnxt_cp_ring_info *cpr, + bool tx, bool rx, bool timeout) +{ + int done = 0; + + if (cpr != NULL) { + if (tx) + done = bnxt_flush_tx_cmp(cpr); + + if (rx) + done = bnxt_flush_rx_cmp(cpr); + + if (done) + PMD_DRV_LOG(DEBUG, "HWRM DONE for %s ring\n", + rx ? "Rx" : "Tx"); + + /* We are about to timeout and still haven't seen the + * HWRM done for the Ring free. Force the cleanup. + */ + if (!done && timeout) { + done = 1; + PMD_DRV_LOG(DEBUG, "Timing out for %s ring\n", + rx ? "Rx" : "Tx"); + } + } else { + /* This HWRM command is not for a Tx/Rx/AGG ring cleanup. + * Otherwise the cpr would have been valid. So do nothing. + */ + done = 1; + } + + return done; +} + /* * HWRM Functions (sent to HWRM) * These are named bnxt_hwrm_*() and return 0 on success or -110 if the @@ -97,6 +173,9 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, GRCPF_REG_KONG_CHANNEL_OFFSET : GRCPF_REG_CHIMP_CHANNEL_OFFSET; uint16_t mb_trigger_offset = use_kong_mb ? GRCPF_REG_KONG_COMM_TRIGGER : GRCPF_REG_CHIMP_COMM_TRIGGER; + struct bnxt_cp_ring_info *cpr = NULL; + bool is_rx = false; + bool is_tx = false; uint32_t timeout; /* Do not send HWRM commands to firmware in error state */ @@ -153,14 +232,42 @@ static int bnxt_hwrm_send_message(struct bnxt *bp, void *msg, */ rte_io_mb(); + /* Check ring flush is done. + * This is valid only for Tx and Rx rings (including AGG rings). + * The Tx and Rx rings should be freed once the HW confirms all + * the internal buffers and BDs associated with the rings are + * consumed and the corresponding DMA is handled. + */ + if (rte_cpu_to_le_16(req->cmpl_ring) != INVALID_HW_RING_ID) { + /* Check if the TxCQ matches. If that fails check if RxCQ + * matches. And if neither match, is_rx = false, is_tx = false. + */ + cpr = bnxt_get_ring_info_by_id(bp, req->cmpl_ring, + HWRM_RING_FREE_INPUT_RING_TYPE_TX); + if (cpr == NULL) { + /* Not a TxCQ. Check if the RxCQ matches. */ + cpr = + bnxt_get_ring_info_by_id(bp, req->cmpl_ring, + HWRM_RING_FREE_INPUT_RING_TYPE_RX); + if (cpr != NULL) + is_rx = true; + } else { + is_tx = true; + } + } + /* Poll for the valid bit */ for (i = 0; i < timeout; i++) { + int done; + + done = bnxt_check_cq_hwrm_done(cpr, is_tx, is_rx, + i == timeout - 1); /* Sanity check on the resp->resp_len */ rte_io_rmb(); if (resp->resp_len && resp->resp_len <= bp->max_resp_len) { /* Last byte of resp contains the valid key */ valid = (uint8_t *)resp + resp->resp_len - 1; - if (*valid == HWRM_RESP_VALID_KEY) + if (*valid == HWRM_RESP_VALID_KEY && done) break; } rte_delay_us(1); @@ -681,10 +788,13 @@ static int bnxt_hwrm_ptp_qcfg(struct bnxt *bp) return 0; } -void bnxt_hwrm_free_vf_info(struct bnxt *bp) +void bnxt_free_vf_info(struct bnxt *bp) { int i; + if (bp->pf->vf_info == NULL) + return; + for (i = 0; i < bp->pf->max_vfs; i++) { rte_free(bp->pf->vf_info[i].vlan_table); bp->pf->vf_info[i].vlan_table = NULL; @@ -695,6 +805,50 @@ void bnxt_hwrm_free_vf_info(struct bnxt *bp) bp->pf->vf_info = NULL; } +static int bnxt_alloc_vf_info(struct bnxt *bp, uint16_t max_vfs) +{ + struct bnxt_child_vf_info *vf_info = bp->pf->vf_info; + int i; + + if (vf_info) + bnxt_free_vf_info(bp); + + vf_info = rte_zmalloc("bnxt_vf_info", sizeof(*vf_info) * max_vfs, 0); + if (vf_info == NULL) { + PMD_DRV_LOG(ERR, "Failed to alloc vf info\n"); + return -ENOMEM; + } + + bp->pf->max_vfs = max_vfs; + for (i = 0; i < max_vfs; i++) { + vf_info[i].fid = bp->pf->first_vf_id + i; + vf_info[i].vlan_table = rte_zmalloc("VF VLAN table", + getpagesize(), getpagesize()); + if (vf_info[i].vlan_table == NULL) { + PMD_DRV_LOG(ERR, "Failed to alloc VLAN table for VF %d\n", i); + goto err; + } + rte_mem_lock_page(vf_info[i].vlan_table); + + vf_info[i].vlan_as_table = rte_zmalloc("VF VLAN AS table", + getpagesize(), getpagesize()); + if (vf_info[i].vlan_as_table == NULL) { + PMD_DRV_LOG(ERR, "Failed to alloc VLAN AS table for VF %d\n", i); + goto err; + } + rte_mem_lock_page(vf_info[i].vlan_as_table); + + STAILQ_INIT(&vf_info[i].filter); + } + + bp->pf->vf_info = vf_info; + + return 0; +err: + bnxt_free_vf_info(bp); + return -ENOMEM; +} + static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) { int rc = 0; @@ -702,7 +856,6 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) struct hwrm_func_qcaps_output *resp = bp->hwrm_cmd_resp_addr; uint16_t new_max_vfs; uint32_t flags; - int i; HWRM_PREP(&req, HWRM_FUNC_QCAPS, BNXT_USE_CHIMP_MB); @@ -720,43 +873,9 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) bp->pf->total_vfs = rte_le_to_cpu_16(resp->max_vfs); new_max_vfs = bp->pdev->max_vfs; if (new_max_vfs != bp->pf->max_vfs) { - if (bp->pf->vf_info) - bnxt_hwrm_free_vf_info(bp); - bp->pf->vf_info = rte_zmalloc("bnxt_vf_info", - sizeof(bp->pf->vf_info[0]) * new_max_vfs, 0); - if (bp->pf->vf_info == NULL) { - PMD_DRV_LOG(ERR, "Alloc vf info fail\n"); - HWRM_UNLOCK(); - return -ENOMEM; - } - bp->pf->max_vfs = new_max_vfs; - for (i = 0; i < new_max_vfs; i++) { - bp->pf->vf_info[i].fid = - bp->pf->first_vf_id + i; - bp->pf->vf_info[i].vlan_table = - rte_zmalloc("VF VLAN table", - getpagesize(), - getpagesize()); - if (bp->pf->vf_info[i].vlan_table == NULL) - PMD_DRV_LOG(ERR, - "Fail to alloc VLAN table for VF %d\n", - i); - else - rte_mem_lock_page( - bp->pf->vf_info[i].vlan_table); - bp->pf->vf_info[i].vlan_as_table = - rte_zmalloc("VF VLAN AS table", - getpagesize(), - getpagesize()); - if (bp->pf->vf_info[i].vlan_as_table == NULL) - PMD_DRV_LOG(ERR, - "Alloc VLAN AS table for VF %d fail\n", - i); - else - rte_mem_lock_page( - bp->pf->vf_info[i].vlan_as_table); - STAILQ_INIT(&bp->pf->vf_info[i].filter); - } + rc = bnxt_alloc_vf_info(bp, new_max_vfs); + if (rc) + goto unlock; } } @@ -815,6 +934,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) if (flags & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_LINK_ADMIN_STATUS_SUPPORTED) bp->fw_cap |= BNXT_FW_CAP_LINK_ADMIN; +unlock: HWRM_UNLOCK(); return rc; @@ -825,6 +945,9 @@ int bnxt_hwrm_func_qcaps(struct bnxt *bp) int rc; rc = __bnxt_hwrm_func_qcaps(bp); + if (rc == -ENOMEM) + return rc; + if (!rc && bp->hwrm_spec_code >= HWRM_SPEC_CODE_1_8_3) { rc = bnxt_alloc_ctx_mem(bp); if (rc) @@ -1110,6 +1233,11 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) else HWRM_CHECK_RESULT(); + if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) { + rc = -EAGAIN; + goto error; + } + PMD_DRV_LOG(INFO, "%d.%d.%d:%d.%d.%d.%d\n", resp->hwrm_intf_maj_8b, resp->hwrm_intf_min_8b, resp->hwrm_intf_upd_8b, resp->hwrm_fw_maj_8b, @@ -1143,6 +1271,7 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) if (bp->max_req_len > resp->max_req_win_len) { PMD_DRV_LOG(ERR, "Unsupported request length\n"); rc = -EINVAL; + goto error; } bp->chip_num = rte_le_to_cpu_16(resp->chip_num); @@ -1155,28 +1284,8 @@ int bnxt_hwrm_ver_get(struct bnxt *bp, uint32_t timeout) max_resp_len = rte_le_to_cpu_16(resp->max_resp_len); dev_caps_cfg = rte_le_to_cpu_32(resp->dev_caps_cfg); - if (bp->max_resp_len != max_resp_len) { - sprintf(type, "bnxt_hwrm_" PCI_PRI_FMT, - bp->pdev->addr.domain, bp->pdev->addr.bus, - bp->pdev->addr.devid, bp->pdev->addr.function); - - rte_free(bp->hwrm_cmd_resp_addr); - - bp->hwrm_cmd_resp_addr = rte_malloc(type, max_resp_len, 0); - if (bp->hwrm_cmd_resp_addr == NULL) { - rc = -ENOMEM; - goto error; - } - bp->hwrm_cmd_resp_dma_addr = - rte_malloc_virt2iova(bp->hwrm_cmd_resp_addr); - if (bp->hwrm_cmd_resp_dma_addr == RTE_BAD_IOVA) { - PMD_DRV_LOG(ERR, - "Unable to map response buffer to physical memory.\n"); - rc = -ENOMEM; - goto error; - } - bp->max_resp_len = max_resp_len; - } + RTE_VERIFY(max_resp_len <= bp->max_resp_len); + bp->max_resp_len = max_resp_len; if ((dev_caps_cfg & HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED) && @@ -1413,7 +1522,7 @@ int bnxt_hwrm_port_phy_qcaps(struct bnxt *bp) rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); - HWRM_CHECK_RESULT(); + HWRM_CHECK_RESULT_SILENT(); bp->port_cnt = resp->port_cnt; if (resp->supported_speeds_auto_mode) @@ -1672,7 +1781,8 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp, } int bnxt_hwrm_ring_free(struct bnxt *bp, - struct bnxt_ring *ring, uint32_t ring_type) + struct bnxt_ring *ring, uint32_t ring_type, + uint16_t cp_ring_id) { int rc; struct hwrm_ring_free_input req = {.req_type = 0 }; @@ -1682,6 +1792,7 @@ int bnxt_hwrm_ring_free(struct bnxt *bp, req.ring_type = ring_type; req.ring_id = rte_cpu_to_le_16(ring->fw_ring_id); + req.cmpl_ring = rte_cpu_to_le_16(cp_ring_id); rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); @@ -2541,7 +2652,8 @@ void bnxt_free_nq_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr) struct bnxt_ring *cp_ring = cpr->cp_ring_struct; bnxt_hwrm_ring_free(bp, cp_ring, - HWRM_RING_FREE_INPUT_RING_TYPE_NQ); + HWRM_RING_FREE_INPUT_RING_TYPE_NQ, + INVALID_HW_RING_ID); cp_ring->fw_ring_id = INVALID_HW_RING_ID; memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size * sizeof(*cpr->cp_desc_ring)); @@ -2554,7 +2666,8 @@ void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr) struct bnxt_ring *cp_ring = cpr->cp_ring_struct; bnxt_hwrm_ring_free(bp, cp_ring, - HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL); + HWRM_RING_FREE_INPUT_RING_TYPE_L2_CMPL, + INVALID_HW_RING_ID); cp_ring->fw_ring_id = INVALID_HW_RING_ID; memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size * sizeof(*cpr->cp_desc_ring)); @@ -2571,7 +2684,8 @@ void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index) if (ring->fw_ring_id != INVALID_HW_RING_ID) { bnxt_hwrm_ring_free(bp, ring, - HWRM_RING_FREE_INPUT_RING_TYPE_RX); + HWRM_RING_FREE_INPUT_RING_TYPE_RX, + cpr->cp_ring_struct->fw_ring_id); ring->fw_ring_id = INVALID_HW_RING_ID; if (BNXT_HAS_RING_GRPS(bp)) bp->grp_info[queue_index].rx_fw_ring_id = @@ -2582,7 +2696,8 @@ void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index) bnxt_hwrm_ring_free(bp, ring, BNXT_CHIP_P5(bp) ? HWRM_RING_FREE_INPUT_RING_TYPE_RX_AGG : - HWRM_RING_FREE_INPUT_RING_TYPE_RX); + HWRM_RING_FREE_INPUT_RING_TYPE_RX, + cpr->cp_ring_struct->fw_ring_id); if (BNXT_HAS_RING_GRPS(bp)) bp->grp_info[queue_index].ag_fw_ring_id = INVALID_HW_RING_ID; @@ -2607,7 +2722,8 @@ bnxt_free_all_hwrm_rings(struct bnxt *bp) if (ring->fw_ring_id != INVALID_HW_RING_ID) { bnxt_hwrm_ring_free(bp, ring, - HWRM_RING_FREE_INPUT_RING_TYPE_TX); + HWRM_RING_FREE_INPUT_RING_TYPE_TX, + cpr->cp_ring_struct->fw_ring_id); ring->fw_ring_id = INVALID_HW_RING_ID; memset(txr->tx_desc_ring, 0, txr->tx_ring_struct->ring_size * @@ -2668,7 +2784,7 @@ int bnxt_alloc_hwrm_resources(struct bnxt *bp) sprintf(type, "bnxt_hwrm_" PCI_PRI_FMT, pdev->addr.domain, pdev->addr.bus, pdev->addr.devid, pdev->addr.function); - bp->max_resp_len = HWRM_MAX_RESP_LEN; + bp->max_resp_len = BNXT_PAGE_SIZE; bp->hwrm_cmd_resp_addr = rte_malloc(type, bp->max_resp_len, 0); if (bp->hwrm_cmd_resp_addr == NULL) return -ENOMEM; @@ -3249,7 +3365,7 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp) rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); - HWRM_CHECK_RESULT(); + HWRM_CHECK_RESULT_SILENT(); memcpy(bp->parent->mac_addr, resp->mac_address, RTE_ETHER_ADDR_LEN); bp->parent->vnic = rte_le_to_cpu_16(resp->dflt_vnic_id); @@ -3258,7 +3374,7 @@ int bnxt_hwrm_parent_pf_qcfg(struct bnxt *bp) /* FIXME: Temporary workaround - remove when firmware issue is fixed. */ if (bp->parent->vnic == 0) { - PMD_DRV_LOG(ERR, "Error: parent VNIC unavailable.\n"); + PMD_DRV_LOG(DEBUG, "parent VNIC unavailable.\n"); /* Use hard-coded values appropriate for current Wh+ fw. */ if (bp->parent->fid == 2) bp->parent->vnic = 0x100; @@ -4262,7 +4378,7 @@ int bnxt_hwrm_port_led_qcaps(struct bnxt *bp) req.port_id = bp->pf->port_id; rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); - HWRM_CHECK_RESULT(); + HWRM_CHECK_RESULT_SILENT(); if (resp->num_leds > 0 && resp->num_leds < BNXT_MAX_LED) { unsigned int i; @@ -5913,3 +6029,30 @@ int bnxt_hwrm_fw_echo_reply(struct bnxt *bp, uint32_t echo_req_data1, return rc; } + +int bnxt_hwrm_poll_ver_get(struct bnxt *bp) +{ + struct hwrm_ver_get_input req = {.req_type = 0 }; + struct hwrm_ver_get_output *resp = bp->hwrm_cmd_resp_addr; + int rc = 0; + + bp->max_req_len = HWRM_MAX_REQ_LEN; + bp->max_resp_len = BNXT_PAGE_SIZE; + bp->hwrm_cmd_timeout = SHORT_HWRM_CMD_TIMEOUT; + + HWRM_PREP(&req, HWRM_VER_GET, BNXT_USE_CHIMP_MB); + req.hwrm_intf_maj = HWRM_VERSION_MAJOR; + req.hwrm_intf_min = HWRM_VERSION_MINOR; + req.hwrm_intf_upd = HWRM_VERSION_UPDATE; + + rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB); + + HWRM_CHECK_RESULT_SILENT(); + + if (resp->flags & HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY) + rc = -EAGAIN; + + HWRM_UNLOCK(); + + return rc; +}