net/dpaa2: add support for VLAN filter and offload
[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.c
index 0526e26..46532b2 100644 (file)
@@ -108,6 +108,56 @@ dpaa2_dev_atomic_write_link_status(struct rte_eth_dev *dev,
        return 0;
 }
 
+static int
+dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return -1;
+       }
+
+       if (on)
+               ret = dpni_add_vlan_id(dpni, CMD_PRI_LOW,
+                                      priv->token, vlan_id);
+       else
+               ret = dpni_remove_vlan_id(dpni, CMD_PRI_LOW,
+                                         priv->token, vlan_id);
+
+       if (ret < 0)
+               PMD_DRV_LOG(ERR, "ret = %d Unable to add/rem vlan %d hwid =%d",
+                           ret, vlan_id, priv->hw_id);
+
+       return ret;
+}
+
+static void
+dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
+{
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = priv->hw;
+       int ret;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (mask & ETH_VLAN_FILTER_MASK) {
+               if (dev->data->dev_conf.rxmode.hw_vlan_filter)
+                       ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
+                                                     priv->token, true);
+               else
+                       ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
+                                                     priv->token, false);
+               if (ret < 0)
+                       RTE_LOG(ERR, PMD, "Unable to set vlan filter ret = %d",
+                               ret);
+       }
+}
+
 static void
 dpaa2_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 {
@@ -542,6 +592,9 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
                             "code = %d\n", ret);
                return ret;
        }
+       /* VLAN Offload Settings */
+       if (priv->max_vlan_filters)
+               dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
 
        return 0;
 }
@@ -617,7 +670,11 @@ dpaa2_dev_promiscuous_enable(
 
        ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to enable promiscuous mode %d", ret);
+               RTE_LOG(ERR, PMD, "Unable to enable U promisc mode %d", ret);
+
+       ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
+       if (ret < 0)
+               RTE_LOG(ERR, PMD, "Unable to enable M promisc mode %d", ret);
 }
 
 static void
@@ -637,7 +694,58 @@ dpaa2_dev_promiscuous_disable(
 
        ret = dpni_set_unicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
        if (ret < 0)
-               RTE_LOG(ERR, PMD, "Unable to disable promiscuous mode %d", ret);
+               RTE_LOG(ERR, PMD, "Unable to disable U promisc mode %d", ret);
+
+       if (dev->data->all_multicast == 0) {
+               ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW,
+                                                priv->token, false);
+               if (ret < 0)
+                       RTE_LOG(ERR, PMD, "Unable to disable M promisc mode %d",
+                               ret);
+       }
+}
+
+static void
+dpaa2_dev_allmulticast_enable(
+               struct rte_eth_dev *dev)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, true);
+       if (ret < 0)
+               RTE_LOG(ERR, PMD, "Unable to enable multicast mode %d", ret);
+}
+
+static void
+dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       /* must remain on for all promiscuous */
+       if (dev->data->promiscuous == 1)
+               return;
+
+       ret = dpni_set_multicast_promisc(dpni, CMD_PRI_LOW, priv->token, false);
+       if (ret < 0)
+               RTE_LOG(ERR, PMD, "Unable to disable multicast mode %d", ret);
 }
 
 static int
@@ -672,6 +780,78 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        return 0;
 }
 
+static int
+dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
+                      struct ether_addr *addr,
+                      __rte_unused uint32_t index,
+                      __rte_unused uint32_t pool)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return -1;
+       }
+
+       ret = dpni_add_mac_addr(dpni, CMD_PRI_LOW,
+                               priv->token, addr->addr_bytes);
+       if (ret)
+               RTE_LOG(ERR, PMD, "error: Adding the MAC ADDR failed:"
+                       " err = %d", ret);
+       return 0;
+}
+
+static void
+dpaa2_dev_remove_mac_addr(struct rte_eth_dev *dev,
+                         uint32_t index)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct rte_eth_dev_data *data = dev->data;
+       struct ether_addr *macaddr;
+
+       PMD_INIT_FUNC_TRACE();
+
+       macaddr = &data->mac_addrs[index];
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       ret = dpni_remove_mac_addr(dpni, CMD_PRI_LOW,
+                                  priv->token, macaddr->addr_bytes);
+       if (ret)
+               RTE_LOG(ERR, PMD, "error: Removing the MAC ADDR failed:"
+                       " err = %d", ret);
+}
+
+static void
+dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
+                      struct ether_addr *addr)
+{
+       int ret;
+       struct dpaa2_dev_priv *priv = dev->data->dev_private;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (dpni == NULL) {
+               RTE_LOG(ERR, PMD, "dpni is NULL");
+               return;
+       }
+
+       ret = dpni_set_primary_mac_addr(dpni, CMD_PRI_LOW,
+                                       priv->token, addr->addr_bytes);
+
+       if (ret)
+               RTE_LOG(ERR, PMD, "error: Setting the MAC ADDR failed %d", ret);
+}
 static
 void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
                         struct rte_eth_stats *stats)
@@ -720,7 +900,11 @@ void dpaa2_dev_stats_get(struct rte_eth_dev *dev,
        if (retcode)
                goto err;
 
-       stats->ierrors = value.page_2.ingress_discarded_frames;
+       /* Ingress drop frame count due to configured rules */
+       stats->ierrors = value.page_2.ingress_filtered_frames;
+       /* Ingress drop frame count due to error */
+       stats->ierrors += value.page_2.ingress_discarded_frames;
+
        stats->oerrors = value.page_2.egress_discarded_frames;
        stats->imissed = value.page_2.ingress_nobuffer_discards;
 
@@ -812,16 +996,23 @@ static struct eth_dev_ops dpaa2_ethdev_ops = {
        .dev_close            = dpaa2_dev_close,
        .promiscuous_enable   = dpaa2_dev_promiscuous_enable,
        .promiscuous_disable  = dpaa2_dev_promiscuous_disable,
+       .allmulticast_enable  = dpaa2_dev_allmulticast_enable,
+       .allmulticast_disable = dpaa2_dev_allmulticast_disable,
        .link_update       = dpaa2_dev_link_update,
        .stats_get             = dpaa2_dev_stats_get,
        .stats_reset       = dpaa2_dev_stats_reset,
        .dev_infos_get     = dpaa2_dev_info_get,
        .dev_supported_ptypes_get = dpaa2_supported_ptypes_get,
        .mtu_set           = dpaa2_dev_mtu_set,
+       .vlan_filter_set      = dpaa2_vlan_filter_set,
+       .vlan_offload_set     = dpaa2_vlan_offload_set,
        .rx_queue_setup    = dpaa2_dev_rx_queue_setup,
        .rx_queue_release  = dpaa2_dev_rx_queue_release,
        .tx_queue_setup    = dpaa2_dev_tx_queue_setup,
        .tx_queue_release  = dpaa2_dev_tx_queue_release,
+       .mac_addr_add         = dpaa2_dev_add_mac_addr,
+       .mac_addr_remove      = dpaa2_dev_remove_mac_addr,
+       .mac_addr_set         = dpaa2_dev_set_mac_addr,
 };
 
 static int