net/bnxt: fix resource cleanup

[dpdk.git] / drivers / net / bnxt / bnxt_hwrm.c

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index c16edc8..cb2064d 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -792,6 +792,9 @@ void bnxt_free_vf_info(struct bnxt *bp)
 {
        int i;
 
+       if (bp->pf == NULL)
+               return;
+
        if (bp->pf->vf_info == NULL)
                return;
 
@@ -1271,6 +1274,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);
@@ -1283,28 +1287,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) &&
@@ -1383,6 +1367,9 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, uint32_t flags)
        HWRM_CHECK_RESULT();
        HWRM_UNLOCK();
 
+       PMD_DRV_LOG(DEBUG, "Port %u: Unregistered with fw\n",
+                   bp->eth_dev->data->port_id);
+
        return rc;
 }
 
@@ -1467,8 +1454,6 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct bnxt_link_info *conf)
        HWRM_CHECK_RESULT();
        HWRM_UNLOCK();
 
-       PMD_DRV_LOG(DEBUG, "Port %u: Unregistered with fw\n",
-                   bp->eth_dev->data->port_id);
        return rc;
 }
 
@@ -1541,7 +1526,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)
@@ -2803,7 +2788,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;
@@ -3384,7 +3369,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);
@@ -3393,7 +3378,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;
@@ -4397,7 +4382,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;
@@ -6056,6 +6041,7 @@ int bnxt_hwrm_poll_ver_get(struct bnxt *bp)
        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);