[v1] ath10k: fix band_center_freq handling for VHT160 in recent firmwares
diff mbox

Message ID 20180426094357.24358-1-s.gottschall@dd-wrt.com
State New
Headers show

Commit Message

Sebastian Gottschall April 26, 2018, 9:43 a.m. UTC
From: Sebastian Gottschall <s.gottschall@dd-wrt.com>

starting with firmware 10.4.3.4.x series QCA changed the handling of the channel property band_center_freq1 and band_center_freq2 in vht160 operation mode
likelly for backward compatiblity with vht80 only capable clients.
this patch adjusts the handling to get vht160 to work again with official qca firmwares newer than 3.3
consider that this patch will not work with older firmwares anymore. to avoid undefined behaviour this we disable vht160 capability for outdated firmwares
---
 drivers/net/wireless/ath/ath10k/mac.c |  7 -------
 drivers/net/wireless/ath/ath10k/wmi.c | 11 ++++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

Comments

Ben Greear April 26, 2018, 1:44 p.m. UTC | #1
On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>
> starting with firmware 10.4.3.4.x series QCA changed the handling of the channel property band_center_freq1 and band_center_freq2 in vht160 operation mode
> likelly for backward compatiblity with vht80 only capable clients.
> this patch adjusts the handling to get vht160 to work again with official qca firmwares newer than 3.3
> consider that this patch will not work with older firmwares anymore. to avoid undefined behaviour this we disable vht160 capability for outdated firmwares

We should be able to use a feature-flag or otherwise determine if the firmware needs the old or new
API and make the driver able to handle both.

Thanks,
Ben

> ---
>  drivers/net/wireless/ath/ath10k/mac.c |  7 -------
>  drivers/net/wireless/ath/ath10k/wmi.c | 11 ++++++++---
>  2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
> index 5be6386ede8f..d1239d40ac19 100644
> --- a/drivers/net/wireless/ath/ath10k/mac.c
> +++ b/drivers/net/wireless/ath/ath10k/mac.c
> @@ -4449,13 +4449,6 @@ static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)
>  		vht_cap.cap |= val;
>  	}
>
> -	/* Currently the firmware seems to be buggy, don't enable 80+80
> -	 * mode until that's resolved.
> -	 */
> -	if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) &&
> -	    (ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) == 0)
> -		vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
> -
>  	mcs_map = 0;
>  	for (i = 0; i < 8; i++) {
>  		if ((i < ar->num_rf_chains) && (ar->cfg_tx_chainmask & BIT(i)))
> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
> index 2c36256a441d..d78b8857a513 100644
> --- a/drivers/net/wireless/ath/ath10k/wmi.c
> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
> @@ -1671,13 +1671,18 @@ void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
>  		flags |= WMI_CHAN_FLAG_HT40_PLUS;
>  	if (arg->chan_radar)
>  		flags |= WMI_CHAN_FLAG_DFS;
> -
> +	ch->band_center_freq2 = 0;
>  	ch->mhz = __cpu_to_le32(arg->freq);
>  	ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1);
>  	if (arg->mode == MODE_11AC_VHT80_80)
>  		ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq2);
> -	else
> -		ch->band_center_freq2 = 0;
> +	if (arg->mode == MODE_11AC_VHT160)  {
> +		if (arg->freq < arg->band_center_freq1)
> +			ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 - 40);
> +		else
> +			ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 + 40);		
> +		ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq1);
> +	}
>  	ch->min_power = arg->min_power;
>  	ch->max_power = arg->max_power;
>  	ch->reg_power = arg->max_reg_power;
>
Sebastian Gottschall April 26, 2018, 3:12 p.m. UTC | #2
Am 26.04.2018 um 15:44 schrieb Ben Greear:
>
>
> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>
>> starting with firmware 10.4.3.4.x series QCA changed the handling of 
>> the channel property band_center_freq1 and band_center_freq2 in 
>> vht160 operation mode
>> likelly for backward compatiblity with vht80 only capable clients.
>> this patch adjusts the handling to get vht160 to work again with 
>> official qca firmwares newer than 3.3
>> consider that this patch will not work with older firmwares anymore. 
>> to avoid undefined behaviour this we disable vht160 capability for 
>> outdated firmwares
>
> We should be able to use a feature-flag or otherwise determine if the 
> firmware needs the old or new
> API and make the driver able to handle both.
the new firmware must be used as is and it works. the old firmware can 
be detected on the missing vht cap flag.
but thats not my task. i can only use feature flags if they are included 
within the qca firmwares. but they arent
the old pre 3.3 firmwares should be treated as obsolete. they are more 
than 2 years old and do not announce vht160 capability
even if it works with some ignorance, but on the other side the it has 
backward incompatiblies with older vht80 only clients.
this is why the new way was introduced
>
> Thanks,
> Ben
>
>> ---
>>  drivers/net/wireless/ath/ath10k/mac.c |  7 -------
>>  drivers/net/wireless/ath/ath10k/wmi.c | 11 ++++++++---
>>  2 files changed, 8 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath10k/mac.c 
>> b/drivers/net/wireless/ath/ath10k/mac.c
>> index 5be6386ede8f..d1239d40ac19 100644
>> --- a/drivers/net/wireless/ath/ath10k/mac.c
>> +++ b/drivers/net/wireless/ath/ath10k/mac.c
>> @@ -4449,13 +4449,6 @@ static struct ieee80211_sta_vht_cap 
>> ath10k_create_vht_cap(struct ath10k *ar)
>>          vht_cap.cap |= val;
>>      }
>>
>> -    /* Currently the firmware seems to be buggy, don't enable 80+80
>> -     * mode until that's resolved.
>> -     */
>> -    if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) &&
>> -        (ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) 
>> == 0)
>> -        vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
>> -
>>      mcs_map = 0;
>>      for (i = 0; i < 8; i++) {
>>          if ((i < ar->num_rf_chains) && (ar->cfg_tx_chainmask & BIT(i)))
>> diff --git a/drivers/net/wireless/ath/ath10k/wmi.c 
>> b/drivers/net/wireless/ath/ath10k/wmi.c
>> index 2c36256a441d..d78b8857a513 100644
>> --- a/drivers/net/wireless/ath/ath10k/wmi.c
>> +++ b/drivers/net/wireless/ath/ath10k/wmi.c
>> @@ -1671,13 +1671,18 @@ void ath10k_wmi_put_wmi_channel(struct 
>> wmi_channel *ch,
>>          flags |= WMI_CHAN_FLAG_HT40_PLUS;
>>      if (arg->chan_radar)
>>          flags |= WMI_CHAN_FLAG_DFS;
>> -
>> +    ch->band_center_freq2 = 0;
>>      ch->mhz = __cpu_to_le32(arg->freq);
>>      ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1);
>>      if (arg->mode == MODE_11AC_VHT80_80)
>>          ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq2);
>> -    else
>> -        ch->band_center_freq2 = 0;
>> +    if (arg->mode == MODE_11AC_VHT160)  {
>> +        if (arg->freq < arg->band_center_freq1)
>> +            ch->band_center_freq1 = 
>> __cpu_to_le32(arg->band_center_freq1 - 40);
>> +        else
>> +            ch->band_center_freq1 = 
>> __cpu_to_le32(arg->band_center_freq1 + 40);
>> +        ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq1);
>> +    }
>>      ch->min_power = arg->min_power;
>>      ch->max_power = arg->max_power;
>>      ch->reg_power = arg->max_reg_power;
>>
>
Kalle Valo May 25, 2018, 2:44 p.m. UTC | #3
Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:

> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>
>>
>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>
>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>> of the channel property band_center_freq1 and band_center_freq2 in
>>> vht160 operation mode
>>> likelly for backward compatiblity with vht80 only capable clients.
>>> this patch adjusts the handling to get vht160 to work again with
>>> official qca firmwares newer than 3.3
>>> consider that this patch will not work with older firmwares
>>> anymore. to avoid undefined behaviour this we disable vht160
>>> capability for outdated firmwares
>>
>> We should be able to use a feature-flag or otherwise determine if
>> the firmware needs the old or new
>> API and make the driver able to handle both.
>
> the new firmware must be used as is and it works. the old firmware can
> be detected on the missing vht cap flag.
> but thats not my task. i can only use feature flags if they are
> included within the qca firmwares. but they arent
> the old pre 3.3 firmwares should be treated as obsolete. they are more
> than 2 years old and do not announce vht160 capability
> even if it works with some ignorance, but on the other side the it has
> backward incompatiblies with older vht80 only clients.
> this is why the new way was introduced

I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT flag.
Can someone test and verify that?
Ben Greear May 25, 2018, 2:52 p.m. UTC | #4
On 05/25/2018 07:44 AM, Kalle Valo wrote:
> Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:
>
>> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>>
>>>
>>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>>
>>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>>> of the channel property band_center_freq1 and band_center_freq2 in
>>>> vht160 operation mode
>>>> likelly for backward compatiblity with vht80 only capable clients.
>>>> this patch adjusts the handling to get vht160 to work again with
>>>> official qca firmwares newer than 3.3
>>>> consider that this patch will not work with older firmwares
>>>> anymore. to avoid undefined behaviour this we disable vht160
>>>> capability for outdated firmwares
>>>
>>> We should be able to use a feature-flag or otherwise determine if
>>> the firmware needs the old or new
>>> API and make the driver able to handle both.
>>
>> the new firmware must be used as is and it works. the old firmware can
>> be detected on the missing vht cap flag.
>> but thats not my task. i can only use feature flags if they are
>> included within the qca firmwares. but they arent
>> the old pre 3.3 firmwares should be treated as obsolete. they are more
>> than 2 years old and do not announce vht160 capability
>> even if it works with some ignorance, but on the other side the it has
>> backward incompatiblies with older vht80 only clients.
>> this is why the new way was introduced
>
> I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT flag.
> Can someone test and verify that?
>

I do see that my firmware source based on older upstream QCA FW does not advertise
that flag, and newer QCA firmware does, so it would appear that test might
work.

Thanks,
Ben
Sebastian Gottschall May 27, 2018, 10:25 p.m. UTC | #5
Am 25.05.2018 um 16:52 schrieb Ben Greear:
> On 05/25/2018 07:44 AM, Kalle Valo wrote:
>> Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:
>>
>>> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>>>
>>>>
>>>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>>>
>>>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>>>> of the channel property band_center_freq1 and band_center_freq2 in
>>>>> vht160 operation mode
>>>>> likelly for backward compatiblity with vht80 only capable clients.
>>>>> this patch adjusts the handling to get vht160 to work again with
>>>>> official qca firmwares newer than 3.3
>>>>> consider that this patch will not work with older firmwares
>>>>> anymore. to avoid undefined behaviour this we disable vht160
>>>>> capability for outdated firmwares
>>>>
>>>> We should be able to use a feature-flag or otherwise determine if
>>>> the firmware needs the old or new
>>>> API and make the driver able to handle both.
>>>
>>> the new firmware must be used as is and it works. the old firmware can
>>> be detected on the missing vht cap flag.
>>> but thats not my task. i can only use feature flags if they are
>>> included within the qca firmwares. but they arent
>>> the old pre 3.3 firmwares should be treated as obsolete. they are more
>>> than 2 years old and do not announce vht160 capability
>>> even if it works with some ignorance, but on the other side the it has
>>> backward incompatiblies with older vht80 only clients.
>>> this is why the new way was introduced
>>
>> I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT flag.
>> Can someone test and verify that?
>>
>
> I do see that my firmware source based on older upstream QCA FW does 
> not advertise
> that flag, and newer QCA firmware does, so it would appear that test 
> might
> work.
but your sourcebase is new enough that this new handling is required.  
if i remember correct this handling is required starting with 10.4-3.4 
source base
if a 3.4 original firmware is not providing that flag, it cannot be used 
for correct handling and yours is 3.4 based
>
> Thanks,
> Ben
>
Ben Greear May 28, 2018, 2:43 p.m. UTC | #6
On 05/27/2018 03:25 PM, Sebastian Gottschall wrote:
>
>
> Am 25.05.2018 um 16:52 schrieb Ben Greear:
>> On 05/25/2018 07:44 AM, Kalle Valo wrote:
>>> Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:
>>>
>>>> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>>>>
>>>>>
>>>>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>>>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>>>>
>>>>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>>>>> of the channel property band_center_freq1 and band_center_freq2 in
>>>>>> vht160 operation mode
>>>>>> likelly for backward compatiblity with vht80 only capable clients.
>>>>>> this patch adjusts the handling to get vht160 to work again with
>>>>>> official qca firmwares newer than 3.3
>>>>>> consider that this patch will not work with older firmwares
>>>>>> anymore. to avoid undefined behaviour this we disable vht160
>>>>>> capability for outdated firmwares
>>>>>
>>>>> We should be able to use a feature-flag or otherwise determine if
>>>>> the firmware needs the old or new
>>>>> API and make the driver able to handle both.
>>>>
>>>> the new firmware must be used as is and it works. the old firmware can
>>>> be detected on the missing vht cap flag.
>>>> but thats not my task. i can only use feature flags if they are
>>>> included within the qca firmwares. but they arent
>>>> the old pre 3.3 firmwares should be treated as obsolete. they are more
>>>> than 2 years old and do not announce vht160 capability
>>>> even if it works with some ignorance, but on the other side the it has
>>>> backward incompatiblies with older vht80 only clients.
>>>> this is why the new way was introduced
>>>
>>> I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT flag.
>>> Can someone test and verify that?
>>>
>>
>> I do see that my firmware source based on older upstream QCA FW does not advertise
>> that flag, and newer QCA firmware does, so it would appear that test might
>> work.
> but your sourcebase is new enough that this new handling is required.  if i remember correct this handling is required starting with 10.4-3.4 source base
> if a 3.4 original firmware is not providing that flag, it cannot be used for correct handling and yours is 3.4 based

With my current driver and my current (older) firmware source, 160Mhz works fine.

I think my driver changes related to 160Mhz are upstream, so probably stock driver
works with my firmware at 160Mhz as well.

If you change the driver, then it will likely break older firmware.  So, just change
the driver behaviour if the WMI_SERVICE_EXTENDED_NSS_SUPPORT is enabled.

Thanks,
Ben
Sebastian Gottschall May 28, 2018, 5:54 p.m. UTC | #7
Am 28.05.2018 um 16:43 schrieb Ben Greear:
>
>
> On 05/27/2018 03:25 PM, Sebastian Gottschall wrote:
>>
>>
>> Am 25.05.2018 um 16:52 schrieb Ben Greear:
>>> On 05/25/2018 07:44 AM, Kalle Valo wrote:
>>>> Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:
>>>>
>>>>> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>>>>>
>>>>>>
>>>>>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>>>>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>>>>>
>>>>>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>>>>>> of the channel property band_center_freq1 and band_center_freq2 in
>>>>>>> vht160 operation mode
>>>>>>> likelly for backward compatiblity with vht80 only capable clients.
>>>>>>> this patch adjusts the handling to get vht160 to work again with
>>>>>>> official qca firmwares newer than 3.3
>>>>>>> consider that this patch will not work with older firmwares
>>>>>>> anymore. to avoid undefined behaviour this we disable vht160
>>>>>>> capability for outdated firmwares
>>>>>>
>>>>>> We should be able to use a feature-flag or otherwise determine if
>>>>>> the firmware needs the old or new
>>>>>> API and make the driver able to handle both.
>>>>>
>>>>> the new firmware must be used as is and it works. the old firmware 
>>>>> can
>>>>> be detected on the missing vht cap flag.
>>>>> but thats not my task. i can only use feature flags if they are
>>>>> included within the qca firmwares. but they arent
>>>>> the old pre 3.3 firmwares should be treated as obsolete. they are 
>>>>> more
>>>>> than 2 years old and do not announce vht160 capability
>>>>> even if it works with some ignorance, but on the other side the it 
>>>>> has
>>>>> backward incompatiblies with older vht80 only clients.
>>>>> this is why the new way was introduced
>>>>
>>>> I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT 
>>>> flag.
>>>> Can someone test and verify that?
>>>>
>>>
>>> I do see that my firmware source based on older upstream QCA FW does 
>>> not advertise
>>> that flag, and newer QCA firmware does, so it would appear that test 
>>> might
>>> work.
>> but your sourcebase is new enough that this new handling is 
>> required.  if i remember correct this handling is required starting 
>> with 10.4-3.4 source base
>> if a 3.4 original firmware is not providing that flag, it cannot be 
>> used for correct handling and yours is 3.4 based
>
> With my current driver and my current (older) firmware source, 160Mhz 
> works fine.
>
> I think my driver changes related to 160Mhz are upstream, so probably 
> stock driver
> works with my firmware at 160Mhz as well.
>
> If you change the driver, then it will likely break older firmware.  
> So, just change
> the driver behaviour if the WMI_SERVICE_EXTENDED_NSS_SUPPORT is enabled.
only pre 3.4 which isnt important. but without my change everything from 
3.4 upwards wont work anymore. so my change fixes vht160 for firmwares 
released within the last 2 years.
WMI_SERVICE_EXTENDED_NSS_SUPPORT condition cannot work since you 
explained that your driver base which is 3.4 doesnt provide this flag 
but 3.4 stock does require this change
>
> Thanks,
> Ben
>
Ben Greear May 28, 2018, 9:08 p.m. UTC | #8
On 05/28/2018 10:54 AM, Sebastian Gottschall wrote:
>
>
> Am 28.05.2018 um 16:43 schrieb Ben Greear:
>>
>>
>> On 05/27/2018 03:25 PM, Sebastian Gottschall wrote:
>>>
>>>
>>> Am 25.05.2018 um 16:52 schrieb Ben Greear:
>>>> On 05/25/2018 07:44 AM, Kalle Valo wrote:
>>>>> Sebastian Gottschall <s.gottschall@dd-wrt.com> writes:
>>>>>
>>>>>> Am 26.04.2018 um 15:44 schrieb Ben Greear:
>>>>>>>
>>>>>>>
>>>>>>> On 04/26/2018 02:43 AM, s.gottschall@dd-wrt.com wrote:
>>>>>>>> From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
>>>>>>>>
>>>>>>>> starting with firmware 10.4.3.4.x series QCA changed the handling
>>>>>>>> of the channel property band_center_freq1 and band_center_freq2 in
>>>>>>>> vht160 operation mode
>>>>>>>> likelly for backward compatiblity with vht80 only capable clients.
>>>>>>>> this patch adjusts the handling to get vht160 to work again with
>>>>>>>> official qca firmwares newer than 3.3
>>>>>>>> consider that this patch will not work with older firmwares
>>>>>>>> anymore. to avoid undefined behaviour this we disable vht160
>>>>>>>> capability for outdated firmwares
>>>>>>>
>>>>>>> We should be able to use a feature-flag or otherwise determine if
>>>>>>> the firmware needs the old or new
>>>>>>> API and make the driver able to handle both.
>>>>>>
>>>>>> the new firmware must be used as is and it works. the old firmware can
>>>>>> be detected on the missing vht cap flag.
>>>>>> but thats not my task. i can only use feature flags if they are
>>>>>> included within the qca firmwares. but they arent
>>>>>> the old pre 3.3 firmwares should be treated as obsolete. they are more
>>>>>> than 2 years old and do not announce vht160 capability
>>>>>> even if it works with some ignorance, but on the other side the it has
>>>>>> backward incompatiblies with older vht80 only clients.
>>>>>> this is why the new way was introduced
>>>>>
>>>>> I was told ath10k could check for WMI_SERVICE_EXTENDED_NSS_SUPPORT flag.
>>>>> Can someone test and verify that?
>>>>>
>>>>
>>>> I do see that my firmware source based on older upstream QCA FW does not advertise
>>>> that flag, and newer QCA firmware does, so it would appear that test might
>>>> work.
>>> but your sourcebase is new enough that this new handling is required.  if i remember correct this handling is required starting with 10.4-3.4 source base
>>> if a 3.4 original firmware is not providing that flag, it cannot be used for correct handling and yours is 3.4 based
>>
>> With my current driver and my current (older) firmware source, 160Mhz works fine.
>>
>> I think my driver changes related to 160Mhz are upstream, so probably stock driver
>> works with my firmware at 160Mhz as well.
>>
>> If you change the driver, then it will likely break older firmware.  So, just change
>> the driver behaviour if the WMI_SERVICE_EXTENDED_NSS_SUPPORT is enabled.
> only pre 3.4 which isnt important. but without my change everything from 3.4 upwards wont work anymore. so my change fixes vht160 for firmwares released within the last 2 years.
> WMI_SERVICE_EXTENDED_NSS_SUPPORT condition cannot work since you explained that your driver base which is 3.4 doesnt provide this flag but 3.4 stock does require this change

I'll let you and Kalle work this out then.  I can fix my driver to work whatever
you do, and if I can ever get patches upstream, then I'll deal with it then.

Thanks,
Ben

Patch
diff mbox

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 5be6386ede8f..d1239d40ac19 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4449,13 +4449,6 @@  static struct ieee80211_sta_vht_cap ath10k_create_vht_cap(struct ath10k *ar)
 		vht_cap.cap |= val;
 	}
 
-	/* Currently the firmware seems to be buggy, don't enable 80+80
-	 * mode until that's resolved.
-	 */
-	if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) &&
-	    (ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) == 0)
-		vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
-
 	mcs_map = 0;
 	for (i = 0; i < 8; i++) {
 		if ((i < ar->num_rf_chains) && (ar->cfg_tx_chainmask & BIT(i)))
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 2c36256a441d..d78b8857a513 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1671,13 +1671,18 @@  void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch,
 		flags |= WMI_CHAN_FLAG_HT40_PLUS;
 	if (arg->chan_radar)
 		flags |= WMI_CHAN_FLAG_DFS;
-
+	ch->band_center_freq2 = 0;
 	ch->mhz = __cpu_to_le32(arg->freq);
 	ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1);
 	if (arg->mode == MODE_11AC_VHT80_80)
 		ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq2);
-	else
-		ch->band_center_freq2 = 0;
+	if (arg->mode == MODE_11AC_VHT160)  {
+		if (arg->freq < arg->band_center_freq1)
+			ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 - 40);
+		else
+			ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 + 40);		
+		ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq1);
+	}
 	ch->min_power = arg->min_power;
 	ch->max_power = arg->max_power;
 	ch->reg_power = arg->max_reg_power;