2015-03-30 11:15:05

by Kalle Valo

Subject: [PATCH] ath10k: fix HTT op backwards compatibility for QCA6174

Commit 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION") broke QCA6174
receive side as the HTT ids from ATH10K_FW_HTT_OP_VERSION_MAIN don't have
HTT_TLV_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND set. Fix this by adding a backwards
compatibility code which sets HTT op version if it's not set by the firmare
image.

Fixes: 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION")
Reported-by: Michal Kazior <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>
---
drivers/net/wireless/ath/ath10k/core.c | 23 +++++++++++++++++++++++
drivers/net/wireless/ath/ath10k/htt.c | 2 +-
2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 1c74585d9256..47f7e7116448 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -998,6 +998,29 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar)
return -EINVAL;
}

+ /* Backwards compatibility for firmwares without
+ * ATH10K_FW_IE_HTT_OP_VERSION.
+ */
+ if (ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_UNSET) {
+ switch (ar->wmi.op_version) {
+ case ATH10K_FW_WMI_OP_VERSION_MAIN:
+ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_MAIN;
+ break;
+ case ATH10K_FW_WMI_OP_VERSION_10_1:
+ case ATH10K_FW_WMI_OP_VERSION_10_2:
+ case ATH10K_FW_WMI_OP_VERSION_10_2_4:
+ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_1;
+ break;
+ case ATH10K_FW_WMI_OP_VERSION_TLV:
+ ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV;
+ break;
+ case ATH10K_FW_WMI_OP_VERSION_UNSET:
+ case ATH10K_FW_WMI_OP_VERSION_MAX:
+ WARN_ON(1);
+ return -EINVAL;
+ }
+ }
+
return 0;
}

diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c
index f782d76c3886..6da6ef26143a 100644
--- a/drivers/net/wireless/ath/ath10k/htt.c
+++ b/drivers/net/wireless/ath/ath10k/htt.c
@@ -156,11 +156,11 @@ int ath10k_htt_init(struct ath10k *ar)
ar->htt.t2h_msg_types_max = HTT_TLV_T2H_NUM_MSGS;
break;
case ATH10K_FW_HTT_OP_VERSION_MAIN:
- case ATH10K_FW_HTT_OP_VERSION_UNSET:
ar->htt.t2h_msg_types = htt_main_t2h_msg_types;
ar->htt.t2h_msg_types_max = HTT_MAIN_T2H_NUM_MSGS;
break;
case ATH10K_FW_HTT_OP_VERSION_MAX:
+ case ATH10K_FW_HTT_OP_VERSION_UNSET:
WARN_ON(1);
return -EINVAL;
}

2015-03-30 11:46:44

by Kalle Valo

Subject: Re: [PATCH] ath10k: fix HTT op backwards compatibility for QCA6174

Michal Kazior <[email protected]> writes:

> On 30 March 2015 at 13:14, Kalle Valo <[email protected]> wrote:
>> Commit 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION") broke QCA6174
>> receive side as the HTT ids from ATH10K_FW_HTT_OP_VERSION_MAIN don't have
>> HTT_TLV_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND set. Fix this by adding a backwards
>> compatibility code which sets HTT op version if it's not set by the firmare
>
> s/firmare/firmware/

Fixed.

>> image.
>>
>> Fixes: 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION")
>> Reported-by: Michal Kazior <[email protected]>
>> Signed-off-by: Kalle Valo <[email protected]>
>
> Tested-by: Michal Kazior <[email protected]>

Thanks! And sorry for this.

--
Kalle Valo

2015-03-30 11:58:11

by Kalle Valo

Subject: Re: [PATCH] ath10k: fix HTT op backwards compatibility for QCA6174

Kalle Valo <[email protected]> writes:

> Commit 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION") broke QCA6174
> receive side as the HTT ids from ATH10K_FW_HTT_OP_VERSION_MAIN don't have
> HTT_TLV_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND set. Fix this by adding a backwards
> compatibility code which sets HTT op version if it's not set by the firmare
> image.
>
> Fixes: 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION")
> Reported-by: Michal Kazior <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Applied.

--
Kalle Valo

2015-03-30 11:25:58

by Michal Kazior

Subject: Re: [PATCH] ath10k: fix HTT op backwards compatibility for QCA6174

On 30 March 2015 at 13:14, Kalle Valo <[email protected]> wrote:
> Commit 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION") broke QCA6174
> receive side as the HTT ids from ATH10K_FW_HTT_OP_VERSION_MAIN don't have
> HTT_TLV_T2H_MSG_TYPE_RX_IN_ORD_PADDR_IND set. Fix this by adding a backwards
> compatibility code which sets HTT op version if it's not set by the firmare

s/firmare/firmware/


> image.
>
> Fixes: 8348db298496 ("ath10k: add ATH10K_FW_IE_HTT_OP_VERSION")
> Reported-by: Michal Kazior <[email protected]>
> Signed-off-by: Kalle Valo <[email protected]>

Tested-by: Michal Kazior <[email protected]>


Michał