1 files changed, 43 insertions, 7 deletions

diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h
index 335e288f5314..864e38042b2d 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -10,10 +10,15 @@
 #ifndef _MACB_H
 #define _MACB_H
 
+#define MACB_GREGS_NBR 16
+#define MACB_GREGS_VERSION 1
+
 /* MACB register offsets */
 #define MACB_NCR                                0x0000
 #define MACB_NCFGR                              0x0004
 #define MACB_NSR                                0x0008
+#define MACB_TAR                                0x000c /* AT91RM9200 only */
+#define MACB_TCR                                0x0010 /* AT91RM9200 only */
 #define MACB_TSR                                0x0014
 #define MACB_RBQP                               0x0018
 #define MACB_TBQP                               0x001c
@@ -133,6 +138,8 @@
 #define MACB_RTY_SIZE                           1
 #define MACB_PAE_OFFSET                         13
 #define MACB_PAE_SIZE                           1
+#define MACB_RM9200_RMII_OFFSET                 13 /* AT91RM9200 only */
+#define MACB_RM9200_RMII_SIZE                   1  /* AT91RM9200 only */
 #define MACB_RBOF_OFFSET                        14
 #define MACB_RBOF_SIZE                          2
 #define MACB_RLCE_OFFSET                        16
@@ -145,6 +152,8 @@
 #define MACB_IRXFCS_SIZE                        1
 
 /* GEM specific NCFGR bitfields. */
+#define GEM_GBE_OFFSET                          10
+#define GEM_GBE_SIZE                            1
 #define GEM_CLK_OFFSET                          18
 #define GEM_CLK_SIZE                            3
 #define GEM_DBW_OFFSET                          21
@@ -178,6 +187,8 @@
 #define MACB_TGO_SIZE                           1
 #define MACB_BEX_OFFSET                         4
 #define MACB_BEX_SIZE                           1
+#define MACB_RM9200_BNQ_OFFSET                  4 /* AT91RM9200 only */
+#define MACB_RM9200_BNQ_SIZE                    1 /* AT91RM9200 only */
 #define MACB_COMP_OFFSET                        5
 #define MACB_COMP_SIZE                          1
 #define MACB_UND_OFFSET                         6
@@ -246,6 +257,8 @@
 /* Bitfields in USRIO (AT91) */
 #define MACB_RMII_OFFSET                        0
 #define MACB_RMII_SIZE                          1
+#define GEM_RGMII_OFFSET                        0       /* GEM gigabit mode */
+#define GEM_RGMII_SIZE                          1
 #define MACB_CLKEN_OFFSET                       1
 #define MACB_CLKEN_SIZE                         1
 
@@ -352,7 +365,12 @@
                 __v; \
         })
 
-struct dma_desc {
+/**
+ * struct macb_dma_desc - Hardware DMA descriptor
+ * @addr: DMA address of data buffer
+ * @ctrl: Control and status bits
+ */
+struct macb_dma_desc {
         u32     addr;
         u32     ctrl;
 };
@@ -417,7 +435,12 @@ struct dma_desc {
 #define MACB_TX_USED_OFFSET                     31
 #define MACB_TX_USED_SIZE                       1
 
-struct ring_info {
+/**
+ * struct macb_tx_skb - data about an skb which is being transmitted
+ * @skb: skb currently being transmitted
+ * @mapping: DMA address of the skb's data buffer
+ */
+struct macb_tx_skb {
         struct sk_buff          *skb;
         dma_addr_t              mapping;
 };
@@ -502,12 +525,12 @@ struct macb {
         void __iomem            *regs;
 
         unsigned int            rx_tail;
-        struct dma_desc         *rx_ring;
+        struct macb_dma_desc    *rx_ring;
         void                    *rx_buffers;
 
         unsigned int            tx_head, tx_tail;
-        struct dma_desc         *tx_ring;
-        struct ring_info        *tx_skb;
+        struct macb_dma_desc    *tx_ring;
+        struct macb_tx_skb      *tx_skb;
 
         spinlock_t              lock;
         struct platform_device  *pdev;
@@ -515,6 +538,7 @@ struct macb {
         struct clk              *hclk;
         struct net_device       *dev;
         struct napi_struct      napi;
+        struct work_struct      tx_error_task;
         struct net_device_stats stats;
         union {
                 struct macb_stats       macb;
@@ -525,8 +549,6 @@ struct macb {
         dma_addr_t              tx_ring_dma;
         dma_addr_t              rx_buffers_dma;
 
-        unsigned int            rx_pending, tx_pending;
-
         struct mii_bus          *mii_bus;
         struct phy_device       *phy_dev;
         unsigned int            link;
@@ -534,8 +556,22 @@ struct macb {
         unsigned int            duplex;
 
         phy_interface_t         phy_interface;
+
+        /* AT91RM9200 transmit */
+        struct sk_buff *skb;                    /* holds skb until xmit interrupt completes */
+        dma_addr_t skb_physaddr;                /* phys addr from pci_map_single */
+        int skb_length;                         /* saved skb length for pci_unmap_single */
 };
 
+extern const struct ethtool_ops macb_ethtool_ops;
+
+int macb_mii_init(struct macb *bp);
+int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+struct net_device_stats *macb_get_stats(struct net_device *dev);
+void macb_set_rx_mode(struct net_device *dev);
+void macb_set_hwaddr(struct macb *bp);
+void macb_get_hwaddr(struct macb *bp);
+
 static inline bool macb_is_gem(struct macb *bp)
 {
         return MACB_BFEXT(IDNUM, macb_readl(bp, MID)) == 0x2;