[PATCH v4 6/8] ath10k: introduce wmi ops

[Kalle Valo]

Michal Kazior <michal.kazior at tieto.com> writes:

> On 3 December 2014 at 09:10, Kalle Valo <kvalo at qca.qualcomm.com> wrote:
>
>> --- a/drivers/net/wireless/ath/ath10k/testmode.c
>> +++ b/drivers/net/wireless/ath/ath10k/testmode.c
>> @@ -187,13 +187,14 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[])
>>
>>         memcpy(ar->testmode.orig_fw_features, ar->fw_features,
>>                sizeof(ar->fw_features));
>> +       ar->testmode.orig_wmi_op_version = ar->wmi.op_version;
>>
>>         /* utf.bin firmware image does not advertise firmware features. Do
>>          * an ugly hack where we force the firmware features so that wmi.c
>>          * will use the correct WMI interface.
>>          */
>>         memset(ar->fw_features, 0, sizeof(ar->fw_features));
>> -       __set_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features);
>> +       ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1;
>>
>>         ret = ath10k_hif_power_up(ar);
>>         if (ret) {
>> @@ -224,6 +225,7 @@ err_fw_features:
>>         /* return the original firmware features */
>>         memcpy(ar->fw_features, ar->testmode.orig_fw_features,
>>                sizeof(ar->fw_features));
>> +       ar->wmi.op_version = ar->testmode.orig_wmi_op_version;
>>
>>         release_firmware(ar->testmode.utf);
>>         ar->testmode.utf = NULL;
>> @@ -250,6 +252,7 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar)
>>         /* return the original firmware features */
>>         memcpy(ar->fw_features, ar->testmode.orig_fw_features,
>>                sizeof(ar->fw_features));
>> +       ar->wmi.op_version = ar->testmode.orig_wmi_op_version;
>>
>>         release_firmware(ar->testmode.utf);
>>         ar->testmode.utf = NULL;
>
> Does testmode stuff really belong to this patchset? Shouldn't this be
> done in the one that introduces WMI OP version?

Actually the WMI code in wmi.c starts using ar->wmi.op_version only in
this patch. Before this patch ATH10K_FW_FEATURE_WMI_* flags are heavily
used in wmi.c. So that's why the change is made in this patch.

-- 
Kalle Valo