diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-09-08 10:55:32 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-09-12 11:21:36 -0400 |
commit | f0bbea9981780e767c90955f47615e6f7382746f (patch) | |
tree | cf125f93f9f7c6f2cac6fdd3c5d0bf59f07d5df8 /drivers/net/wireless/ath/ath10k/bmi.c | |
parent | 4ed998dcbfa971e4c33edca7b2b39ce693014ba8 (diff) |
ath10k: add BMI log level
Also clean BMI log messages and add few more.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/bmi.c')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/bmi.c | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c index 744da6d1c405..a1f099628850 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.c +++ b/drivers/net/wireless/ath/ath10k/bmi.c | |||
@@ -22,7 +22,8 @@ | |||
22 | 22 | ||
23 | void ath10k_bmi_start(struct ath10k *ar) | 23 | void ath10k_bmi_start(struct ath10k *ar) |
24 | { | 24 | { |
25 | ath10k_dbg(ATH10K_DBG_CORE, "BMI started\n"); | 25 | ath10k_dbg(ATH10K_DBG_BMI, "bmi start\n"); |
26 | |||
26 | ar->bmi.done_sent = false; | 27 | ar->bmi.done_sent = false; |
27 | } | 28 | } |
28 | 29 | ||
@@ -32,8 +33,10 @@ int ath10k_bmi_done(struct ath10k *ar) | |||
32 | u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.done); | 33 | u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.done); |
33 | int ret; | 34 | int ret; |
34 | 35 | ||
36 | ath10k_dbg(ATH10K_DBG_BMI, "bmi done\n"); | ||
37 | |||
35 | if (ar->bmi.done_sent) { | 38 | if (ar->bmi.done_sent) { |
36 | ath10k_dbg(ATH10K_DBG_CORE, "%s skipped\n", __func__); | 39 | ath10k_dbg(ATH10K_DBG_BMI, "bmi skipped\n"); |
37 | return 0; | 40 | return 0; |
38 | } | 41 | } |
39 | 42 | ||
@@ -46,7 +49,6 @@ int ath10k_bmi_done(struct ath10k *ar) | |||
46 | return ret; | 49 | return ret; |
47 | } | 50 | } |
48 | 51 | ||
49 | ath10k_dbg(ATH10K_DBG_CORE, "BMI done\n"); | ||
50 | return 0; | 52 | return 0; |
51 | } | 53 | } |
52 | 54 | ||
@@ -59,6 +61,8 @@ int ath10k_bmi_get_target_info(struct ath10k *ar, | |||
59 | u32 resplen = sizeof(resp.get_target_info); | 61 | u32 resplen = sizeof(resp.get_target_info); |
60 | int ret; | 62 | int ret; |
61 | 63 | ||
64 | ath10k_dbg(ATH10K_DBG_BMI, "bmi get target info\n"); | ||
65 | |||
62 | if (ar->bmi.done_sent) { | 66 | if (ar->bmi.done_sent) { |
63 | ath10k_warn("BMI Get Target Info Command disallowed\n"); | 67 | ath10k_warn("BMI Get Target Info Command disallowed\n"); |
64 | return -EBUSY; | 68 | return -EBUSY; |
@@ -80,6 +84,7 @@ int ath10k_bmi_get_target_info(struct ath10k *ar, | |||
80 | 84 | ||
81 | target_info->version = __le32_to_cpu(resp.get_target_info.version); | 85 | target_info->version = __le32_to_cpu(resp.get_target_info.version); |
82 | target_info->type = __le32_to_cpu(resp.get_target_info.type); | 86 | target_info->type = __le32_to_cpu(resp.get_target_info.type); |
87 | |||
83 | return 0; | 88 | return 0; |
84 | } | 89 | } |
85 | 90 | ||
@@ -92,15 +97,14 @@ int ath10k_bmi_read_memory(struct ath10k *ar, | |||
92 | u32 rxlen; | 97 | u32 rxlen; |
93 | int ret; | 98 | int ret; |
94 | 99 | ||
100 | ath10k_dbg(ATH10K_DBG_BMI, "bmi read address 0x%x length %d\n", | ||
101 | address, length); | ||
102 | |||
95 | if (ar->bmi.done_sent) { | 103 | if (ar->bmi.done_sent) { |
96 | ath10k_warn("command disallowed\n"); | 104 | ath10k_warn("command disallowed\n"); |
97 | return -EBUSY; | 105 | return -EBUSY; |
98 | } | 106 | } |
99 | 107 | ||
100 | ath10k_dbg(ATH10K_DBG_CORE, | ||
101 | "%s: (device: 0x%p, address: 0x%x, length: %d)\n", | ||
102 | __func__, ar, address, length); | ||
103 | |||
104 | while (length) { | 108 | while (length) { |
105 | rxlen = min_t(u32, length, BMI_MAX_DATA_SIZE); | 109 | rxlen = min_t(u32, length, BMI_MAX_DATA_SIZE); |
106 | 110 | ||
@@ -133,15 +137,14 @@ int ath10k_bmi_write_memory(struct ath10k *ar, | |||
133 | u32 txlen; | 137 | u32 txlen; |
134 | int ret; | 138 | int ret; |
135 | 139 | ||
140 | ath10k_dbg(ATH10K_DBG_BMI, "bmi write address 0x%x length %d\n", | ||
141 | address, length); | ||
142 | |||
136 | if (ar->bmi.done_sent) { | 143 | if (ar->bmi.done_sent) { |
137 | ath10k_warn("command disallowed\n"); | 144 | ath10k_warn("command disallowed\n"); |
138 | return -EBUSY; | 145 | return -EBUSY; |
139 | } | 146 | } |
140 | 147 | ||
141 | ath10k_dbg(ATH10K_DBG_CORE, | ||
142 | "%s: (device: 0x%p, address: 0x%x, length: %d)\n", | ||
143 | __func__, ar, address, length); | ||
144 | |||
145 | while (length) { | 148 | while (length) { |
146 | txlen = min(length, BMI_MAX_DATA_SIZE - hdrlen); | 149 | txlen = min(length, BMI_MAX_DATA_SIZE - hdrlen); |
147 | 150 | ||
@@ -180,15 +183,14 @@ int ath10k_bmi_execute(struct ath10k *ar, u32 address, u32 *param) | |||
180 | u32 resplen = sizeof(resp.execute); | 183 | u32 resplen = sizeof(resp.execute); |
181 | int ret; | 184 | int ret; |
182 | 185 | ||
186 | ath10k_dbg(ATH10K_DBG_BMI, "bmi execute address 0x%x param 0x%x\n", | ||
187 | address, *param); | ||
188 | |||
183 | if (ar->bmi.done_sent) { | 189 | if (ar->bmi.done_sent) { |
184 | ath10k_warn("command disallowed\n"); | 190 | ath10k_warn("command disallowed\n"); |
185 | return -EBUSY; | 191 | return -EBUSY; |
186 | } | 192 | } |
187 | 193 | ||
188 | ath10k_dbg(ATH10K_DBG_CORE, | ||
189 | "%s: (device: 0x%p, address: 0x%x, param: %d)\n", | ||
190 | __func__, ar, address, *param); | ||
191 | |||
192 | cmd.id = __cpu_to_le32(BMI_EXECUTE); | 194 | cmd.id = __cpu_to_le32(BMI_EXECUTE); |
193 | cmd.execute.addr = __cpu_to_le32(address); | 195 | cmd.execute.addr = __cpu_to_le32(address); |
194 | cmd.execute.param = __cpu_to_le32(*param); | 196 | cmd.execute.param = __cpu_to_le32(*param); |
@@ -216,6 +218,9 @@ int ath10k_bmi_lz_data(struct ath10k *ar, const void *buffer, u32 length) | |||
216 | u32 txlen; | 218 | u32 txlen; |
217 | int ret; | 219 | int ret; |
218 | 220 | ||
221 | ath10k_dbg(ATH10K_DBG_BMI, "bmi lz data buffer 0x%p length %d\n", | ||
222 | buffer, length); | ||
223 | |||
219 | if (ar->bmi.done_sent) { | 224 | if (ar->bmi.done_sent) { |
220 | ath10k_warn("command disallowed\n"); | 225 | ath10k_warn("command disallowed\n"); |
221 | return -EBUSY; | 226 | return -EBUSY; |
@@ -250,6 +255,9 @@ int ath10k_bmi_lz_stream_start(struct ath10k *ar, u32 address) | |||
250 | u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.lz_start); | 255 | u32 cmdlen = sizeof(cmd.id) + sizeof(cmd.lz_start); |
251 | int ret; | 256 | int ret; |
252 | 257 | ||
258 | ath10k_dbg(ATH10K_DBG_BMI, "bmi lz stream start address 0x%x\n", | ||
259 | address); | ||
260 | |||
253 | if (ar->bmi.done_sent) { | 261 | if (ar->bmi.done_sent) { |
254 | ath10k_warn("command disallowed\n"); | 262 | ath10k_warn("command disallowed\n"); |
255 | return -EBUSY; | 263 | return -EBUSY; |
@@ -275,6 +283,10 @@ int ath10k_bmi_fast_download(struct ath10k *ar, | |||
275 | u32 trailer_len = length - head_len; | 283 | u32 trailer_len = length - head_len; |
276 | int ret; | 284 | int ret; |
277 | 285 | ||
286 | ath10k_dbg(ATH10K_DBG_BMI, | ||
287 | "bmi fast download address 0x%x buffer 0x%p length %d\n", | ||
288 | address, buffer, length); | ||
289 | |||
278 | ret = ath10k_bmi_lz_stream_start(ar, address); | 290 | ret = ath10k_bmi_lz_stream_start(ar, address); |
279 | if (ret) | 291 | if (ret) |
280 | return ret; | 292 | return ret; |