net/cnxk: fix RSS RETA table update

[dpdk.git] / drivers / net / cnxk / cn10k_ethdev.c

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index f3003dd..e57847e 100644 (file)
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -39,6 +39,9 @@ nix_rx_offload_flags(struct rte_eth_dev *eth_dev)
        if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY)
                flags |= NIX_RX_OFFLOAD_SECURITY_F;
 
+       if (dev->rx_mark_update)
+               flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+
        return flags;
 }
 
@@ -291,6 +294,12 @@ cn10k_nix_configure(struct rte_eth_dev *eth_dev)
        if (rc)
                return rc;
 
+       if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_SECURITY ||
+           dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY) {
+               /* Register callback to handle security error work */
+               roc_nix_inl_cb_register(cn10k_eth_sec_sso_work_cb, NULL);
+       }
+
        /* Update offload flags */
        dev->rx_offload_flags = nix_rx_offload_flags(eth_dev);
        dev->tx_offload_flags = nix_tx_offload_flags(eth_dev);
@@ -419,6 +428,27 @@ cn10k_nix_timesync_disable(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static int
+cn10k_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
+                                    struct timespec *timestamp)
+{
+       struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+       struct cnxk_timesync_info *tstamp = &dev->tstamp;
+       uint64_t ns;
+
+       if (*tstamp->tx_tstamp == 0)
+               return -EINVAL;
+
+       *tstamp->tx_tstamp = ((*tstamp->tx_tstamp >> 32) * NSEC_PER_SEC) +
+               (*tstamp->tx_tstamp & 0xFFFFFFFFUL);
+       ns = rte_timecounter_update(&dev->tx_tstamp_tc, *tstamp->tx_tstamp);
+       *timestamp = rte_ns_to_timespec(ns);
+       *tstamp->tx_tstamp = 0;
+       rte_wmb();
+
+       return 0;
+}
+
 static int
 cn10k_nix_dev_start(struct rte_eth_dev *eth_dev)
 {
@@ -448,6 +478,27 @@ cn10k_nix_dev_start(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static int
+cn10k_nix_rx_metadata_negotiate(struct rte_eth_dev *eth_dev, uint64_t *features)
+{
+       struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+
+       *features &=
+               (RTE_ETH_RX_METADATA_USER_FLAG | RTE_ETH_RX_METADATA_USER_MARK);
+
+       if (*features) {
+               dev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = true;
+       } else {
+               dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = false;
+       }
+
+       cn10k_eth_set_rx_function(eth_dev);
+
+       return 0;
+}
+
 /* Update platform specific eth dev ops */
 static void
 nix_eth_dev_ops_override(void)
@@ -467,6 +518,10 @@ nix_eth_dev_ops_override(void)
        cnxk_eth_dev_ops.dev_ptypes_set = cn10k_nix_ptypes_set;
        cnxk_eth_dev_ops.timesync_enable = cn10k_nix_timesync_enable;
        cnxk_eth_dev_ops.timesync_disable = cn10k_nix_timesync_disable;
+       cnxk_eth_dev_ops.rx_metadata_negotiate =
+               cn10k_nix_rx_metadata_negotiate;
+       cnxk_eth_dev_ops.timesync_read_tx_timestamp =
+               cn10k_nix_timesync_read_tx_timestamp;
 }
 
 static void