[PATCH] cfg80211: fix 6ghz starting frequency

[PATCH] cfg80211: fix 6ghz starting frequency

[Pradeep Kumar Chitrapu]

Fixes channel to frequency mappings per latest specification
IEEE P802.11ax/D6.1

Fixes: d1a1646c ("cfg80211: adapt to new channelization of the 6GHz band")
Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
---
 net/wireless/util.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 4d3b76f94f55..0eee55476d79 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -117,15 +117,18 @@ int ieee80211_freq_khz_to_channel(u32 freq)
 	/* see 802.11 17.3.8.3.2 and Annex J */
 	if (freq == 2484)
 		return 14;
+	/* see 802.11ax D6.1 27.3.23.2 and Annex E */
+	else if (freq == 5935)
+		return 2;
 	else if (freq < 2484)
 		return (freq - 2407) / 5;
 	else if (freq >= 4910 && freq <= 4980)
 		return (freq - 4000) / 5;
-	else if (freq < 5945)
+	else if (freq < 5950)
 		return (freq - 5000) / 5;
 	else if (freq <= 45000) /* DMG band lower limit */
-		/* see 802.11ax D4.1 27.3.22.2 */
-		return (freq - 5940) / 5;
+		/* see 802.11ax D6.1 27.3.23.2 */
+		return (freq - 5950) / 5;
 	else if (freq >= 58320 && freq <= 70200)
 		return (freq - 56160) / 2160;
 	else
-- 
1.9.1

Re: [PATCH] cfg80211: fix 6ghz starting frequency

[Pradeep Kumar Chitrapu]

On 2020-06-21 23:37, Pradeep Kumar Chitrapu wrote:
> Fixes channel to frequency mappings per latest specification
> IEEE P802.11ax/D6.1
> 
> Fixes: d1a1646c ("cfg80211: adapt to new channelization of the 6GHz 
> band")
> Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> ---
Please ignore this patch..
Just observed similar patch which is already in review
https://patchwork.kernel.org/patch/11615085/

Re: [PATCH] cfg80211: fix 6ghz starting frequency

[Johannes Berg]

On Mon, 2020-06-22 at 00:20 -0700, Pradeep Kumar Chitrapu wrote:
> On 2020-06-21 23:37, Pradeep Kumar Chitrapu wrote:
> > Fixes channel to frequency mappings per latest specification
> > IEEE P802.11ax/D6.1
> > 
> > Fixes: d1a1646c ("cfg80211: adapt to new channelization of the 6GHz 
> > band")
> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
> > ---
> Please ignore this patch..
> Just observed similar patch which is already in review
> https://patchwork.kernel.org/patch/11615085/

I also already merged

https://lore.kernel.org/r/edf07cdd-ad15-4012-3afd-d8b961a80b69@broadcom.com

If any further changes are needed, please base them on mac80211-next...

johannes

Re: [PATCH] cfg80211: fix 6ghz starting frequency

[asinghal]

[-- Attachment #1: Type: text/plain, Size: 1151 bytes --]

hi Johannes,
             We see you accepted the attached patch. But following small 
piece is still missing, that should be applied to
the mac80211 tree, in fn. ieee80211_channel_to_freq_khz:


case NL80211_BAND_6GHZ:
		/* see 802.11ax D6.1 27.3.23.2 */
		if (chan == 2)
			return MHZ_TO_KHZ(5935);
-		if (chan <= 253)
+ 		if (chan <= 233)
			return MHZ_TO_KHZ(5950 + chan * 5);

rgds
Amar


On 2020-06-22 00:26, Johannes Berg wrote:
> On Mon, 2020-06-22 at 00:20 -0700, Pradeep Kumar Chitrapu wrote:
>> On 2020-06-21 23:37, Pradeep Kumar Chitrapu wrote:
>> > Fixes channel to frequency mappings per latest specification
>> > IEEE P802.11ax/D6.1
>> >
>> > Fixes: d1a1646c ("cfg80211: adapt to new channelization of the 6GHz
>> > band")
>> > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
>> > ---
>> Please ignore this patch..
>> Just observed similar patch which is already in review
>> https://patchwork.kernel.org/patch/11615085/
> 
> I also already merged
> 
> https://lore.kernel.org/r/edf07cdd-ad15-4012-3afd-d8b961a80b69@broadcom.com
> 
> If any further changes are needed, please base them on mac80211-next...
> 
> johannes

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-cfg80211-Adjust-6-GHz-frequency-to-channel-conversio.patch --]
[-- Type: text/x-diff; name=0001-cfg80211-Adjust-6-GHz-frequency-to-channel-conversio.patch, Size: 1384 bytes --]

From 2d9b55508556ccee6410310fb9ea2482fd3328eb Mon Sep 17 00:00:00 2001
From: Amar Singhal <asinghal@codeaurora.org>
Date: Fri, 19 Jun 2020 13:52:01 -0700
Subject: [PATCH] cfg80211: Adjust 6 GHz frequency to channel conversion

Adjust the 6 GHz frequency to channel conversion function,
the other way around was previously handled.

Signed-off-by: Amar Singhal <asinghal@codeaurora.org>
Link: https://lore.kernel.org/r/1592599921-10607-1-git-send-email-asinghal@codeaurora.org
[rewrite commit message, hard-code channel 2]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/util.c b/net/wireless/util.c
index dfad1c0..c62eb3d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -123,11 +123,13 @@ int ieee80211_freq_khz_to_channel(u32 freq)
 		return (freq - 2407) / 5;
 	else if (freq >= 4910 && freq <= 4980)
 		return (freq - 4000) / 5;
-	else if (freq < 5945)
+	else if (freq < 5925)
 		return (freq - 5000) / 5;
+	else if (freq == 5935)
+		return 2;
 	else if (freq <= 45000) /* DMG band lower limit */
-		/* see 802.11ax D4.1 27.3.22.2 */
-		return (freq - 5940) / 5;
+		/* see 802.11ax D6.1 27.3.22.2 */
+		return (freq - 5950) / 5;
 	else if (freq >= 58320 && freq <= 70200)
 		return (freq - 56160) / 2160;
 	else
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project