net: stmmac: Add option for VLAN filter fail queue enable

Add option in plat_stmmacenet_data struct to enable VLAN Filter Fail
Queuing. This option allows packets that fail VLAN filter to be routed
to a specific Rx queue when Receive All is also set.

When this option is enabled:
- Enable VFFQ only when entering promiscuous mode, because Receive All
  will pass up all rx packets that failed address filtering (similar to
  promiscuous mode).
- VLAN-promiscuous mode is never entered to allow rx packet to fail VLAN
  filters and get routed to selected VFFQ Rx queue.

Reviewed-by: Voon Weifeng <weifeng.voon@intel.com>
Reviewed-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: Chuah, Kim Tatt <kim.tatt.chuah@intel.com>
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index cafa8e3c3573b010203e581e9f6aa3f3fe8a89a2..df7de50497a0d9847233a01c20404a056e4cf302 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -481,6 +481,8 @@ struct mac_device_info {
        unsigned int num_vlan;
        u32 vlan_filter[32];
        unsigned int promisc;
+       bool vlan_fail_q_en;
+       u8 vlan_fail_q;
 };
 
 struct stmmac_rx_routing {

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 2ac9dfb3462c69ab5c5a56d5d415c761624a6ca1..ab0a81e0fea1ae3c2f536d2dab160fc27092028e 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
@@ -321,6 +321,11 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,
        /* Set the maxmtu to a default of JUMBO_LEN */
        plat->maxmtu = JUMBO_LEN;
 
+       plat->vlan_fail_q_en = true;
+
+       /* Use the last Rx queue */
+       plat->vlan_fail_q = plat->rx_queues_to_use - 1;
+
        return 0;
 }
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
index 61f3249bd724bc83f1ca74c98be3324876d1340e..592b043f967616cca925519daefe8cf15ce4188a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
@@ -76,6 +76,7 @@
 #define GMAC_PACKET_FILTER_HPF         BIT(10)
 #define GMAC_PACKET_FILTER_VTFE                BIT(16)
 #define GMAC_PACKET_FILTER_IPFE                BIT(20)
+#define GMAC_PACKET_FILTER_RA          BIT(31)
 
 #define GMAC_MAX_PERFECT_ADDRESSES     128
 

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index ecd834e0e12160dd2203cd4b6bede934804e8056..002791b7735687af3acc544b666db4f246710e84 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -618,7 +618,18 @@ static void dwmac4_set_filter(struct mac_device_info *hw,
        value &= ~GMAC_PACKET_FILTER_PM;
        value &= ~GMAC_PACKET_FILTER_PR;
        if (dev->flags & IFF_PROMISC) {
-               value = GMAC_PACKET_FILTER_PR | GMAC_PACKET_FILTER_PCF;
+               /* VLAN Tag Filter Fail Packets Queuing */
+               if (hw->vlan_fail_q_en) {
+                       value = readl(ioaddr + GMAC_RXQ_CTRL4);
+                       value &= ~GMAC_RXQCTRL_VFFQ_MASK;
+                       value |= GMAC_RXQCTRL_VFFQE |
+                                (hw->vlan_fail_q << GMAC_RXQCTRL_VFFQ_SHIFT);
+                       writel(value, ioaddr + GMAC_RXQ_CTRL4);
+                       value = GMAC_PACKET_FILTER_PR | GMAC_PACKET_FILTER_RA;
+               } else {
+                       value = GMAC_PACKET_FILTER_PR | GMAC_PACKET_FILTER_PCF;
+               }
+
        } else if ((dev->flags & IFF_ALLMULTI) ||
                   (netdev_mc_count(dev) > hw->multicast_filter_bins)) {
                /* Pass all multi */
@@ -680,7 +691,7 @@ static void dwmac4_set_filter(struct mac_device_info *hw,
 
        writel(value, ioaddr + GMAC_PACKET_FILTER);
 
-       if (dev->flags & IFF_PROMISC) {
+       if (dev->flags & IFF_PROMISC && !hw->vlan_fail_q_en) {
                if (!hw->promisc) {
                        hw->promisc = 1;
                        dwmac4_vlan_promisc_enable(dev, hw);

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h
index 3e8faa96b4d4051317514daf6182bd579a23d6fb..56b0762c12762881bbd3cbd4294e375e2a782b11 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h
@@ -92,6 +92,12 @@
 #define TCEIE                          BIT(0)
 #define DMA_ECC_INT_STATUS             0x00001088
 
+/* EQoS version 5.xx VLAN Tag Filter Fail Packets Queuing */
+#define GMAC_RXQ_CTRL4                 0x00000094
+#define GMAC_RXQCTRL_VFFQ_MASK         GENMASK(19, 17)
+#define GMAC_RXQCTRL_VFFQ_SHIFT                17
+#define GMAC_RXQCTRL_VFFQE             BIT(16)
+
 int dwmac5_safety_feat_config(void __iomem *ioaddr, unsigned int asp);
 int dwmac5_safety_feat_irq_status(struct net_device *ndev,
                void __iomem *ioaddr, unsigned int asp,

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 5e13e6f18dad768c90ccb67c63bffe3147e31715..4779826b997dc372c8d3a721bf8b692dc623c042 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -4713,6 +4713,9 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
        if (priv->dma_cap.tsoen)
                dev_info(priv->device, "TSO supported\n");
 
+       priv->hw->vlan_fail_q_en = priv->plat->vlan_fail_q_en;
+       priv->hw->vlan_fail_q = priv->plat->vlan_fail_q;
+
        /* Run HW quirks, if any */
        if (priv->hwif_quirks) {
                ret = priv->hwif_quirks(priv);

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index bd964c31d333551871af461a0082227008c31993..00e83c877496b9590cf88aa6bf3441ce6b06862f 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -198,5 +198,7 @@ struct plat_stmmacenet_data {
        int mac_port_sel_speed;
        bool en_tx_lpi_clockgating;
        int has_xgmac;
+       bool vlan_fail_q_en;
+       u8 vlan_fail_q;
 };
 #endif