[ar71xx] ag71xx driver: always flush register writes

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx.h

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 5d97fdf7e97dd7bb02e8d074c2e930285dac80c0..cddf3a0729c32eec5578a0b18737c90c6f62f705 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -37,7 +37,7 @@
 #define ETH_FCS_LEN    4
 
 #define AG71XX_DRV_NAME                "ag71xx"
-#define AG71XX_DRV_VERSION     "0.5.4"
+#define AG71XX_DRV_VERSION     "0.5.8"
 
 #define AG71XX_NAPI_TX         1
 
@@ -287,17 +287,17 @@ static inline int ag71xx_desc_pktlen(struct ag71xx_desc *desc)
 #define MII_IND_BUSY           BIT(0)
 #define MII_IND_INVALID                BIT(2)
 
-#define TX_CTRL_TXE            BIT(0)
+#define TX_CTRL_TXE            BIT(0)  /* Tx Enable */
 
-#define TX_STATUS_PS           BIT(0)
-#define TX_STATUS_UR           BIT(1)
-#define TX_STATUS_BE           BIT(3)
+#define TX_STATUS_PS           BIT(0)  /* Packet Sent */
+#define TX_STATUS_UR           BIT(1)  /* Tx Underrun */
+#define TX_STATUS_BE           BIT(3)  /* Bus Error */
 
-#define RX_CTRL_RXE            BIT(0)
+#define RX_CTRL_RXE            BIT(0)  /* Rx Enable */
 
-#define RX_STATUS_PR           BIT(0)
-#define RX_STATUS_OF           BIT(1)
-#define RX_STATUS_BE           BIT(3)
+#define RX_STATUS_PR           BIT(0)  /* Packet Received */
+#define RX_STATUS_OF           BIT(2)  /* Rx Overflow */
+#define RX_STATUS_BE           BIT(3)  /* Bus Error */
 
 #define MII_CTRL_IF_MASK       3
 #define MII_CTRL_SPEED_SHIFT   4
@@ -308,13 +308,18 @@ static inline int ag71xx_desc_pktlen(struct ag71xx_desc *desc)
 
 static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
 {
+       void __iomem *r;
+
        switch (reg) {
        case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
-               __raw_writel(value, ag->mac_base + reg);
+               r = ag->mac_base + reg;
+               __raw_writel(value, r);
+               __raw_readl(r);
                break;
        case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
-               reg -= AG71XX_REG_MAC_IFCTL;
-               __raw_writel(value, ag->mac_base2 + reg);
+               r = ag->mac_base2 + reg - AG71XX_REG_MAC_IFCTL;
+               __raw_writel(value, r);
+               __raw_readl(r);
                break;
        default:
                BUG();
@@ -323,15 +328,17 @@ static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
 
 static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg)
 {
+       void __iomem *r;
        u32 ret;
 
        switch (reg) {
        case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
-               ret = __raw_readl(ag->mac_base + reg);
+               r = ag->mac_base + reg;
+               ret = __raw_readl(r);
                break;
        case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
-               reg -= AG71XX_REG_MAC_IFCTL;
-               ret = __raw_readl(ag->mac_base2 + reg);
+               r = ag->mac_base2 + reg - AG71XX_REG_MAC_IFCTL;
+               ret = __raw_readl(r);
                break;
        default:
                BUG();
@@ -348,10 +355,12 @@ static inline void ag71xx_sb(struct ag71xx *ag, unsigned reg, u32 mask)
        case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
                r = ag->mac_base + reg;
                __raw_writel(__raw_readl(r) | mask, r);
+               __raw_readl(r);
                break;
        case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
                r = ag->mac_base2 + reg - AG71XX_REG_MAC_IFCTL;
                __raw_writel(__raw_readl(r) | mask, r);
+               __raw_readl(r);
                break;
        default:
                BUG();
@@ -366,10 +375,12 @@ static inline void ag71xx_cb(struct ag71xx *ag, unsigned reg, u32 mask)
        case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
                r = ag->mac_base + reg;
                __raw_writel(__raw_readl(r) & ~mask, r);
+               __raw_readl(r);
                break;
        case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
                r = ag->mac_base2 + reg - AG71XX_REG_MAC_IFCTL;
                __raw_writel(__raw_readl(r) & ~mask, r);
+               __raw_readl(r);
                break;
        default:
                BUG();
@@ -389,6 +400,7 @@ static inline void ag71xx_int_disable(struct ag71xx *ag, u32 ints)
 static inline void ag71xx_mii_ctrl_wr(struct ag71xx *ag, u32 value)
 {
        __raw_writel(value, ag->mii_ctrl);
+       __raw_readl(ag->mii_ctrl);
 }
 
 static inline u32 ag71xx_mii_ctrl_rr(struct ag71xx *ag)