From: Igor Romanov <igor.roma...@oktetlabs.ru>

Failsafe driver does not support any device capabilities yet.
Make fs_dev_infos_get() consider default ones to limit advertised
device capabilities to really supported instead of unconditional
inheritance from sub-devices.

Fixes: cac923cfea47 ("ethdev: support runtime queue setup")
Cc: sta...@dpdk.org

Signed-off-by: Igor Romanov <igor.roma...@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybche...@solarflare.com>
---
 drivers/net/failsafe/failsafe_ops.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_ops.c 
b/drivers/net/failsafe/failsafe_ops.c
index 24e91c931..2df8b55d9 100644
--- a/drivers/net/failsafe/failsafe_ops.c
+++ b/drivers/net/failsafe/failsafe_ops.c
@@ -716,6 +716,8 @@ fs_stats_reset(struct rte_eth_dev *dev)
  *      all sub_devices and the default capabilities.
  *      Uses a logical AND of TX capabilities among
  *      the active probed sub_device and the default capabilities.
+ *      Uses a logical AND of device capabilities among
+ *      all sub_devices and the default capabilities.
  *
  */
 static void
@@ -734,10 +736,12 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
                uint64_t rx_offload_capa;
                uint64_t rxq_offload_capa;
                uint64_t rss_hf_offload_capa;
+               uint64_t dev_capa;
 
                rx_offload_capa = default_infos.rx_offload_capa;
                rxq_offload_capa = default_infos.rx_queue_offload_capa;
                rss_hf_offload_capa = default_infos.flow_type_rss_offloads;
+               dev_capa = default_infos.dev_capa;
                FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_PROBED) {
                        rte_eth_dev_info_get(PORT_ID(sdev),
                                        &PRIV(dev)->infos);
@@ -746,12 +750,14 @@ fs_dev_infos_get(struct rte_eth_dev *dev,
                                        PRIV(dev)->infos.rx_queue_offload_capa;
                        rss_hf_offload_capa &=
                                        PRIV(dev)->infos.flow_type_rss_offloads;
+                       dev_capa &= PRIV(dev)->infos.dev_capa;
                }
                sdev = TX_SUBDEV(dev);
                rte_eth_dev_info_get(PORT_ID(sdev), &PRIV(dev)->infos);
                PRIV(dev)->infos.rx_offload_capa = rx_offload_capa;
                PRIV(dev)->infos.rx_queue_offload_capa = rxq_offload_capa;
                PRIV(dev)->infos.flow_type_rss_offloads = rss_hf_offload_capa;
+               PRIV(dev)->infos.dev_capa = dev_capa;
                PRIV(dev)->infos.tx_offload_capa &=
                                        default_infos.tx_offload_capa;
                PRIV(dev)->infos.tx_queue_offload_capa &=
-- 
2.17.1

Reply via email to