Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 17:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ath9k_htc: Add multiple register read API

Browse Source 
This would decrease latency in reading bulk registers.

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith Manoharan 2011-01-04 13:17:18 +05:30 committed by John W. Linville
parent fcdc403c31
commit 09a525d338
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath.h
View File

@ -108,12 +108,14 @@ enum ath_cipher {
* struct ath_ops - Register read/write operations * struct ath_ops - Register read/write operations
* *
* @read: Register read * @read: Register read
* @multi_read: Multiple register read
* @write: Register write * @write: Register write
* @enable_write_buffer: Enable multiple register writes * @enable_write_buffer: Enable multiple register writes
* @write_flush: flush buffered register writes and disable buffering * @write_flush: flush buffered register writes and disable buffering
*/ */
struct ath_ops { struct ath_ops {
unsigned int (*read)(void *, u32 reg_offset); unsigned int (*read)(void *, u32 reg_offset);
void (*multi_read)(void *, u32 *addr, u32 *val, u16 count);
void (*write)(void *, u32 val, u32 reg_offset); void (*write)(void *, u32 val, u32 reg_offset);
void (*enable_write_buffer)(void *); void (*enable_write_buffer)(void *);
void (*write_flush) (void *); void (*write_flush) (void *);

29
drivers/net/wireless/ath/ath9k/htc_drv_init.c
View File

@ -297,6 +297,34 @@ static unsigned int ath9k_regread(void *hw_priv, u32 reg_offset)
return be32_to_cpu(val); return be32_to_cpu(val);
} }
static void ath9k_multi_regread(void *hw_priv, u32 *addr,
u32 *val, u16 count)
{
struct ath_hw *ah = (struct ath_hw *) hw_priv;
struct ath_common *common = ath9k_hw_common(ah);
struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
__be32 tmpaddr[8];
__be32 tmpval[8];
int i, ret;
for (i = 0; i < count; i++) {
tmpaddr[i] = cpu_to_be32(addr[i]);
}
ret = ath9k_wmi_cmd(priv->wmi, WMI_REG_READ_CMDID,
(u8 *)tmpaddr , sizeof(u32) * count,
(u8 *)tmpval, sizeof(u32) * count,
100);
if (unlikely(ret)) {
ath_dbg(common, ATH_DBG_WMI,
"Multiple REGISTER READ FAILED (count: %d)\n", count);
}
for (i = 0; i < count; i++) {
val[i] = be32_to_cpu(tmpval[i]);
}
}
static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset) static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)
{ {
struct ath_hw *ah = (struct ath_hw *) hw_priv; struct ath_hw *ah = (struct ath_hw *) hw_priv;
@ -407,6 +435,7 @@ static void ath9k_regwrite_flush(void *hw_priv)
static const struct ath_ops ath9k_common_ops = { static const struct ath_ops ath9k_common_ops = {
.read = ath9k_regread, .read = ath9k_regread,
.multi_read = ath9k_multi_regread,
.write = ath9k_regwrite, .write = ath9k_regwrite,
.enable_write_buffer = ath9k_enable_regwrite_buffer, .enable_write_buffer = ath9k_enable_regwrite_buffer,
.write_flush = ath9k_regwrite_flush, .write_flush = ath9k_regwrite_flush,

3
drivers/net/wireless/ath/ath9k/hw.h
View File

@ -70,6 +70,9 @@
#define REG_READ(_ah, _reg) \ #define REG_READ(_ah, _reg) \
ath9k_hw_common(_ah)->ops->read((_ah), (_reg)) ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
#define REG_READ_MULTI(_ah, _addr, _val, _cnt) \
ath9k_hw_common(_ah)->ops->multi_read((_ah), (_addr), (_val), (_cnt))
#define ENABLE_REGWRITE_BUFFER(_ah) \ #define ENABLE_REGWRITE_BUFFER(_ah) \
do { \ do { \
if (ath9k_hw_common(_ah)->ops->enable_write_buffer) \ if (ath9k_hw_common(_ah)->ops->enable_write_buffer) \