hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ar71xx: ag71xx: simplify register access functions

Browse Source 
SVN-Revision: 19949
master
Gabor Juhos 15 years ago
parent e157281c5d
commit 4a987d6008
1 changed files with 24 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 56
      target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h

56
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
Unescape 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 u32 ag71xx_rr(struct ag71xx *ag, unsigned reg) static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value)
{ {
void __iomem *r; ag71xx_check_reg_offset(ag, reg);
u32 ret;
switch (reg) { __raw_writel(value, ag->mac_base + reg);
case AG71XX_REG_MAC_CFG1 ... AG71XX_REG_MAC_MFL: /* flush write */
case AG71XX_REG_MAC_IFCTL ... AG71XX_REG_INT_STATUS: (void) __raw_readl(ag->mac_base + reg);
r = ag->mac_base + reg; }
ret = __raw_readl(r);
break;
default:
BUG();
}
return ret; static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg)
{
ag71xx_check_reg_offset(ag, reg);
return __raw_readl(ag->mac_base + reg);
} }
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; r = ag->mac_base + reg;
__raw_writel(__raw_readl(r) | mask, r); __raw_writel(__raw_readl(r) | mask, r);
/* flush write */ /* flush write */
(void)__raw_readl(r); (void)__raw_readl(r);
break;
default:
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; r = ag->mac_base + reg;
__raw_writel(__raw_readl(r) & ~mask, r); __raw_writel(__raw_readl(r) & ~mask, r);
/* flush write */ /* flush write */
(void) __raw_readl(r); (void) __raw_readl(r);
break;
default:
BUG();
}
} }
static inline void ag71xx_int_enable(struct ag71xx *ag, u32 ints) static inline void ag71xx_int_enable(struct ag71xx *ag, u32 ints)

Write Preview
Loading…
Cancel
Save