1 From: Alan Liu <alanliu@qca.qualcomm.com>
2 Date: Wed, 28 Oct 2015 21:38:32 +0200
3 Subject: [PATCH] ath10k: add FW API support to test mode
5 Add WMI-TLV and FW API support in ath10k testmode.
6 Ath10k can get right wmi command format from UTF image
7 to communicate UTF firmware.
9 Signed-off-by: Alan Liu <alanliu@qca.qualcomm.com>
10 Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
13 --- a/drivers/net/wireless/ath/ath10k/core.c
14 +++ b/drivers/net/wireless/ath/ath10k/core.c
15 @@ -569,8 +569,8 @@ static int ath10k_download_fw(struct ath
18 case ATH10K_FIRMWARE_MODE_UTF:
19 - data = ar->testmode.utf->data;
20 - data_len = ar->testmode.utf->size;
21 + data = ar->testmode.utf_firmware_data;
22 + data_len = ar->testmode.utf_firmware_len;
26 --- a/drivers/net/wireless/ath/ath10k/core.h
27 +++ b/drivers/net/wireless/ath/ath10k/core.h
28 @@ -817,9 +817,12 @@ struct ath10k {
30 /* protected by conf_mutex */
31 const struct firmware *utf;
32 + char utf_version[32];
33 + const void *utf_firmware_data;
34 + size_t utf_firmware_len;
35 DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT);
36 enum ath10k_fw_wmi_op_version orig_wmi_op_version;
38 + enum ath10k_fw_wmi_op_version op_version;
39 /* protected by data_lock */
42 --- a/drivers/net/wireless/ath/ath10k/hw.h
43 +++ b/drivers/net/wireless/ath/ath10k/hw.h
44 @@ -94,6 +94,7 @@ enum qca6174_chip_id_rev {
45 #define ATH10K_FW_API5_FILE "firmware-5.bin"
47 #define ATH10K_FW_UTF_FILE "utf.bin"
48 +#define ATH10K_FW_UTF_API2_FILE "utf-2.bin"
50 /* includes also the null byte */
51 #define ATH10K_FIRMWARE_MAGIC "QCA-ATH10K"
52 --- a/drivers/net/wireless/ath/ath10k/testmode.c
53 +++ b/drivers/net/wireless/ath/ath10k/testmode.c
54 @@ -139,11 +139,181 @@ static int ath10k_tm_cmd_get_version(str
55 return cfg80211_testmode_reply(skb);
58 -static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
59 +static int ath10k_tm_fetch_utf_firmware_api_2(struct ath10k *ar)
61 + size_t len, magic_len, ie_len;
62 + struct ath10k_fw_ie *hdr;
68 + snprintf(filename, sizeof(filename), "%s/%s",
69 + ar->hw_params.fw.dir, ATH10K_FW_UTF_API2_FILE);
71 + /* load utf firmware image */
72 + ret = request_firmware(&ar->testmode.utf, filename, ar->dev);
74 + ath10k_warn(ar, "failed to retrieve utf firmware '%s': %d\n",
79 + data = ar->testmode.utf->data;
80 + len = ar->testmode.utf->size;
82 + /* FIXME: call release_firmware() in error cases */
84 + /* magic also includes the null byte, check that as well */
85 + magic_len = strlen(ATH10K_FIRMWARE_MAGIC) + 1;
87 + if (len < magic_len) {
88 + ath10k_err(ar, "utf firmware file is too small to contain magic\n");
93 + if (memcmp(data, ATH10K_FIRMWARE_MAGIC, magic_len) != 0) {
94 + ath10k_err(ar, "invalid firmware magic\n");
99 + /* jump over the padding */
100 + magic_len = ALIGN(magic_len, 4);
105 + /* loop elements */
106 + while (len > sizeof(struct ath10k_fw_ie)) {
107 + hdr = (struct ath10k_fw_ie *)data;
109 + ie_id = le32_to_cpu(hdr->id);
110 + ie_len = le32_to_cpu(hdr->len);
112 + len -= sizeof(*hdr);
113 + data += sizeof(*hdr);
115 + if (len < ie_len) {
116 + ath10k_err(ar, "invalid length for FW IE %d (%zu < %zu)\n",
117 + ie_id, len, ie_len);
123 + case ATH10K_FW_IE_FW_VERSION:
124 + if (ie_len > sizeof(ar->testmode.utf_version) - 1)
127 + memcpy(ar->testmode.utf_version, data, ie_len);
128 + ar->testmode.utf_version[ie_len] = '\0';
130 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
131 + "testmode found fw utf version %s\n",
132 + ar->testmode.utf_version);
134 + case ATH10K_FW_IE_TIMESTAMP:
135 + /* ignore timestamp, but don't warn about it either */
137 + case ATH10K_FW_IE_FW_IMAGE:
138 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE,
139 + "testmode found fw image ie (%zd B)\n",
142 + ar->testmode.utf_firmware_data = data;
143 + ar->testmode.utf_firmware_len = ie_len;
145 + case ATH10K_FW_IE_WMI_OP_VERSION:
146 + if (ie_len != sizeof(u32))
148 + version = (__le32 *)data;
149 + ar->testmode.op_version = le32_to_cpup(version);
150 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode found fw ie wmi op version %d\n",
151 + ar->testmode.op_version);
154 + ath10k_warn(ar, "Unknown testmode FW IE: %u\n",
155 + le32_to_cpu(hdr->id));
158 + /* jump over the padding */
159 + ie_len = ALIGN(ie_len, 4);
165 + if (!ar->testmode.utf_firmware_data || !ar->testmode.utf_firmware_len) {
166 + ath10k_err(ar, "No ATH10K_FW_IE_FW_IMAGE found\n");
174 + release_firmware(ar->testmode.utf);
179 +static int ath10k_tm_fetch_utf_firmware_api_1(struct ath10k *ar)
184 + snprintf(filename, sizeof(filename), "%s/%s",
185 + ar->hw_params.fw.dir, ATH10K_FW_UTF_FILE);
187 + /* load utf firmware image */
188 + ret = request_firmware(&ar->testmode.utf, filename, ar->dev);
190 + ath10k_warn(ar, "failed to retrieve utf firmware '%s': %d\n",
195 + /* We didn't find FW UTF API 1 ("utf.bin") does not advertise
196 + * firmware features. Do an ugly hack where we force the firmware
197 + * features to match with 10.1 branch so that wmi.c will use the
198 + * correct WMI interface.
201 + ar->testmode.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
202 + ar->testmode.utf_firmware_data = ar->testmode.utf->data;
203 + ar->testmode.utf_firmware_len = ar->testmode.utf->size;
208 +static int ath10k_tm_fetch_firmware(struct ath10k *ar)
212 + ret = ath10k_tm_fetch_utf_firmware_api_2(ar);
214 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode using fw utf api 2");
218 + ret = ath10k_tm_fetch_utf_firmware_api_1(ar);
220 + ath10k_err(ar, "failed to fetch utf firmware binary: %d", ret);
224 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode using utf api 1");
229 +static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
234 ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode cmd utf start\n");
236 mutex_lock(&ar->conf_mutex);
237 @@ -165,36 +335,27 @@ static int ath10k_tm_cmd_utf_start(struc
241 - snprintf(filename, sizeof(filename), "%s/%s",
242 - ar->hw_params.fw.dir, ATH10K_FW_UTF_FILE);
244 - /* load utf firmware image */
245 - ret = request_firmware(&ar->testmode.utf, filename, ar->dev);
246 + ret = ath10k_tm_fetch_firmware(ar);
248 - ath10k_warn(ar, "failed to retrieve utf firmware '%s': %d\n",
250 + ath10k_err(ar, "failed to fetch UTF firmware: %d", ret);
254 spin_lock_bh(&ar->data_lock);
256 ar->testmode.utf_monitor = true;
258 spin_unlock_bh(&ar->data_lock);
260 BUILD_BUG_ON(sizeof(ar->fw_features) !=
261 sizeof(ar->testmode.orig_fw_features));
263 memcpy(ar->testmode.orig_fw_features, ar->fw_features,
264 sizeof(ar->fw_features));
265 ar->testmode.orig_wmi_op_version = ar->wmi.op_version;
267 - /* utf.bin firmware image does not advertise firmware features. Do
268 - * an ugly hack where we force the firmware features so that wmi.c
269 - * will use the correct WMI interface.
271 memset(ar->fw_features, 0, sizeof(ar->fw_features));
272 - ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
274 + ar->wmi.op_version = ar->testmode.op_version;
276 + ath10k_dbg(ar, ATH10K_DBG_TESTMODE, "testmode wmi version %d\n",
277 + ar->wmi.op_version);
279 ret = ath10k_hif_power_up(ar);
281 @@ -212,7 +373,12 @@ static int ath10k_tm_cmd_utf_start(struc
283 ar->state = ATH10K_STATE_UTF;
285 - ath10k_info(ar, "UTF firmware started\n");
286 + if (strlen(ar->testmode.utf_version) > 0)
287 + ver = ar->testmode.utf_version;
291 + ath10k_info(ar, "UTF firmware %s started\n", ver);
293 mutex_unlock(&ar->conf_mutex);
295 --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
296 +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
301 +#include "testmode.h"
305 @@ -419,6 +420,7 @@ static void ath10k_wmi_tlv_op_rx(struct
307 struct wmi_cmd_hdr *cmd_hdr;
308 enum wmi_tlv_event_id id;
311 cmd_hdr = (struct wmi_cmd_hdr *)skb->data;
312 id = MS(__le32_to_cpu(cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID);
313 @@ -428,6 +430,18 @@ static void ath10k_wmi_tlv_op_rx(struct
315 trace_ath10k_wmi_event(ar, id, skb->data, skb->len);
317 + consumed = ath10k_tm_event_wmi(ar, id, skb);
319 + /* Ready event must be handled normally also in UTF mode so that we
320 + * know the UTF firmware has booted, others we are just bypass WMI
321 + * events to testmode.
323 + if (consumed && id != WMI_TLV_READY_EVENTID) {
324 + ath10k_dbg(ar, ATH10K_DBG_WMI,
325 + "wmi tlv testmode consumed 0x%x\n", id);
330 case WMI_TLV_MGMT_RX_EVENTID:
331 ath10k_wmi_event_mgmt_rx(ar, skb);