Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 278148
b: refs/heads/master
c: 1388226
h: refs/heads/master
v: v3
  • Loading branch information
Stanislaw Gruszka committed Nov 15, 2011
1 parent bc21bd2 commit 6a1e248
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 142b343f6eb4898289c402afb6237def8e252a3e
refs/heads/master: 138822698fc16bd4c5b509da28a9b08faac4367b
42 changes: 20 additions & 22 deletions trunk/drivers/net/wireless/iwlegacy/iwl-io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,12 @@ static inline int _il_grab_nic_access(struct il_priv *il)

return 0;
}
#define il_grab_nic_access(il) _il_grab_nic_access(il)

static inline void _il_release_nic_access(struct il_priv *il)
{
_il_clear_bit(il, CSR_GP_CNTRL,
CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
}
#define il_release_nic_access(il) _il_release_nic_access(il)

static inline u32 _il_read_direct32(struct il_priv *il, u32 reg)
{
Expand All @@ -157,9 +155,9 @@ static inline u32 il_read_direct32(struct il_priv *il, u32 reg)
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);
value = _il_read_direct32(il, reg);
il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
return value;

Expand All @@ -176,9 +174,9 @@ il_write_direct32(struct il_priv *il, u32 reg, u32 value)
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
if (!il_grab_nic_access(il)) {
if (!_il_grab_nic_access(il)) {
_il_write_direct32(il, reg, value);
il_release_nic_access(il);
_il_release_nic_access(il);
}
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}
Expand Down Expand Up @@ -222,9 +220,9 @@ static inline u32 il_read_prph(struct il_priv *il, u32 reg)
u32 val;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);
val = _il_read_prph(il, reg);
il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
return val;
}
Expand All @@ -244,9 +242,9 @@ il_write_prph(struct il_priv *il, u32 addr, u32 val)
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
if (!il_grab_nic_access(il)) {
if (!_il_grab_nic_access(il)) {
_il_write_prph(il, addr, val);
il_release_nic_access(il);
_il_release_nic_access(il);
}
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}
Expand All @@ -260,9 +258,9 @@ il_set_bits_prph(struct il_priv *il, u32 reg, u32 mask)
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);
_il_set_bits_prph(il, reg, mask);
il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}

Expand All @@ -276,9 +274,9 @@ static inline void il_set_bits_mask_prph(struct il_priv *il, u32 reg,
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);
_il_set_bits_mask_prph(il, reg, bits, mask);
il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}

Expand All @@ -289,10 +287,10 @@ static inline void il_clear_bits_prph(struct il_priv
u32 val;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);
val = _il_read_prph(il, reg);
_il_write_prph(il, reg, (val & ~mask));
il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}

Expand All @@ -302,13 +300,13 @@ static inline u32 il_read_targ_mem(struct il_priv *il, u32 addr)
u32 value;

spin_lock_irqsave(&il->reg_lock, reg_flags);
il_grab_nic_access(il);
_il_grab_nic_access(il);

_il_write_direct32(il, HBUS_TARG_MEM_RADDR, addr);
rmb();
value = _il_read_direct32(il, HBUS_TARG_MEM_RDAT);

il_release_nic_access(il);
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
return value;
}
Expand All @@ -319,11 +317,11 @@ il_write_targ_mem(struct il_priv *il, u32 addr, u32 val)
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
if (!il_grab_nic_access(il)) {
if (!_il_grab_nic_access(il)) {
_il_write_direct32(il, HBUS_TARG_MEM_WADDR, addr);
wmb();
_il_write_direct32(il, HBUS_TARG_MEM_WDAT, val);
il_release_nic_access(il);
_il_release_nic_access(il);
}
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}
Expand All @@ -335,14 +333,14 @@ il_write_targ_mem_buf(struct il_priv *il, u32 addr,
unsigned long reg_flags;

spin_lock_irqsave(&il->reg_lock, reg_flags);
if (!il_grab_nic_access(il)) {
if (!_il_grab_nic_access(il)) {
_il_write_direct32(il, HBUS_TARG_MEM_WADDR, addr);
wmb();
for (; 0 < len; len -= sizeof(u32), values++)
_il_write_direct32(il,
HBUS_TARG_MEM_WDAT, *values);

il_release_nic_access(il);
_il_release_nic_access(il);
}
spin_unlock_irqrestore(&il->reg_lock, reg_flags);
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@ static void il4965_perform_ct_kill_task(struct il_priv *il)
_il_rd(il, CSR_UCODE_DRV_GP1);

spin_lock_irqsave(&il->reg_lock, flags);
if (!il_grab_nic_access(il))
il_release_nic_access(il);
if (!_il_grab_nic_access(il))
_il_release_nic_access(il);
spin_unlock_irqrestore(&il->reg_lock, flags);
}

Expand Down

0 comments on commit 6a1e248

Please sign in to comment.