git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/mlx5: remove control path locks
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_vnic.c
diff --git
a/drivers/net/bnxt/bnxt_vnic.c
b/drivers/net/bnxt/bnxt_vnic.c
index
6f7c05b
..
d4aeb4c
100644
(file)
--- a/
drivers/net/bnxt/bnxt_vnic.c
+++ b/
drivers/net/bnxt/bnxt_vnic.c
@@
-107,7
+107,7
@@
int bnxt_free_vnic(struct bnxt *bp, struct bnxt_vnic_info *vnic,
}
temp = STAILQ_NEXT(temp, next);
}
}
temp = STAILQ_NEXT(temp, next);
}
-
RTE_LOG(ERR, PMD
, "VNIC %p is not found in pool[%d]\n", vnic, pool);
+
PMD_DRV_LOG(ERR
, "VNIC %p is not found in pool[%d]\n", vnic, pool);
return -EINVAL;
}
return -EINVAL;
}
@@
-118,7
+118,7
@@
struct bnxt_vnic_info *bnxt_alloc_vnic(struct bnxt *bp)
/* Find the 1st unused vnic from the free_vnic_list pool*/
vnic = STAILQ_FIRST(&bp->free_vnic_list);
if (!vnic) {
/* Find the 1st unused vnic from the free_vnic_list pool*/
vnic = STAILQ_FIRST(&bp->free_vnic_list);
if (!vnic) {
-
RTE_LOG(ERR, PMD
, "No more free VNIC resources\n");
+
PMD_DRV_LOG(ERR
, "No more free VNIC resources\n");
return NULL;
}
STAILQ_REMOVE_HEAD(&bp->free_vnic_list, next);
return NULL;
}
STAILQ_REMOVE_HEAD(&bp->free_vnic_list, next);
@@
-175,7
+175,7
@@
int bnxt_alloc_vnic_attributes(struct bnxt *bp)
BNXT_MAX_MC_ADDRS * ETHER_ADDR_LEN);
uint16_t max_vnics;
int i;
BNXT_MAX_MC_ADDRS * ETHER_ADDR_LEN);
uint16_t max_vnics;
int i;
-
phys_addr
_t mz_phys_addr;
+
rte_iova
_t mz_phys_addr;
max_vnics = bp->max_vnics;
snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
max_vnics = bp->max_vnics;
snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@
-192,15
+192,15
@@
int bnxt_alloc_vnic_attributes(struct bnxt *bp)
if (!mz)
return -ENOMEM;
}
if (!mz)
return -ENOMEM;
}
- mz_phys_addr = mz->
phys_addr
;
+ mz_phys_addr = mz->
iova
;
if ((unsigned long)mz->addr == mz_phys_addr) {
if ((unsigned long)mz->addr == mz_phys_addr) {
-
RTE_LOG(WARNING, PMD
,
+
PMD_DRV_LOG(WARNING
,
"Memzone physical address same as virtual.\n");
"Memzone physical address same as virtual.\n");
-
RTE_LOG(WARNING, PMD
,
- "Using rte_mem_virt2
phy
()\n");
- mz_phys_addr = rte_mem_virt2
phy
(mz->addr);
+
PMD_DRV_LOG(WARNING
,
+ "Using rte_mem_virt2
iova
()\n");
+ mz_phys_addr = rte_mem_virt2
iova
(mz->addr);
if (mz_phys_addr == 0) {
if (mz_phys_addr == 0) {
-
RTE_LOG(ERR, PMD
,
+
PMD_DRV_LOG(ERR
,
"unable to map vnic address to physical memory\n");
return -ENOMEM;
}
"unable to map vnic address to physical memory\n");
return -ENOMEM;
}
@@
-241,7
+241,7
@@
void bnxt_free_vnic_mem(struct bnxt *bp)
for (i = 0; i < max_vnics; i++) {
vnic = &bp->vnic_info[i];
if (vnic->fw_vnic_id != (uint16_t)HWRM_NA_SIGNATURE) {
for (i = 0; i < max_vnics; i++) {
vnic = &bp->vnic_info[i];
if (vnic->fw_vnic_id != (uint16_t)HWRM_NA_SIGNATURE) {
-
RTE_LOG(ERR, PMD
, "VNIC is not freed yet!\n");
+
PMD_DRV_LOG(ERR
, "VNIC is not freed yet!\n");
/* TODO Call HWRM to free VNIC */
}
}
/* TODO Call HWRM to free VNIC */
}
}
@@
-260,7
+260,7
@@
int bnxt_alloc_vnic_mem(struct bnxt *bp)
vnic_mem = rte_zmalloc("bnxt_vnic_info",
max_vnics * sizeof(struct bnxt_vnic_info), 0);
if (vnic_mem == NULL) {
vnic_mem = rte_zmalloc("bnxt_vnic_info",
max_vnics * sizeof(struct bnxt_vnic_info), 0);
if (vnic_mem == NULL) {
-
RTE_LOG(ERR, PMD
, "Failed to alloc memory for %d VNICs",
+
PMD_DRV_LOG(ERR
, "Failed to alloc memory for %d VNICs",
max_vnics);
return -ENOMEM;
}
max_vnics);
return -ENOMEM;
}