[PATCH 1/5] ath10k: add 10.2.4 firmware support

Kalle Valo kvalo at qca.qualcomm.com
Mon Dec 15 23:49:09 PST 2014


Rajkumar Manoharan <rmanohar at qti.qualcomm.com> writes:

> 10.2.4 firmware uses bitmask in wmi_resource_config to configure
> 10.2 firmware features like airtime fairness and rx batch mode instead
> of maintaining separete bool entry. This allows new features that can be
> configure during init time without breaking backward compatibility.
>
> Signed-off-by: Rajkumar Manoharan <rmanohar at qti.qualcomm.com>

Few comments. I'll deal with these and send v2.

> --- a/drivers/net/wireless/ath/ath10k/core.h
> +++ b/drivers/net/wireless/ath/ath10k/core.h
> @@ -387,6 +387,11 @@ enum ath10k_fw_features {
>  	 */
>  	ATH10K_FW_FEATURE_WMI_10_2 = 4,
>  
> +	/* Firmware 10.2.4 supports bitmask in resource config to configure
> +	 * Airtime fairness and rx batch mode
> +	 */
> +	ATH10K_FW_FEATURE_WMI_10_2_4 = 5,

When we add new value to enum ath10k_fw_wmi_op_version this flag is not
needed.

>  	/* keep last */
>  	ATH10K_FW_FEATURE_COUNT,
>  };
> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
> index 809c252..892b6f0 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.h
> +++ b/drivers/net/wireless/ath/ath10k/hw.h
> @@ -72,6 +72,7 @@ enum ath10k_fw_wmi_op_version {
>  	ATH10K_FW_WMI_OP_VERSION_10_1 = 2,
>  	ATH10K_FW_WMI_OP_VERSION_10_2 = 3,
>  	ATH10K_FW_WMI_OP_VERSION_TLV = 4,
> +	ATH10K_FW_WMI_OP_VERSION_10_2_4 = 5,
>  
>  	/* keep last */
>  	ATH10K_FW_WMI_OP_VERSION_MAX,
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
> index fa486f6..c42382c 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -4748,6 +4748,7 @@ static const struct wmi_ops wmi_10_2_ops = {
>  int ath10k_wmi_attach(struct ath10k *ar)
>  {
>  	switch (ar->wmi.op_version) {
> +	case ATH10K_FW_WMI_OP_VERSION_10_2_4:
>  	case ATH10K_FW_WMI_OP_VERSION_10_2:
>  		ar->wmi.cmd = &wmi_10_2_cmd_map;
>  		ar->wmi.ops = &wmi_10_2_ops;

I think it's better to not share cmd_map/ops and instead create new ones
for 10_2_4.

-- 
Kalle Valo



More information about the ath10k mailing list