KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: ag71xx: simplify register access functions

Browse source 
SVN-Revision: 19949
This commit is contained in:
Gabor Juhos 2010-03-02 13:36:12 +00:00
parent e157281c5d
commit 4a987d6008
1 changed files with 24 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
View file

@ -38,7 +38,7 @@
#define ETH_FCS_LEN 4 #define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx" #define AG71XX_DRV_NAME "ag71xx"
#define AG71XX_DRV_VERSION "0.5.26" #define AG71XX_DRV_VERSION "0.5.27"
#define AG71XX_NAPI_WEIGHT 64 #define AG71XX_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10) #define AG71XX_OOM_REFILL (1 + HZ/10)
@ -343,76 +343,56 @@ static inline int ag71xx_desc_pktlen(struct ag71xx_desc *desc)
#define MII_CTRL_SPEED_100 1 #define MII_CTRL_SPEED_100 1
#define MII_CTRL_SPEED_1000 2 #define MII_CTRL_SPEED_1000 2
static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value) static inline void ag71xx_check_reg_offset(struct ag71xx *ag, unsigned reg)
{ {
void __iomem *r;
switch (reg) { switch (reg) {
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL: case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS: case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
r = ag->mac_base + reg;
__raw_writel(value, r);
/* flush write */
(void) __raw_readl(r);
break; break;
default: default:
BUG(); BUG();
} }
} }
static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
{
ag71xx_check_reg_offset(ag, reg);
__raw_writel(value, ag->mac_base + reg);
/* flush write */
(void) __raw_readl(ag->mac_base + reg);
}
static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg) static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg)
{ {
void __iomem *r; ag71xx_check_reg_offset(ag, reg);
u32 ret;
switch (reg) { return __raw_readl(ag->mac_base + reg);
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
r = ag->mac_base + reg;
ret = __raw_readl(r);
break;
default:
BUG();
}
return ret;
} }
static inline void ag71xx_sb(struct ag71xx *ag, unsigned reg, u32 mask) static inline void ag71xx_sb(struct ag71xx *ag, unsigned reg, u32 mask)
{ {
void __iomem *r; void __iomem *r;
switch (reg) { ag71xx_check_reg_offset(ag, reg);
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
r = ag->mac_base + reg;
__raw_writel(__raw_readl(r) | mask, r);
/* flush write */ r = ag->mac_base + reg;
(void)__raw_readl(r); __raw_writel(__raw_readl(r) | mask, r);
break; /* flush write */
default: (void)__raw_readl(r);
BUG();
}
} }
static inline void ag71xx_cb(struct ag71xx *ag, unsigned reg, u32 mask) static inline void ag71xx_cb(struct ag71xx *ag, unsigned reg, u32 mask)
{ {
void __iomem *r; void __iomem *r;
switch (reg) { ag71xx_check_reg_offset(ag, reg);
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL:
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS:
r = ag->mac_base + reg;
__raw_writel(__raw_readl(r) & ~mask, r);
/* flush write */ r = ag->mac_base + reg;
(void) __raw_readl(r); __raw_writel(__raw_readl(r) & ~mask, r);
break; /* flush write */
default: (void) __raw_readl(r);
BUG();
}
} }
static inline void ag71xx_int_enable(struct ag71xx *ag, u32 ints) static inline void ag71xx_int_enable(struct ag71xx *ag, u32 ints)