[PATCH] ath10k: Fix CCK rate definitions.

[PATCH] ath10k: Fix CCK rate definitions.

[greearb]

From: Ben Greear <greearb@candelatech.com>

The old values did NOT match what is found in 10.1.467
firmware.  I figure it is likely it is wrong for the others
as well.

Signed-off-by: Ben Greear <greearb@candelatech.com>
---
 drivers/net/wireless/ath/ath10k/hw.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 4c5eee4..710ca32 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -202,13 +202,13 @@ enum ath10k_hw_rate_ofdm {
 };
 
 enum ath10k_hw_rate_cck {
-	ATH10K_HW_RATE_CCK_LP_11M = 0,
-	ATH10K_HW_RATE_CCK_LP_5_5M,
-	ATH10K_HW_RATE_CCK_LP_2M,
-	ATH10K_HW_RATE_CCK_LP_1M,
-	ATH10K_HW_RATE_CCK_SP_11M,
-	ATH10K_HW_RATE_CCK_SP_5_5M,
-	ATH10K_HW_RATE_CCK_SP_2M,
+	ATH10K_HW_RATE_CCK_LP_11M = 0x40,
+	ATH10K_HW_RATE_CCK_LP_5_5M = 0x41,
+	ATH10K_HW_RATE_CCK_LP_2M = 0x42,
+	ATH10K_HW_RATE_CCK_LP_1M = 0x43,
+	ATH10K_HW_RATE_CCK_SP_11M = ATH10K_HW_RATE_CCK_LP_11M | 0x4,
+	ATH10K_HW_RATE_CCK_SP_5_5M = ATH10K_HW_RATE_CCK_LP_5_5M | 0x4,
+	ATH10K_HW_RATE_CCK_SP_2M = ATH10K_HW_RATE_CCK_LP_2M | 0x4,
 };
 
 /* Target specific defines for MAIN firmware */
-- 
2.4.3

Re: [PATCH] ath10k: Fix CCK rate definitions.

[Michal Kazior]

On 16 September 2015 at 02:08,  <greearb@candelatech.com> wrote:
> From: Ben Greear <greearb@candelatech.com>
>
> The old values did NOT match what is found in 10.1.467
> firmware.  I figure it is likely it is wrong for the others
> as well.

Does this fix anything at all?


> Signed-off-by: Ben Greear <greearb@candelatech.com>
> ---
>  drivers/net/wireless/ath/ath10k/hw.h | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
> index 4c5eee4..710ca32 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.h
> +++ b/drivers/net/wireless/ath/ath10k/hw.h
> @@ -202,13 +202,13 @@ enum ath10k_hw_rate_ofdm {
>  };
>
>  enum ath10k_hw_rate_cck {
> -       ATH10K_HW_RATE_CCK_LP_11M = 0,
> -       ATH10K_HW_RATE_CCK_LP_5_5M,
> -       ATH10K_HW_RATE_CCK_LP_2M,
> -       ATH10K_HW_RATE_CCK_LP_1M,
> -       ATH10K_HW_RATE_CCK_SP_11M,
> -       ATH10K_HW_RATE_CCK_SP_5_5M,
> -       ATH10K_HW_RATE_CCK_SP_2M,
> +       ATH10K_HW_RATE_CCK_LP_11M = 0x40,
> +       ATH10K_HW_RATE_CCK_LP_5_5M = 0x41,
> +       ATH10K_HW_RATE_CCK_LP_2M = 0x42,
> +       ATH10K_HW_RATE_CCK_LP_1M = 0x43,
> +       ATH10K_HW_RATE_CCK_SP_11M = ATH10K_HW_RATE_CCK_LP_11M | 0x4,
> +       ATH10K_HW_RATE_CCK_SP_5_5M = ATH10K_HW_RATE_CCK_LP_5_5M | 0x4,
> +       ATH10K_HW_RATE_CCK_SP_2M = ATH10K_HW_RATE_CCK_LP_2M | 0x4,
>  };

This breaks Rx CCK rate decoding/reporting. See code associated with
ath10k_mac_hw_rate_to_idx().


Michał

Re: [PATCH] ath10k: Fix CCK rate definitions.

[Ben Greear]

On 09/21/2015 12:33 AM, Michal Kazior wrote:
> On 16 September 2015 at 02:08,  <greearb@candelatech.com> wrote:
>> From: Ben Greear <greearb@candelatech.com>
>>
>> The old values did NOT match what is found in 10.1.467
>> firmware.  I figure it is likely it is wrong for the others
>> as well.
>
> Does this fix anything at all?

I'm adding support to CT firmware to set arbitrary ratectrl
masks, and I'm using that enum for part of the implementation.

In the 4.0 kernel, the 'hw-value' for CCK rates is broken since the enum doesn't
match firmware.

I'll check what code is using that enum and see if it can be fixed.  Otherwise,
I can fix it with a new enum with the values I need.

Thanks,
Ben

-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com