Skip to content

wifi: brcmfmac: Enable WPA3 on Z2W - #7762

Open
pelwell wants to merge 3 commits into
raspberrypi:rpi-6.18.yfrom
pelwell:wpa3
Open

pelwell wants to merge 3 commits into
raspberrypi:rpi-6.18.yfrom
pelwell:wpa3

Conversation

@pelwell

@pelwell pelwell commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Inspired by a patch from Synaptics, this set of patches enables WPA3 support on both flavours of Zero 2 W. It will also work with Pi 400, but only once a new 43456 firmware has been released.

Some firmware (e.g. Synaptics builds for SYN43456 and SYN43436s)
advertises "extsae" but has neither in-firmware SAE nor the Infineon
mgmt_frame/auth_status iovars. Instead it signals the start of
authentication with a JOIN_START event, delivers received
authentication frames in E_AUTH events, and accepts authentication
frames and resume commands through the assoc_mgr_cmd iovar.

Add support for this scheme so that the host supplicant can perform
SAE:

- On JOIN_START, raise an external authentication request to
  userspace and pause the firmware association state machine at the
  authentication response.
- Forward SAE authentication frames from E_AUTH events to userspace.
- Transmit authentication frames from userspace with the
  assoc_mgr_cmd SEND_AUTH command.
- When userspace reports the result, resume the association, or
  disconnect on failure.

Also map WPA2 + SAE AKM to WPA3_AUTH_SAE_PSK whenever SAE_EXT is
supported, not only for Infineon firmware.

Based on a patch supplied by Synaptics.

Assisted-by: Claude
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
@pelwell pelwell changed the title wifi: brcmfmac: Enable WPA3 on Z2W and Pi 400 wifi: brcmfmac: Enable WPA3 on Z2W Nov 16, 2026
The SDIO device IDs of some Infineon chips are shared with Synaptics
parts - e.g. the SYN43436s in the Raspberry Pi Zero 2 W is a
BCM43430/1, like the CYW43438 - so the Synaptics firmware is run with
the CYW vendor ops. That firmware advertises "extsae", but the CYW
external SAE implementation relies on the mgmt_frame and auth_status
iovars, which it lacks. The SAE commit frame is never sent and the
connection times out.

Instead of unconditionally installing the CYW mgmt_tx and
external_auth ops, do it from feat_attach, and only if the firmware
supports both iovars; otherwise the generic external SAE support is
used. Both iovars are set-only, so a get returns BCME_UNSUPPORTED
whether or not they exist - probe with a zero-length set instead,
which Infineon firmware rejects with a length/allocation error.

Move the BRCMF_FW_UNSUPPORTED definition to fwil.h so that vendor
modules can use it.

Link: raspberrypi#7528
Assisted-by: Claude
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Synaptics firmware for the SYN43436s and SYN43436P supports the
in-firmware supplicant (FWSUP), so after an external SAE
authentication the driver selects PSK offload, the supplicant skips
the 4-way handshake, and the firmware doesn't perform it either. The
AP then deauthenticates the station.

Until now this has been avoided by disabling FWSUP with the
feature_disable module parameter. Instead, clear the FWSUP feature
when the generic (non-Infineon) external SAE support is in use, so
that WPA3 works regardless of any module parameters.

Assisted-by: Claude
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant