Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / stmicro / stmmac / dwxgmac2.h

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
index ef8a07c..64d13e5 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
@@ -73,6 +73,9 @@
 #define XGMAC_RXQ_CTRL0                        0x000000a0
 #define XGMAC_RXQEN(x)                 GENMASK((x) * 2 + 1, (x) * 2)
 #define XGMAC_RXQEN_SHIFT(x)           ((x) * 2)
+#define XGMAC_RXQ_CTRL1                        0x000000a4
+#define XGMAC_RQ                       GENMASK(7, 4)
+#define XGMAC_RQ_SHIFT                 4
 #define XGMAC_RXQ_CTRL2                        0x000000a8
 #define XGMAC_RXQ_CTRL3                        0x000000ac
 #define XGMAC_PSRQ(x)                  GENMASK((x) * 8 + 7, (x) * 8)
@@ -136,6 +139,10 @@
 #define XGMAC_HWFEAT_TXQCNT            GENMASK(9, 6)
 #define XGMAC_HWFEAT_RXQCNT            GENMASK(3, 0)
 #define XGMAC_HW_FEATURE3              0x00000128
+#define XGMAC_HWFEAT_FPESEL            BIT(26)
+#define XGMAC_HWFEAT_ESTWID            GENMASK(24, 23)
+#define XGMAC_HWFEAT_ESTDEP            GENMASK(22, 20)
+#define XGMAC_HWFEAT_ESTSEL            BIT(19)
 #define XGMAC_HWFEAT_ASP               GENMASK(15, 14)
 #define XGMAC_HWFEAT_DVLAN             BIT(13)
 #define XGMAC_HWFEAT_FRPES             GENMASK(12, 11)
@@ -148,6 +155,8 @@
 #define XGMAC_MDIO_ADDR                        0x00000200
 #define XGMAC_MDIO_DATA                        0x00000204
 #define XGMAC_MDIO_C22P                        0x00000220
+#define XGMAC_FPE_CTRL_STS             0x00000280
+#define XGMAC_EFPE                     BIT(0)
 #define XGMAC_ADDRx_HIGH(x)            (0x00000300 + (x) * 0x8)
 #define XGMAC_ADDR_MAX                 32
 #define XGMAC_AE                       BIT(31)
@@ -237,6 +246,22 @@
 #define XGMAC_TC_PRTY_MAP1             0x00001044
 #define XGMAC_PSTC(x)                  GENMASK((x) * 8 + 7, (x) * 8)
 #define XGMAC_PSTC_SHIFT(x)            ((x) * 8)
+#define XGMAC_MTL_EST_CONTROL          0x00001050
+#define XGMAC_PTOV                     GENMASK(31, 23)
+#define XGMAC_PTOV_SHIFT               23
+#define XGMAC_SSWL                     BIT(1)
+#define XGMAC_EEST                     BIT(0)
+#define XGMAC_MTL_EST_GCL_CONTROL      0x00001080
+#define XGMAC_BTR_LOW                  0x0
+#define XGMAC_BTR_HIGH                 0x1
+#define XGMAC_CTR_LOW                  0x2
+#define XGMAC_CTR_HIGH                 0x3
+#define XGMAC_TER                      0x4
+#define XGMAC_LLR                      0x5
+#define XGMAC_ADDR_SHIFT               8
+#define XGMAC_GCRR                     BIT(2)
+#define XGMAC_SRWO                     BIT(0)
+#define XGMAC_MTL_EST_GCL_DATA         0x00001084
 #define XGMAC_MTL_RXP_CONTROL_STATUS   0x000010a0
 #define XGMAC_RXPI                     BIT(31)
 #define XGMAC_NPE                      GENMASK(23, 16)
@@ -363,6 +388,8 @@
 #define XGMAC_TIE                      BIT(0)
 #define XGMAC_DMA_INT_DEFAULT_EN       (XGMAC_NIE | XGMAC_AIE | XGMAC_RBUE | \
                                        XGMAC_RIE | XGMAC_TIE)
+#define XGMAC_DMA_INT_DEFAULT_RX       (XGMAC_RBUE | XGMAC_RIE)
+#define XGMAC_DMA_INT_DEFAULT_TX       (XGMAC_TIE)
 #define XGMAC_DMA_CH_Rx_WATCHDOG(x)    (0x0000313c + (0x80 * (x)))
 #define XGMAC_RWT                      GENMASK(7, 0)
 #define XGMAC_DMA_CH_STATUS(x)         (0x00003160 + (0x80 * (x)))