diff options
author | Oleksij Rempel <linux@rempel-privat.de> | 2015-03-22 14:29:51 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-03-30 04:31:29 -0400 |
commit | a57cb45a0a051601e14f81436b62750cc4f478c3 (patch) | |
tree | 4e24818d82bc299f92c0b023cf6eff1b9e618ad4 /drivers/net/wireless | |
parent | d55ce0a6f98305c75c4581d7a19be622bb95179a (diff) |
ath9k: add new function ath9k_hw_read_array
REG_READ generate most overhead on usb bus. It send and read micro packages
and reduce usb bandwidth. To reduce this overhead we should read in batches.
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.c | 30 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 3 |
2 files changed, 33 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index cc8bea8a957f..6d5b4bc8ab48 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
@@ -121,6 +121,36 @@ void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array, | |||
121 | REGWRITE_BUFFER_FLUSH(ah); | 121 | REGWRITE_BUFFER_FLUSH(ah); |
122 | } | 122 | } |
123 | 123 | ||
124 | void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size) | ||
125 | { | ||
126 | u32 *tmp_reg_list, *tmp_data; | ||
127 | int i; | ||
128 | |||
129 | tmp_reg_list = kmalloc(size * sizeof(u32), GFP_KERNEL); | ||
130 | if (!tmp_reg_list) { | ||
131 | dev_err(ah->dev, "%s: tmp_reg_list: alloc filed\n", __func__); | ||
132 | return; | ||
133 | } | ||
134 | |||
135 | tmp_data = kmalloc(size * sizeof(u32), GFP_KERNEL); | ||
136 | if (!tmp_data) { | ||
137 | dev_err(ah->dev, "%s tmp_data: alloc filed\n", __func__); | ||
138 | goto error_tmp_data; | ||
139 | } | ||
140 | |||
141 | for (i = 0; i < size; i++) | ||
142 | tmp_reg_list[i] = array[i][0]; | ||
143 | |||
144 | REG_READ_MULTI(ah, tmp_reg_list, tmp_data, size); | ||
145 | |||
146 | for (i = 0; i < size; i++) | ||
147 | array[i][1] = tmp_data[i]; | ||
148 | |||
149 | kfree(tmp_data); | ||
150 | error_tmp_data: | ||
151 | kfree(tmp_reg_list); | ||
152 | } | ||
153 | |||
124 | u32 ath9k_hw_reverse_bits(u32 val, u32 n) | 154 | u32 ath9k_hw_reverse_bits(u32 val, u32 n) |
125 | { | 155 | { |
126 | u32 retval; | 156 | u32 retval; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index 7b51d8e3696f..92fab1a54697 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -138,6 +138,8 @@ | |||
138 | 138 | ||
139 | #define REG_WRITE_ARRAY(iniarray, column, regWr) \ | 139 | #define REG_WRITE_ARRAY(iniarray, column, regWr) \ |
140 | ath9k_hw_write_array(ah, iniarray, column, &(regWr)) | 140 | ath9k_hw_write_array(ah, iniarray, column, &(regWr)) |
141 | #define REG_READ_ARRAY(ah, array, size) \ | ||
142 | ath9k_hw_read_array(ah, array, size) | ||
141 | 143 | ||
142 | #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT 0 | 144 | #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT 0 |
143 | #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1 | 145 | #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1 |
@@ -1030,6 +1032,7 @@ void ath9k_hw_synth_delay(struct ath_hw *ah, struct ath9k_channel *chan, | |||
1030 | bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); | 1032 | bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout); |
1031 | void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array, | 1033 | void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array, |
1032 | int column, unsigned int *writecnt); | 1034 | int column, unsigned int *writecnt); |
1035 | void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size); | ||
1033 | u32 ath9k_hw_reverse_bits(u32 val, u32 n); | 1036 | u32 ath9k_hw_reverse_bits(u32 val, u32 n); |
1034 | u16 ath9k_hw_computetxtime(struct ath_hw *ah, | 1037 | u16 ath9k_hw_computetxtime(struct ath_hw *ah, |
1035 | u8 phy, int kbps, | 1038 | u8 phy, int kbps, |