projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: mask out reserved bits from the dma tx status in the ethernet driver
[openwrt.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
39a348a
..
77962fe
100644
(file)
--- a/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@
-38,7
+38,7
@@
#define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx"
#define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx"
-#define AG71XX_DRV_VERSION "0.5.2
3
"
+#define AG71XX_DRV_VERSION "0.5.2
5
"
#define AG71XX_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10)
#define AG71XX_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10)
@@
-103,14
+103,14
@@
struct ag71xx_ring {
};
struct ag71xx_mdio {
};
struct ag71xx_mdio {
- struct mii_bus *mii_bus;
- int mii_irq[PHY_MAX_ADDR];
- void __iomem *mdio_base;
+ struct mii_bus *mii_bus;
+ int mii_irq[PHY_MAX_ADDR];
+ void __iomem *mdio_base;
+ struct ag71xx_mdio_platform_data *pdata;
};
struct ag71xx {
void __iomem *mac_base;
};
struct ag71xx {
void __iomem *mac_base;
- void __iomem *mac_base2;
void __iomem *mii_ctrl;
spinlock_t lock;
void __iomem *mii_ctrl;
spinlock_t lock;
@@
-314,14
+314,12
@@
static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
- r = ag->mac_base + reg;
- __raw_writel(value, r);
- __raw_readl(r);
- break;
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
- r = ag->mac_base
2 + reg - AG71XX_REG_MAC_IFCTL
;
+ r = ag->mac_base
+ reg
;
__raw_writel(value, r);
__raw_writel(value, r);
- __raw_readl(r);
+
+ /* flush write */
+ (void) __raw_readl(r);
break;
default:
BUG();
break;
default:
BUG();
@@
-335,11
+333,8
@@
static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg)
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
- r = ag->mac_base + reg;
- ret = __raw_readl(r);
- break;
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
- r = ag->mac_base
2 + reg - AG71XX_REG_MAC_IFCTL
;
+ r = ag->mac_base
+ reg
;
ret = __raw_readl(r);
break;
default:
ret = __raw_readl(r);
break;
default:
@@
-355,14
+350,12
@@
static inline void ag71xx_sb(struct ag71xx *ag, unsigned reg, u32 mask)
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
switch (reg) {
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:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
- r = ag->mac_base
2 + reg - AG71XX_REG_MAC_IFCTL
;
+ r = ag->mac_base
+ reg
;
__raw_writel(__raw_readl(r) | mask, r);
__raw_writel(__raw_readl(r) | mask, r);
- __raw_readl(r);
+
+ /* flush write */
+ (void)__raw_readl(r);
break;
default:
BUG();
break;
default:
BUG();
@@
-375,14
+368,12
@@
static inline void ag71xx_cb(struct ag71xx *ag, unsigned reg, u32 mask)
switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
switch (reg) {
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:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
- r = ag->mac_base
2 + reg - AG71XX_REG_MAC_IFCTL
;
+ r = ag->mac_base
+ reg
;
__raw_writel(__raw_readl(r) & ~mask, r);
__raw_writel(__raw_readl(r) & ~mask, r);
- __raw_readl(r);
+
+ /* flush write */
+ (void) __raw_readl(r);
break;
default:
BUG();
break;
default:
BUG();
@@
-407,6
+398,8
@@
static inline void ag71xx_mii_ctrl_wr(struct ag71xx *ag, u32 value)
return;
__raw_writel(value, ag->mii_ctrl);
return;
__raw_writel(value, ag->mii_ctrl);
+
+ /* flush write */
__raw_readl(ag->mii_ctrl);
}
__raw_readl(ag->mii_ctrl);
}
This page took
0.026154 seconds
and
4
git commands to generate.