openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: add IO function for continuous write of target memory 

Add new IO function _iwl_write_targ_mem_words() to support
target memory write for a continuous area. It will return
error code -EBUSY if iwl_grab_nic_access() fails to indicate
the memory write does not be performed. Meanwhile the existing
function iwl_write_targ_mem() also been updated by using
_iwl_write_targ_mem_words() in a single word case.

Signed-off-by: Kenny Hsu <kenny.hsu@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Hsu, Kenny 2011-12-09 03:11:18 -08:00 committed by Wey-Yi Guy
parent 7a0b3b08df
commit ee8ba8800b
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/net/wireless/iwlwifi/iwl-io.c
View File

@ -283,16 +283,29 @@ u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr)
return value; return value;
} }
void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val) int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,
void *buf, int words)
{ {
unsigned long flags; unsigned long flags;
int offs, result = 0;
u32 *vals = buf;
spin_lock_irqsave(&bus->reg_lock, flags); spin_lock_irqsave(&bus->reg_lock, flags);
if (!iwl_grab_nic_access(bus)) { if (!iwl_grab_nic_access(bus)) {
iwl_write32(bus, HBUS_TARG_MEM_WADDR, addr); iwl_write32(bus, HBUS_TARG_MEM_WADDR, addr);
wmb(); wmb();
iwl_write32(bus, HBUS_TARG_MEM_WDAT, val);
for (offs = 0; offs < words; offs++)
iwl_write32(bus, HBUS_TARG_MEM_WDAT, vals[offs]);
iwl_release_nic_access(bus); iwl_release_nic_access(bus);
} } else
result = -EBUSY;
spin_unlock_irqrestore(&bus->reg_lock, flags); spin_unlock_irqrestore(&bus->reg_lock, flags);
return result;
}
int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val)
{
return _iwl_write_targ_mem_words(bus, addr, &val, 1);
} }

5
drivers/net/wireless/iwlwifi/iwl-io.h
View File

@ -85,6 +85,9 @@ void _iwl_read_targ_mem_words(struct iwl_bus *bus, u32 addr,
(bufsize) / sizeof(u32));\ (bufsize) / sizeof(u32));\
} while (0) } while (0)
int _iwl_write_targ_mem_words(struct iwl_bus *bus, u32 addr,
void *buf, int words);
u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr); u32 iwl_read_targ_mem(struct iwl_bus *bus, u32 addr);
void iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val); int iwl_write_targ_mem(struct iwl_bus *bus, u32 addr, u32 val);
#endif #endif