[PATCH wireless-next 1/4] wifi: brcmfmac: Add support for 6 GHz chanspecs

From: Michael Reeves via B4 Relay

Date: Fri Nov 13 2026 - 03:45:06 EST


From: Daniel Berlin <dberlin@xxxxxxxxxxx>

Although the AC chanspec format defines a band value for 6 GHz, the
driver currently neither encodes nor decodes it.

Extend the chanspec encoder and decoder to support the 6 GHz band,
replacing the obsolete and unused 3 GHz definition. Populate the band
when converting cfg80211 channels to chanspecs.

Additionally, initialise channel structures prior to encoding in the P2P
path, as the encoder now requires a valid band field.

Tested-by: Yureka Lilian <yureka@xxxxxxxxxxxxxx>
Signed-off-by: Daniel Berlin <dberlin@xxxxxxxxxxx>
Co-developed-by: Michael Reeves <michael.reeves077@xxxxxxxxx>
Signed-off-by: Michael Reeves <michael.reeves077@xxxxxxxxx>
---
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 28 +++++++++++++---------
.../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 6 ++---
.../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 7 +++++-
.../broadcom/brcm80211/include/brcmu_d11.h | 3 ++-
4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index b0eaf96413b7..c4ef4f6d3a06 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -326,6 +326,21 @@ static u8 nl80211_band_to_fwil(enum nl80211_band band)
return 0;
}

+static u8 nl80211_band_to_chanspec_band(enum nl80211_band band)
+{
+ switch (band) {
+ case NL80211_BAND_2GHZ:
+ return BRCMU_CHAN_BAND_2G;
+ case NL80211_BAND_5GHZ:
+ return BRCMU_CHAN_BAND_5G;
+ case NL80211_BAND_6GHZ:
+ return BRCMU_CHAN_BAND_6G;
+ default:
+ WARN_ON_ONCE(1);
+ return BRCMU_CHAN_BAND_2G;
+ }
+}
+
static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
struct cfg80211_chan_def *ch)
{
@@ -385,17 +400,7 @@ static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
default:
WARN_ON_ONCE(1);
}
- switch (ch->chan->band) {
- case NL80211_BAND_2GHZ:
- ch_inf.band = BRCMU_CHAN_BAND_2G;
- break;
- case NL80211_BAND_5GHZ:
- ch_inf.band = BRCMU_CHAN_BAND_5G;
- break;
- case NL80211_BAND_60GHZ:
- default:
- WARN_ON_ONCE(1);
- }
+ ch_inf.band = nl80211_band_to_chanspec_band(ch->chan->band);
d11inf->encchspec(&ch_inf);

brcmf_dbg(TRACE, "chanspec: 0x%x\n", ch_inf.chspec);
@@ -409,6 +414,7 @@ u16 channel_to_chanspec(struct brcmu_d11inf *d11inf,

ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq);
ch_inf.bw = BRCMU_CHAN_BW_20;
+ ch_inf.band = nl80211_band_to_chanspec_band(ch->band);
d11inf->encchspec(&ch_inf);

return ch_inf.chspec;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
index 813cc15d8b87..06e0d90b194a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
@@ -958,7 +958,7 @@ brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
{
struct brcmf_pub *drvr = p2p->cfg->pub;
struct brcmf_cfg80211_vif *vif;
- struct brcmu_chan ch;
+ struct brcmu_chan ch = {};
s32 err = 0;

vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
@@ -1092,7 +1092,7 @@ static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
u32 channel_cnt;
u16 *default_chan_list;
u32 i;
- struct brcmu_chan ch;
+ struct brcmu_chan ch = {};

brcmf_dbg(TRACE, "Enter\n");

@@ -2031,7 +2031,7 @@ static void brcmf_p2p_get_current_chanspec(struct brcmf_p2p_info *p2p,
{
struct brcmf_if *ifp;
u8 mac_addr[ETH_ALEN];
- struct brcmu_chan ch;
+ struct brcmu_chan ch = {};
struct brcmf_bss_info_le *bi;
u8 *buf;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
index 1e2b1e487eb7..6cd43920fe67 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
@@ -87,7 +87,9 @@ static void brcmu_d11ac_encchspec(struct brcmu_chan *ch)
0, d11ac_bw(ch->bw));

ch->chspec &= ~BRCMU_CHSPEC_D11AC_BND_MASK;
- if (ch->chnum <= CH_MAX_2G_CHANNEL)
+ if (ch->band == BRCMU_CHAN_BAND_6G)
+ ch->chspec |= BRCMU_CHSPEC_D11AC_BND_6G;
+ else if (ch->chnum <= CH_MAX_2G_CHANNEL)
ch->chspec |= BRCMU_CHSPEC_D11AC_BND_2G;
else
ch->chspec |= BRCMU_CHSPEC_D11AC_BND_5G;
@@ -222,6 +224,9 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
}

switch (ch->chspec & BRCMU_CHSPEC_D11AC_BND_MASK) {
+ case BRCMU_CHSPEC_D11AC_BND_6G:
+ ch->band = BRCMU_CHAN_BAND_6G;
+ break;
case BRCMU_CHSPEC_D11AC_BND_5G:
ch->band = BRCMU_CHAN_BAND_5G;
break;
diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
index f6344023855c..aae75329e266 100644
--- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
@@ -81,12 +81,13 @@
#define BRCMU_CHSPEC_D11AC_BND_MASK 0xc000
#define BRCMU_CHSPEC_D11AC_BND_SHIFT 14
#define BRCMU_CHSPEC_D11AC_BND_2G 0x0000
-#define BRCMU_CHSPEC_D11AC_BND_3G 0x4000
+#define BRCMU_CHSPEC_D11AC_BND_6G 0x4000
#define BRCMU_CHSPEC_D11AC_BND_4G 0x8000
#define BRCMU_CHSPEC_D11AC_BND_5G 0xc000

#define BRCMU_CHAN_BAND_2G 0
#define BRCMU_CHAN_BAND_5G 1
+#define BRCMU_CHAN_BAND_6G 2

enum brcmu_chan_bw {
BRCMU_CHAN_BW_20,

--
2.56.0