From: Arend van Spriel <arend.vanspriel@broadcom.com>
To: Daniel Berlin <dberlin@dberlin.org>,
Arend van Spriel <aspriel@gmail.com>,
Franky Lin <franky.lin@broadcom.com>,
Hante Meuleman <hante.meuleman@broadcom.com>
Cc: linux-wireless@vger.kernel.org,
brcm80211-dev-list.pdl@broadcom.com,
SHA-cyfmac-dev-list@infineon.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/5] [brcmfmac] Add support for encoding/decoding 6g chanspecs
Date: Fri, 20 Oct 2023 11:57:42 +0200 [thread overview]
Message-ID: <d55c968a-d953-67d7-cdff-f856422607f5@broadcom.com> (raw)
In-Reply-To: <0b95944fcf047b3ec83cecb0c65ca24de43810fd.1697650207.git.dberlin@dberlin.org>
[-- Attachment #1: Type: text/plain, Size: 6257 bytes --]
On 10/19/2023 3:42 AM, Daniel Berlin wrote:
> This patch adds support for 6G chanspecs, as part of adding 6G and
> 802.11ax support.
>
> I added the correct values for the upcoming 320mhz as well so that the
> info is complete.
Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>>
Signed-off-by: Daniel Berlin <dberlin@dberlin.org>
> ---
> .../broadcom/brcm80211/brcmutil/d11.c | 46 +++++++++++++++----
> .../broadcom/brcm80211/include/brcmu_d11.h | 46 +++++++++++++------
> .../broadcom/brcm80211/include/brcmu_wifi.h | 27 ++++++++---
> 3 files changed, 89 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
> index 1e2b1e487eb7..faf7eeeeb2d5 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
[...]
> @@ -117,7 +127,9 @@ static void brcmu_d11n_decchspec(struct brcmu_chan *ch)
> }
> break;
> default:
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1,
> + "Invalid chanspec - unknown 11n bandwidth 0x%04x\n",
> + ch->chspec);
I don't think this provides more info. The WARN_ONCE() already prints
code location and stack trace.
> break;
> }
>
> @@ -129,7 +141,8 @@ static void brcmu_d11n_decchspec(struct brcmu_chan *ch)
> ch->band = BRCMU_CHAN_BAND_2G;
> break;
> default:
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1, "Invalid chanspec - unknown 11n band 0x%04x\n",
> + ch->chspec);
ditto
> break;
> }
> }
> @@ -156,7 +169,9 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
> ch->sb = BRCMU_CHAN_SB_U;
> ch->control_ch_num += CH_10MHZ_APART;
> } else {
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1,
> + "Invalid chanspec - unknown 11ac channel distance 0x%04x\n",
> + ch->chspec);
ditto
> }
> break;
> case BRCMU_CHSPEC_D11AC_BW_80:
> @@ -177,7 +192,9 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
> ch->control_ch_num += CH_30MHZ_APART;
> break;
> default:
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1,
> + "Invalid chanspec - unknown 11ac channel distance 0x%04x\n",
> + ch->chspec);
ditto
> break;
> }
> break;
> @@ -211,17 +228,24 @@ static void brcmu_d11ac_decchspec(struct brcmu_chan *ch)
> ch->control_ch_num += CH_70MHZ_APART;
> break;
> default:
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1,
> + "Invalid chanspec - unknown 11ac channel distance 0x%04x\n",
> + ch->chspec);
ditto
> break;
> }
> break;
> case BRCMU_CHSPEC_D11AC_BW_8080:
> default:
> - WARN_ONCE(1, "Invalid chanspec 0x%04x\n", ch->chspec);
> + WARN_ONCE(1,
> + "Invalid chanspec - unknown 11ac channel bandwidth 0x%04x\n",
> + ch->chspec);
> break;
> }
>
> 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..bb48b7442062 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
> +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
> @@ -69,24 +69,44 @@
> #define BRCMU_CHSPEC_D11AC_SB_UU BRCMU_CHSPEC_D11AC_SB_LUU
> #define BRCMU_CHSPEC_D11AC_SB_L BRCMU_CHSPEC_D11AC_SB_LLL
> #define BRCMU_CHSPEC_D11AC_SB_U BRCMU_CHSPEC_D11AC_SB_LLU
> +/* channel sideband indication for frequency >= 240MHz */
> +#define BRCMU_CHSPEC_D11AC_320_SB_MASK 0x0780
> +#define BRCMU_CHSPEC_D11AC_320_SB_SHIFT 7
> +#define BRCMU_CHSPEC_D11AC_SB_LLLL 0x0000
> +#define BRCMU_CHSPEC_D11AC_SB_LLLU 0x0080
> +#define BRCMU_CHSPEC_D11AC_SB_LLUL 0x0100
> +#define BRCMU_CHSPEC_D11AC_SB_LLUU 0x0180
> +#define BRCMU_CHSPEC_D11AC_SB_LULL 0x0200
> +#define BRCMU_CHSPEC_D11AC_SB_LULU 0x0280
> +#define BRCMU_CHSPEC_D11AC_SB_LUUL 0x0300
> +#define BRCMU_CHSPEC_D11AC_SB_LUUU 0x0380
> +#define BRCMU_CHSPEC_D11AC_SB_ULLL 0x0400
> +#define BRCMU_CHSPEC_D11AC_SB_ULLU 0x0480
> +#define BRCMU_CHSPEC_D11AC_SB_ULUL 0x0500
> +#define BRCMU_CHSPEC_D11AC_SB_ULUU 0x0580
> +#define BRCMU_CHSPEC_D11AC_SB_UULL 0x0600
> +#define BRCMU_CHSPEC_D11AC_SB_UULU 0x0680
> +#define BRCMU_CHSPEC_D11AC_SB_UUUL 0x0700
> +#define BRCMU_CHSPEC_D11AC_SB_UUUU 0x0780
These are WCC specific, but I think it is okay to have these definitions
here.
> #define BRCMU_CHSPEC_D11AC_BW_MASK 0x3800
> #define BRCMU_CHSPEC_D11AC_BW_SHIFT 11
> -#define BRCMU_CHSPEC_D11AC_BW_5 0x0000
> -#define BRCMU_CHSPEC_D11AC_BW_10 0x0800
> -#define BRCMU_CHSPEC_D11AC_BW_20 0x1000
> -#define BRCMU_CHSPEC_D11AC_BW_40 0x1800
> -#define BRCMU_CHSPEC_D11AC_BW_80 0x2000
> -#define BRCMU_CHSPEC_D11AC_BW_160 0x2800
> -#define BRCMU_CHSPEC_D11AC_BW_8080 0x3000
> -#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_4G 0x8000
> -#define BRCMU_CHSPEC_D11AC_BND_5G 0xc000
> +#define BRCMU_CHSPEC_D11AC_BW_10 0x0800
> +#define BRCMU_CHSPEC_D11AC_BW_20 0x1000
> +#define BRCMU_CHSPEC_D11AC_BW_40 0x1800
> +#define BRCMU_CHSPEC_D11AC_BW_80 0x2000
> +#define BRCMU_CHSPEC_D11AC_BW_160 0x2800
> +#define BRCMU_CHSPEC_D11AC_BW_320 0x0000
320MHz is 802.11be. No need to add this already, but not a biggy.
> +#define BRCMU_CHSPEC_D11AC_BW_8080 0x3000
> +#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_4G 0x8000
> +#define BRCMU_CHSPEC_D11AC_BND_5G 0xc000
> +#define BRCMU_CHSPEC_D11AC_BND_6G 0x4000
>
> #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,
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]
next parent reply other threads:[~2023-10-20 9:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1697650207.git.dberlin@dberlin.org>
[not found] ` <0b95944fcf047b3ec83cecb0c65ca24de43810fd.1697650207.git.dberlin@dberlin.org>
2023-10-20 9:57 ` Arend van Spriel [this message]
2023-10-20 16:36 ` [PATCH 1/5] [brcmfmac] Add support for encoding/decoding 6g chanspecs Daniel Berlin
2023-10-20 21:46 ` Jeff Johnson
2023-10-21 18:27 ` Arend van Spriel
[not found] ` <52c993fd93e13ac015be935a5284294c9a74ea8e.1697650207.git.dberlin@dberlin.org>
2023-10-20 9:58 ` [PATCH 2/5] [brcmfmac] Add support for 6G bands Arend van Spriel
2023-10-20 16:35 ` Daniel Berlin
2023-10-20 18:37 ` Arend van Spriel
2023-10-23 11:41 ` Daniel Berlin
2023-10-23 18:06 ` Arend Van Spriel
2023-10-23 18:09 ` Arend Van Spriel
[not found] ` <9bb36bcc0dbbbe6f991be30ec404b6e5197238ac.1697650207.git.dberlin@dberlin.org>
2023-10-20 9:58 ` [PATCH 3/5] wifi: brcmfmac: Add support for SCAN_V3 Arend van Spriel
[not found] ` <079882bf4a7c026547ecf8ad50a2b7a49ade7130.1697650207.git.dberlin@dberlin.org>
2023-10-20 9:59 ` [PATCH 4/5] wifi: brcmfmac: Support bss_info up to v112 Arend van Spriel
2023-10-20 17:31 ` Daniel Berlin
2023-10-31 14:04 ` Daniel Berlin
2023-10-31 16:27 ` Arend Van Spriel
2023-11-07 11:11 ` Hector Martin
2023-11-07 11:51 ` Arend van Spriel
2023-11-07 12:00 ` Daniel Berlin
2023-11-07 19:28 ` Arend van Spriel
[not found] ` <791863a231dca48234a3468b299d0bc71a85b6b0.1697650207.git.dberlin@dberlin.org>
2023-10-20 9:59 ` [PATCH 5/5] [brcmfmac] Add remaining support for 6G by supporting new scan structures Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d55c968a-d953-67d7-cdff-f856422607f5@broadcom.com \
--to=arend.vanspriel@broadcom.com \
--cc=SHA-cyfmac-dev-list@infineon.com \
--cc=aspriel@gmail.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=dberlin@dberlin.org \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox