ralink: fix ethernet feature TSO not work

[openwrt.git] / target / linux / ramips / files / drivers / net / ethernet / ralink / soc_mt7620.c

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
index 6123f24..6e2fbdf 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/soc_mt7620.c
@@ -27,8 +27,8 @@
 
 #define MT7620A_CDMA_CSG_CFG   0x400
 #define MT7620_DMA_VID         (MT7620A_CDMA_CSG_CFG | 0x30)
-#define MT7621_DMA_VID         0xa8
-#define MT7620A_DMA_2B_OFFSET  BIT(31)
+#define MT7621_CDMP_IG_CTRL    (MT7620A_CDMA_CSG_CFG + 0x00)
+#define MT7621_CDMP_EG_CTRL    (MT7620A_CDMA_CSG_CFG + 0x04)
 #define MT7620A_RESET_FE       BIT(21)
 #define MT7621_RESET_FE                BIT(6)
 #define MT7620A_RESET_ESW      BIT(23)
@@ -96,7 +96,7 @@ static const u32 mt7621_reg_table[FE_REG_COUNT] = {
        [FE_REG_RX_DRX_IDX0] = RT5350_RX_DRX_IDX0,
        [FE_REG_FE_INT_ENABLE] = RT5350_FE_INT_ENABLE,
        [FE_REG_FE_INT_STATUS] = RT5350_FE_INT_STATUS,
-       [FE_REG_FE_DMA_VID_BASE] = MT7621_DMA_VID,
+       [FE_REG_FE_DMA_VID_BASE] = 0,
        [FE_REG_FE_COUNTER_BASE] = MT7621_GDM1_TX_GBCNT,
        [FE_REG_FE_RST_GL] = MT7621_FE_RST_GL,
 };
@@ -135,6 +135,14 @@ static void mt7620_txcsum_config(bool enable)
                                MT7620A_CDMA_CSG_CFG);
 }
 
+static void mt7621_rxvlan_config(bool enable)
+{
+       if (enable)
+               fe_w32(1, MT7621_CDMP_EG_CTRL);
+       else
+               fe_w32(0, MT7621_CDMP_EG_CTRL);
+}
+
 static int mt7620_fwd_config(struct fe_priv *priv)
 {
        struct net_device *dev = priv_netdev(priv);
@@ -153,15 +161,16 @@ static int mt7621_fwd_config(struct fe_priv *priv)
 
        fe_w32(fe_r32(MT7620A_GDMA1_FWD_CFG) & ~0xffff, MT7620A_GDMA1_FWD_CFG);
 
-       mt7620_txcsum_config((dev->features & NETIF_F_IP_CSUM));
+       /* mt7621 don't have txcsum config */
        mt7620_rxcsum_config((dev->features & NETIF_F_RXCSUM));
+       mt7621_rxvlan_config((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
+                       (priv->flags & FE_FLAG_RX_VLAN_CTAG));
 
        return 0;
 }
 
 static void mt7620_tx_dma(struct fe_tx_dma *txd)
 {
-       txd->txd4 = 0;
 }
 
 static void mt7621_tx_dma(struct fe_tx_dma *txd)
@@ -169,21 +178,17 @@ static void mt7621_tx_dma(struct fe_tx_dma *txd)
        txd->txd4 = BIT(25);
 }
 
-static void mt7620_rx_dma(struct fe_rx_dma *rxd, u16 len)
-{
-       rxd->rxd2 = RX_DMA_PLEN0(len);
-}
-
 static void mt7620_init_data(struct fe_soc_data *data,
                struct net_device *netdev)
 {
        struct fe_priv *priv = netdev_priv(netdev);
 
-       priv->flags = FE_FLAG_PADDING_64B;
+       priv->flags = FE_FLAG_PADDING_64B | FE_FLAG_RX_2B_OFFSET |
+               FE_FLAG_RX_SG_DMA;
+
        netdev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
                NETIF_F_HW_VLAN_CTAG_TX;
-
-       if (mt7620_get_eco() >= 5 || IS_ENABLED(CONFIG_SOC_MT7621))
+       if (mt7620_get_eco() >= 5)
                netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
                        NETIF_F_IPV6_CSUM;
 }
@@ -193,8 +198,12 @@ static void mt7621_init_data(struct fe_soc_data *data,
 {
        struct fe_priv *priv = netdev_priv(netdev);
 
-       priv->flags = FE_FLAG_PADDING_64B;
-       netdev->hw_features = NETIF_F_HW_VLAN_CTAG_TX;
+       priv->flags = FE_FLAG_PADDING_64B | FE_FLAG_RX_2B_OFFSET |
+               FE_FLAG_RX_SG_DMA | FE_FLAG_NAPI_WEIGHT;
+
+       netdev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM |
+               NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_SG | NETIF_F_TSO |
+               NETIF_F_TSO6 | NETIF_F_IPV6_CSUM;
 }
 
 static void mt7621_set_mac(struct fe_priv *priv, unsigned char *mac)
@@ -215,16 +224,14 @@ static struct fe_soc_data mt7620_data = {
        .set_mac = mt7620_set_mac,
        .fwd_config = mt7620_fwd_config,
        .tx_dma = mt7620_tx_dma,
-       .rx_dma = mt7620_rx_dma,
        .switch_init = mt7620_gsw_probe,
        .switch_config = mt7620_gsw_config,
        .port_init = mt7620_port_init,
        .reg_table = mt7620_reg_table,
-       .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS | MT7620A_DMA_2B_OFFSET,
+       .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS,
        .rx_int = RT5350_RX_DONE_INT,
        .tx_int = RT5350_TX_DONE_INT,
        .checksum_bit = MT7620_L4_VALID,
-       .tx_udf_bit = MT7620_TX_DMA_UDF,
        .has_carrier = mt7620a_has_carrier,
        .mdio_read = mt7620_mdio_read,
        .mdio_write = mt7620_mdio_write,
@@ -238,15 +245,13 @@ static struct fe_soc_data mt7621_data = {
        .set_mac = mt7621_set_mac,
        .fwd_config = mt7621_fwd_config,
        .tx_dma = mt7621_tx_dma,
-       .rx_dma = mt7620_rx_dma,
        .switch_init = mt7620_gsw_probe,
        .switch_config = mt7621_gsw_config,
        .reg_table = mt7621_reg_table,
-       .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS | MT7620A_DMA_2B_OFFSET,
+       .pdma_glo_cfg = FE_PDMA_SIZE_16DWORDS,
        .rx_int = RT5350_RX_DONE_INT,
        .tx_int = RT5350_TX_DONE_INT,
        .checksum_bit = MT7621_L4_VALID,
-       .tx_udf_bit = MT7621_TX_DMA_UDF,
        .has_carrier = mt7620a_has_carrier,
        .mdio_read = mt7620_mdio_read,
        .mdio_write = mt7620_mdio_write,