| Message ID | 878ub0xiv1.fsf@kamboji.qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
On 07/01/2015 04:08 PM, Kalle Valo wrote: > Raja Mani <rmani@qti.qualcomm.com> writes: > >> New htt event table is added for 10.4 firmware. Following new htt >> events are available only 10.4. adding this to generic htt event >> table, >> HTT_T2H_MSG_TYPE_EN_STATS, >> HTT_T2H_MSG_TYPE_TX_FETCH_IND, >> HTT_T2H_MSG_TYPE_TX_FETCH_CONF, >> HTT_T2H_MSG_TYPE_TX_LOW_LATENCY_IND >> >> Signed-off-by: Raja Mani <rmani@qti.qualcomm.com> > > [...] > >> @@ -1146,6 +1147,8 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) >> ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; >> break; >> case ATH10K_FW_WMI_OP_VERSION_10_4: >> + ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_4; >> + break; >> case ATH10K_FW_WMI_OP_VERSION_UNSET: >> case ATH10K_FW_WMI_OP_VERSION_MAX: >> WARN_ON(1); > > So this switch block is only to support older firmware versions which do > not have ATH10K_FW_IE_HTT_OP_VERSION yet. 10.4 firmware will always have > it set so we don't need to have any backwards compatibility code for > 10.4. I changed this part with the diff below. Please review. > > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -1147,8 +1147,6 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) > ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; > break; > case ATH10K_FW_WMI_OP_VERSION_10_4: > - ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_4; > - break; > case ATH10K_FW_WMI_OP_VERSION_UNSET: > case ATH10K_FW_WMI_OP_VERSION_MAX: > WARN_ON(1); > As you suggested, we can ignore htt op version assignment here and use what comes in firmware IE. I am fine with this change. -- Raja -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1147,8 +1147,6 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_TLV; break; case ATH10K_FW_WMI_OP_VERSION_10_4: - ar->htt.op_version = ATH10K_FW_HTT_OP_VERSION_10_4; - break; case ATH10K_FW_WMI_OP_VERSION_UNSET: case ATH10K_FW_WMI_OP_VERSION_MAX: WARN_ON(1);