net: add rte prefix to ether structures
[dpdk.git] / drivers / net / bnxt / rte_pmd_bnxt.c
index c1876f8..5e3d1bf 100644 (file)
@@ -1,34 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2017 Broadcom Limited.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Broadcom Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2017-2018 Broadcom
+ * All rights reserved.
  */
 
 #include <inttypes.h>
@@ -36,7 +8,7 @@
 #include <unistd.h>
 
 #include <rte_dev.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
 #include <rte_byteorder.h>
 
 int bnxt_rcv_msg_from_vf(struct bnxt *bp, uint16_t vf_id, void *msg)
 {
-       struct rte_pmd_bnxt_mb_event_param cb_param;
+       struct rte_pmd_bnxt_mb_event_param ret_param;
 
-       cb_param.retval = RTE_PMD_BNXT_MB_EVENT_PROCEED;
-       cb_param.vf_id = vf_id;
-       cb_param.msg = msg;
+       ret_param.retval = RTE_PMD_BNXT_MB_EVENT_PROCEED;
+       ret_param.vf_id = vf_id;
+       ret_param.msg = msg;
 
        _rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
-                       &cb_param, NULL);
+                                     &ret_param);
 
        /* Default to approve */
-       if (cb_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
-               cb_param.retval = RTE_PMD_BNXT_MB_EVENT_NOOP_ACK;
+       if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
+               ret_param.retval = RTE_PMD_BNXT_MB_EVENT_NOOP_ACK;
 
-       return cb_param.retval == RTE_PMD_BNXT_MB_EVENT_NOOP_ACK ? true : false;
+       return ret_param.retval == RTE_PMD_BNXT_MB_EVENT_NOOP_ACK ?
+               true : false;
 }
 
-int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on)
+int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on)
 {
        struct rte_eth_dev *eth_dev;
        struct bnxt *bp;
@@ -84,7 +57,7 @@ int rte_pmd_bnxt_set_tx_loopback(uint8_t port, uint8_t on)
        bp = (struct bnxt *)eth_dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set Tx loopback on non-PF port %d!\n",
                        port);
                return -ENOTSUP;
@@ -107,12 +80,12 @@ rte_pmd_bnxt_set_all_queues_drop_en_cb(struct bnxt_vnic_info *vnic, void *onptr)
        vnic->bd_stall = !(*on);
 }
 
-int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)
+int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on)
 {
        struct rte_eth_dev *eth_dev;
        struct bnxt *bp;
        uint32_t i;
-       int rc;
+       int rc = -EINVAL;
 
        RTE_ETH_VALID_PORTID_OR_ERR_RET(port, -ENODEV);
 
@@ -126,7 +99,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)
        bp = (struct bnxt *)eth_dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set all queues drop on non-PF port!\n");
                return -ENOTSUP;
        }
@@ -139,7 +112,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)
                bp->vnic_info[i].bd_stall = !on;
                rc = bnxt_hwrm_vnic_cfg(bp, &bp->vnic_info[i]);
                if (rc) {
-                       RTE_LOG(ERR, PMD, "Failed to update PF VNIC %d.\n", i);
+                       PMD_DRV_LOG(ERR, "Failed to update PF VNIC %d.\n", i);
                        return rc;
                }
        }
@@ -150,7 +123,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)
                                rte_pmd_bnxt_set_all_queues_drop_en_cb, &on,
                                bnxt_hwrm_vnic_cfg);
                if (rc) {
-                       RTE_LOG(ERR, PMD, "Failed to update VF VNIC %d.\n", i);
+                       PMD_DRV_LOG(ERR, "Failed to update VF VNIC %d.\n", i);
                        break;
                }
        }
@@ -158,8 +131,8 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint8_t port, uint8_t on)
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,
-                               struct ether_addr *mac_addr)
+int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,
+                               struct rte_ether_addr *mac_addr)
 {
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
@@ -179,7 +152,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set VF %d mac address on non-PF port %d!\n",
                        vf, port);
                return -ENOTSUP;
@@ -190,7 +163,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint8_t port, uint16_t vf,
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,
+int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,
                                uint16_t tx_rate, uint64_t q_msk)
 {
        struct rte_eth_dev *eth_dev;
@@ -223,7 +196,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,
 
        /* Requested BW can't be greater than link speed */
        if (tot_rate > eth_dev->data->dev_link.link_speed) {
-               RTE_LOG(ERR, PMD, "Rate > Link speed. Set to %d\n", tot_rate);
+               PMD_DRV_LOG(ERR, "Rate > Link speed. Set to %d\n", tot_rate);
                return -EINVAL;
        }
 
@@ -240,7 +213,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint8_t port, uint16_t vf,
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
+int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev;
@@ -261,7 +234,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
        bp = (struct bnxt *)dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set mac spoof on non-PF port %d!\n", port);
                return -EINVAL;
        }
@@ -293,7 +266,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
+int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev;
@@ -313,7 +286,7 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
        bp = (struct bnxt *)dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set VLAN spoof on non-PF port %d!\n", port);
                return -EINVAL;
        }
@@ -332,7 +305,7 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint8_t port, uint16_t vf, uint8_t on)
                                rc = -1;
                }
        } else {
-               RTE_LOG(ERR, PMD, "Failed to update VF VNIC %d.\n", vf);
+               PMD_DRV_LOG(ERR, "Failed to update VF VNIC %d.\n", vf);
        }
 
        return rc;
@@ -346,7 +319,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq_cb(struct bnxt_vnic_info *vnic, void *onptr)
 }
 
 int
-rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)
+rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on)
 {
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
@@ -366,7 +339,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set VF %d stripq on non-PF port %d!\n",
                        vf, port);
                return -ENOTSUP;
@@ -376,12 +349,12 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint8_t port, uint16_t vf, uint8_t on)
                                rte_pmd_bnxt_set_vf_vlan_stripq_cb, &on,
                                bnxt_hwrm_vnic_cfg);
        if (rc)
-               RTE_LOG(ERR, PMD, "Failed to update VF VNIC %d.\n", vf);
+               PMD_DRV_LOG(ERR, "Failed to update VF VNIC %d.\n", vf);
 
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,
+int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
                                uint16_t rx_mask, uint8_t on)
 {
        struct rte_eth_dev *dev;
@@ -405,20 +378,19 @@ int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,
        if (vf >= bp->pdev->max_vfs)
                return -EINVAL;
 
-       if (rx_mask & (ETH_VMDQ_ACCEPT_UNTAG | ETH_VMDQ_ACCEPT_HASH_MC)) {
-               RTE_LOG(ERR, PMD, "Currently cannot toggle this setting\n");
+       if (rx_mask & ETH_VMDQ_ACCEPT_UNTAG) {
+               PMD_DRV_LOG(ERR, "Currently cannot toggle this setting\n");
                return -ENOTSUP;
        }
 
-       if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC && !on) {
-               RTE_LOG(ERR, PMD, "Currently cannot disable UC Rx\n");
-               return -ENOTSUP;
-       }
+       /* Is this really the correct mapping?  VFd seems to think it is. */
+       if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC)
+               flag |= BNXT_VNIC_INFO_PROMISC;
 
        if (rx_mask & ETH_VMDQ_ACCEPT_BROADCAST)
                flag |= BNXT_VNIC_INFO_BCAST;
        if (rx_mask & ETH_VMDQ_ACCEPT_MULTICAST)
-               flag |= BNXT_VNIC_INFO_ALLMULTI;
+               flag |= BNXT_VNIC_INFO_ALLMULTI | BNXT_VNIC_INFO_MCAST;
 
        if (on)
                bp->pf.vf_info[vf].l2_rx_mask |= flag;
@@ -430,7 +402,7 @@ int rte_pmd_bnxt_set_vf_rxmode(uint8_t port, uint16_t vf,
                                        &bp->pf.vf_info[vf].l2_rx_mask,
                                        bnxt_set_rx_mask_no_vlan);
        if (rc)
-               RTE_LOG(ERR, PMD, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n");
+               PMD_DRV_LOG(ERR, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n");
 
        return rc;
 }
@@ -442,7 +414,7 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf)
        struct bnxt_vnic_info vnic;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set VLAN table on non-PF port!\n");
                return -EINVAL;
        }
@@ -455,7 +427,7 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf)
                /* This simply indicates there's no driver loaded.
                 * This is not an error.
                 */
-               RTE_LOG(ERR, PMD, "Unable to get default VNIC for VF %d\n", vf);
+               PMD_DRV_LOG(ERR, "Unable to get default VNIC for VF %d\n", vf);
        } else {
                memset(&vnic, 0, sizeof(vnic));
                vnic.fw_vnic_id = dflt_vnic;
@@ -473,7 +445,7 @@ static int bnxt_set_vf_table(struct bnxt *bp, uint16_t vf)
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,
+int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
                                    uint64_t vf_mask, uint8_t vlan_on)
 {
        struct bnxt_vlan_table_entry *ve;
@@ -518,9 +490,9 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,
                                /* Now check that there's space */
                                if (cnt == getpagesize() / sizeof(struct
                                    bnxt_vlan_antispoof_table_entry)) {
-                                       RTE_LOG(ERR, PMD,
+                                       PMD_DRV_LOG(ERR,
                                             "VLAN anti-spoof table is full\n");
-                                       RTE_LOG(ERR, PMD,
+                                       PMD_DRV_LOG(ERR,
                                                "VF %d cannot add VLAN %u\n",
                                                i, vlan);
                                        rc = -1;
@@ -566,7 +538,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint8_t port, uint16_t vlan,
        return rc;
 }
 
-int rte_pmd_bnxt_get_vf_stats(uint8_t port,
+int rte_pmd_bnxt_get_vf_stats(uint16_t port,
                              uint16_t vf_id,
                              struct rte_eth_stats *stats)
 {
@@ -585,7 +557,7 @@ int rte_pmd_bnxt_get_vf_stats(uint8_t port,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to get VF %d stats on non-PF port %d!\n",
                        vf_id, port);
                return -ENOTSUP;
@@ -594,7 +566,7 @@ int rte_pmd_bnxt_get_vf_stats(uint8_t port,
        return bnxt_hwrm_func_qstats(bp, bp->pf.first_vf_id + vf_id, stats);
 }
 
-int rte_pmd_bnxt_reset_vf_stats(uint8_t port,
+int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
                                uint16_t vf_id)
 {
        struct rte_eth_dev *dev;
@@ -612,7 +584,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to reset VF %d stats on non-PF port %d!\n",
                        vf_id, port);
                return -ENOTSUP;
@@ -621,7 +593,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint8_t port,
        return bnxt_hwrm_func_clr_stats(bp, bp->pf.first_vf_id + vf_id);
 }
 
-int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id)
+int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
 {
        struct rte_eth_dev *dev;
        struct rte_eth_dev_info dev_info;
@@ -638,7 +610,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id)
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to query VF %d RX stats on non-PF port %d!\n",
                        vf_id, port);
                return -ENOTSUP;
@@ -647,7 +619,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint8_t port, uint16_t vf_id)
        return bnxt_vf_vnic_count(bp, vf_id);
 }
 
-int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,
+int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,
                                      uint64_t *count)
 {
        struct rte_eth_dev *dev;
@@ -665,7 +637,7 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to query VF %d TX drops on non-PF port %d!\n",
                        vf_id, port);
                return -ENOTSUP;
@@ -675,7 +647,7 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint8_t port, uint16_t vf_id,
                                             count);
 }
 
-int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
+int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
                                uint32_t vf_id)
 {
        struct rte_eth_dev *dev;
@@ -683,7 +655,7 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
        struct bnxt *bp;
        struct bnxt_filter_info *filter;
        struct bnxt_vnic_info vnic;
-       struct ether_addr dflt_mac;
+       struct rte_ether_addr dflt_mac;
        int rc;
 
        dev = &rte_eth_devices[port];
@@ -697,7 +669,7 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to config VF %d MAC on non-PF port %d!\n",
                        vf_id, port);
                return -ENOTSUP;
@@ -706,7 +678,7 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
        /* If the VF currently uses a random MAC, update default to this one */
        if (bp->pf.vf_info[vf_id].random_mac) {
                if (rte_pmd_bnxt_get_vf_rx_status(port, vf_id) <= 0)
-                       rc = bnxt_hwrm_func_vf_mac(bp, vf_id, (uint8_t *)addr);
+                       bnxt_hwrm_func_vf_mac(bp, vf_id, (uint8_t *)addr);
        }
 
        /* query the default VNIC id used by the function */
@@ -727,7 +699,7 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
                    (HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
                     HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK) &&
                    memcmp(addr, filter->l2_addr, ETHER_ADDR_LEN) == 0) {
-                       bnxt_hwrm_clear_filter(bp, filter);
+                       bnxt_hwrm_clear_l2_filter(bp, filter);
                        break;
                }
        }
@@ -745,14 +717,14 @@ int rte_pmd_bnxt_mac_addr_add(uint8_t port, struct ether_addr *addr,
        /* Do not add a filter for the default MAC */
        if (bnxt_hwrm_func_qcfg_vf_default_mac(bp, vf_id, &dflt_mac) ||
            memcmp(filter->l2_addr, dflt_mac.addr_bytes, ETHER_ADDR_LEN))
-               rc = bnxt_hwrm_set_filter(bp, vnic.fw_vnic_id, filter);
+               rc = bnxt_hwrm_set_l2_filter(bp, vnic.fw_vnic_id, filter);
 
 exit:
        return rc;
 }
 
 int
-rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,
+rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,
                uint16_t vlan_id)
 {
        struct rte_eth_dev *dev;
@@ -773,7 +745,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,
                return -EINVAL;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set VF %d vlan insert on non-PF port %d!\n",
                        vf, port);
                return -ENOTSUP;
@@ -789,7 +761,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint8_t port, uint16_t vf,
        return rc;
 }
 
-int rte_pmd_bnxt_set_vf_persist_stats(uint8_t port, uint16_t vf, uint8_t on)
+int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)
 {
        struct rte_eth_dev_info dev_info;
        struct rte_eth_dev *dev;
@@ -807,7 +779,7 @@ int rte_pmd_bnxt_set_vf_persist_stats(uint8_t port, uint16_t vf, uint8_t on)
        bp = (struct bnxt *)dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "Attempt to set persist stats on non-PF port %d!\n",
                        port);
                return -EINVAL;