rte_eth_dev_reset is claimed as an async API, so re-work on the device reset handling.
Signed-off-by: Qi Zhang <qi.z.zh...@intel.com> --- app/test-pmd/testpmd.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index ee48db2a3..8d4d7b4f9 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1918,6 +1918,54 @@ close_port(portid_t pid) printf("Done\n"); } +static int reset_ret; +static int reset_done; + +static int +on_reset_complete(__rte_unused uint16_t port_id, + __rte_unused enum rte_eth_event_type event, + __rte_unused void *cb_arg, + void *ret_param) +{ + RTE_ASSERT(event == RTE_ETH_EVENT_RESET_COMPLETE); + + reset_ret = *(int *)ret_param; + reset_done = 1; + return 0; +} + +static int +do_dev_reset_sync(portid_t pid) +{ + int ret; + + ret = rte_eth_dev_callback_register(pid, + RTE_ETH_EVENT_RESET_COMPLETE, + on_reset_complete, NULL); + + if (ret) { + printf("Fail to reigster callback function\n"); + return ret; + } + + reset_done = 0; + ret = rte_eth_dev_reset(pid); + if (ret) + goto finish; + + while (!reset_done) + rte_delay_ms(10); + + ret = reset_ret; + +finish: + rte_eth_dev_callback_unregister(pid, + RTE_ETH_EVENT_RESET_COMPLETE, + on_reset_complete, NULL); + + return ret; +} + void reset_port(portid_t pid) { @@ -1946,7 +1994,7 @@ reset_port(portid_t pid) continue; } - diag = rte_eth_dev_reset(pi); + diag = do_dev_reset_sync(pi); if (diag == 0) { port = &ports[pi]; port->need_reconfig = 1; -- 2.13.6