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
common/dpaax/caamflib: update ZUC-ZUC descriptor sharing
[dpdk.git]
/
drivers
/
common
/
dpaax
/
dpaax_iova_table.c
diff --git
a/drivers/common/dpaax/dpaax_iova_table.c
b/drivers/common/dpaax/dpaax_iova_table.c
index
43c9c72
..
91bee65
100644
(file)
--- a/
drivers/common/dpaax/dpaax_iova_table.c
+++ b/
drivers/common/dpaax/dpaax_iova_table.c
@@
-7,9
+7,6
@@
#include "dpaax_iova_table.h"
#include "dpaax_logs.h"
#include "dpaax_iova_table.h"
#include "dpaax_logs.h"
-/* Global dpaax logger identifier */
-int dpaax_logger;
-
/* Global table reference */
struct dpaax_iova_table *dpaax_iova_table_p;
/* Global table reference */
struct dpaax_iova_table *dpaax_iova_table_p;
@@
-68,9
+65,12
@@
read_memory_node(unsigned int *count)
*count = 0;
ret = glob(MEM_NODE_PATH_GLOB, 0, NULL, &result);
*count = 0;
ret = glob(MEM_NODE_PATH_GLOB, 0, NULL, &result);
+ if (ret != 0)
+ ret = glob(MEM_NODE_PATH_GLOB_VM, 0, NULL, &result);
+
if (ret != 0) {
if (ret != 0) {
- DPAAX_DEBUG("Unable to glob device-tree memory node
: (%s)(
%d)",
-
MEM_NODE_PATH_GLOB,
ret);
+ DPAAX_DEBUG("Unable to glob device-tree memory node
(err:
%d)",
+ ret);
goto out;
}
goto out;
}
@@
-440,7
+440,7
@@
dpaax_memevent_walk_memsegs(const struct rte_memseg_list *msl __rte_unused,
void *arg __rte_unused)
{
DPAAX_DEBUG("Walking for %p (pa=%"PRIu64") and len %zu",
void *arg __rte_unused)
{
DPAAX_DEBUG("Walking for %p (pa=%"PRIu64") and len %zu",
- ms->addr, ms->
phys_addr
, len);
+ ms->addr, ms->
iova
, len);
dpaax_iova_table_update(rte_mem_virt2phy(ms->addr), ms->addr, len);
return 0;
}
dpaax_iova_table_update(rte_mem_virt2phy(ms->addr), ms->addr, len);
return 0;
}
@@
-460,9
+460,4
@@
dpaax_handle_memevents(void)
dpaax_memevent_cb, NULL);
}
dpaax_memevent_cb, NULL);
}
-RTE_INIT(dpaax_log)
-{
- dpaax_logger = rte_log_register("pmd.common.dpaax");
- if (dpaax_logger >= 0)
- rte_log_set_level(dpaax_logger, RTE_LOG_ERR);
-}
+RTE_LOG_REGISTER(dpaax_logger, pmd.common.dpaax, ERR);