From 9b4631be9d8a5bda647d0240b2e965fd8573e6d4 Mon Sep 17 00:00:00 2001 From: Nikhil Rao Date: Tue, 25 Sep 2018 12:49:05 +0530 Subject: [PATCH] test/event: fix Rx adapter intr test for skeleton PMD Skeleton PMD does not support RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ so make the Rx queue_id = -1 and initialize the event port configuration to zero. Fixes: d65856999dd6 ("test/event: add Rx adapter tests for interrupt driven queues") Cc: stable@dpdk.org Signed-off-by: Nikhil Rao Acked-by: Jerin Jacob --- test/test/test_event_eth_rx_adapter.c | 37 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/test/test/test_event_eth_rx_adapter.c b/test/test/test_event_eth_rx_adapter.c index 1dcc09262d..1d3be82b5a 100644 --- a/test/test/test_event_eth_rx_adapter.c +++ b/test/test/test_event_eth_rx_adapter.c @@ -535,11 +535,13 @@ adapter_intr_queue_add_del(void) /* weight = 0 => interrupt mode */ queue_config.servicing_weight = 0; - /* add queue 0 */ - err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, - TEST_ETHDEV_ID, 0, - &queue_config); - TEST_ASSERT(err == 0, "Expected 0 got %d", err); + if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) { + /* add queue 0 */ + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, 0, + &queue_config); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + } /* add all queues */ queue_config.servicing_weight = 0; @@ -549,11 +551,13 @@ adapter_intr_queue_add_del(void) &queue_config); TEST_ASSERT(err == 0, "Expected 0 got %d", err); - /* del queue 0 */ - err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, - TEST_ETHDEV_ID, - 0); - TEST_ASSERT(err == 0, "Expected 0 got %d", err); + if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) { + /* del queue 0 */ + err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, + TEST_ETHDEV_ID, + 0); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + } /* del remaining queues */ err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID, @@ -571,11 +575,14 @@ adapter_intr_queue_add_del(void) /* intr -> poll mode queue */ queue_config.servicing_weight = 1; - err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, - TEST_ETHDEV_ID, - 0, - &queue_config); - TEST_ASSERT(err == 0, "Expected 0 got %d", err); + + if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ) { + err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, + TEST_ETHDEV_ID, + 0, + &queue_config); + TEST_ASSERT(err == 0, "Expected 0 got %d", err); + } err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID, TEST_ETHDEV_ID, -- 2.20.1