Merge branch 'mhi-net-immutable' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / net / ethernet / mediatek / mtk_eth_soc.h

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index 454cfcd..fd3cec8 100644 (file)
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -17,12 +17,13 @@
 #include <linux/phylink.h>
 
 #define MTK_QDMA_PAGE_SIZE     2048
-#define        MTK_MAX_RX_LENGTH       1536
+#define MTK_MAX_RX_LENGTH      1536
+#define MTK_MAX_RX_LENGTH_2K   2048
 #define MTK_TX_DMA_BUF_LEN     0x3fff
 #define MTK_DMA_SIZE           256
 #define MTK_NAPI_WEIGHT                64
 #define MTK_MAC_COUNT          2
-#define MTK_RX_ETH_HLEN                (VLAN_ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)
+#define MTK_RX_ETH_HLEN                (ETH_HLEN + ETH_FCS_LEN)
 #define MTK_RX_HLEN            (NET_SKB_PAD + MTK_RX_ETH_HLEN + NET_IP_ALIGN)
 #define MTK_DMA_DUMMY_DESC     0xffffffff
 #define MTK_DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | \
@@ -320,7 +321,12 @@
 
 /* Mac control registers */
 #define MTK_MAC_MCR(x)         (0x10100 + (x * 0x100))
-#define MAC_MCR_MAX_RX_1536    BIT(24)
+#define MAC_MCR_MAX_RX_MASK    GENMASK(25, 24)
+#define MAC_MCR_MAX_RX(_x)     (MAC_MCR_MAX_RX_MASK & ((_x) << 24))
+#define MAC_MCR_MAX_RX_1518    0x0
+#define MAC_MCR_MAX_RX_1536    0x1
+#define MAC_MCR_MAX_RX_1552    0x2
+#define MAC_MCR_MAX_RX_2048    0x3
 #define MAC_MCR_IPG_CFG                (BIT(18) | BIT(16))
 #define MAC_MCR_FORCE_MODE     BIT(15)
 #define MAC_MCR_TX_EN          BIT(14)