[PATCH] wifi: wlcore: Add support for IGTK key

[PATCH] wifi: wlcore: Add support for IGTK key

[Peter Åstrand]

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


This change re-applies commit 2b7aadd3b9e1 ("wlcore: Adding suppoprt for IGTK key in
wlcore driver") (sic), but only enables WLAN_CIPHER_SUITE_AES_CMAC with modern
firmware. This patch is required to support WPA3 connections.

Signed-off-by: Peter Åstrand <astrand@lysator.liu.se>
---
 drivers/net/wireless/ti/wlcore/cmd.h  | 1 +
 drivers/net/wireless/ti/wlcore/main.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/drivers/net/wireless/ti/wlcore/cmd.h b/drivers/net/wireless/ti/wlcore/cmd.h
index d16afb35f9ee..f8160f372bc7 100644
--- a/drivers/net/wireless/ti/wlcore/cmd.h
+++ b/drivers/net/wireless/ti/wlcore/cmd.h
@@ -455,6 +455,7 @@ enum wl1271_cmd_key_type {
 	KEY_TKIP = 2,
 	KEY_AES  = 3,
 	KEY_GEM  = 4,
+	KEY_IGTK = 5,
 };
 
 struct wl1271_cmd_set_keys {
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 12f0167d7380..dce79bce2e3f 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -2419,6 +2419,11 @@ static int wl12xx_init_fw(struct wl1271 *wl)
 	strscpy(wiphy->fw_version, wl->chip.fw_ver_str,
 		sizeof(wiphy->fw_version));
 
+	/* WLAN_CIPHER_SUITE_AES_CMAC must be last in cipher_suites;
+	   support only with firmware 8.9.1 and newer */
+	if (wl->chip.fw_ver[FW_VER_MAJOR] < 1)
+		wl->hw->wiphy->n_cipher_suites--;
+
 	/*
 	 * Now we know if 11a is supported (info from the NVS), so disable
 	 * 11a channels if not supported
@@ -3585,6 +3590,9 @@ int wlcore_set_key(struct wl1271 *wl, enum set_key_cmd cmd,
 	case WL1271_CIPHER_SUITE_GEM:
 		key_type = KEY_GEM;
 		break;
+	case WLAN_CIPHER_SUITE_AES_CMAC:
+		key_type = KEY_IGTK;
+		break;
 	default:
 		wl1271_error("Unknown key algo 0x%x", key_conf->cipher);
 
@@ -6196,6 +6204,7 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
 		WLAN_CIPHER_SUITE_TKIP,
 		WLAN_CIPHER_SUITE_CCMP,
 		WL1271_CIPHER_SUITE_GEM,
+		WLAN_CIPHER_SUITE_AES_CMAC,
 	};
 
 	/* The tx descriptor buffer */
-- 
2.30.2


Br,
Peter Åstrand

Re: [PATCH] wifi: wlcore: Add support for IGTK key

[Andreas Kemnade]

Hi,

On Fri, 16 Jan 2026 18:58:58 +0100 (CET)
Peter Åstrand <astrand@lysator.liu.se> wrote:

> This change re-applies commit 2b7aadd3b9e1 ("wlcore: Adding suppoprt for IGTK key in
> wlcore driver") (sic), but only enables WLAN_CIPHER_SUITE_AES_CMAC with modern
> firmware. This patch is required to support WPA3 connections.
> 

I have seen this after this patch:
[  484.113311] wlcore: WARNING could not set keys
[  484.117828] wlcore: ERROR Could not add or replace key
[  484.123016] wlan0: failed to set key (5, ff:ff:ff:ff:ff:ff) to hardware (-5)
[  484.123046] wlcore: Hardware recovery in progress. FW ver: Rev 7.3.10.0.142
[  484.139923] wlcore: pc: 0x0, hint_sts: 0x00000048 count: 1
[  484.145721] wlcore: down
[  484.148986] ieee80211 phy0: Hardware restart was requested
[  484.610473] wlcore: firmware booted (Rev 7.3.10.0.142)
[  484.633758] wlcore: Association completed.
[  484.690490] wlcore: ERROR command execute failure 14
[  484.690490] ------------[ cut here ]------------
[  484.700195] WARNING: drivers/net/wireless/ti/wlcore/main.c:872 at wl12xx_queue_recovery_work+0x64/0x74 [wlcore], CPU#0: kworker/0:0/892

This repeats endlessly.
As soon as I set pmf to 1 in wpa_supplciant, once per second. Reverting this patch helps. Seen this
on the Epson Moverio BT-200.

Regards,
Andreas

Re: [PATCH] wifi: wlcore: Add support for IGTK key

[Peter Åstrand]

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

On Fri, 8 May 2026, Andreas Kemnade wrote:

> Hi,
> 
> On Fri, 16 Jan 2026 18:58:58 +0100 (CET)
> Peter Åstrand <astrand@lysator.liu.se> wrote:
> 
> > This change re-applies commit 2b7aadd3b9e1 ("wlcore: Adding suppoprt for IGTK key in
> > wlcore driver") (sic), but only enables WLAN_CIPHER_SUITE_AES_CMAC with modern
> > firmware. This patch is required to support WPA3 connections.
> > 
> 
> I have seen this after this patch:
> [  484.113311] wlcore: WARNING could not set keys
> [  484.117828] wlcore: ERROR Could not add or replace key
> [  484.123016] wlan0: failed to set key (5, ff:ff:ff:ff:ff:ff) to hardware (-5)
> [  484.123046] wlcore: Hardware recovery in progress. FW ver: Rev 7.3.10.0.142
> [  484.139923] wlcore: pc: 0x0, hint_sts: 0x00000048 count: 1
> [  484.145721] wlcore: down
> [  484.148986] ieee80211 phy0: Hardware restart was requested
> [  484.610473] wlcore: firmware booted (Rev 7.3.10.0.142)
> [  484.633758] wlcore: Association completed.
> [  484.690490] wlcore: ERROR command execute failure 14
> [  484.690490] ------------[ cut here ]------------
> [  484.700195] WARNING: drivers/net/wireless/ti/wlcore/main.c:872 at wl12xx_queue_recovery_work+0x64/0x74 [wlcore], CPU#0: kworker/0:0/892
> 
> This repeats endlessly.
> As soon as I set pmf to 1 in wpa_supplciant, once per second. Reverting this patch helps. Seen this
> on the Epson Moverio BT-200.

Thanks for this feedback. From the firmware version, I assume that this is 
not wl18xx but probably wl12xx? Unfortunately I have no experience with 
that module. So, while my patch is an improvement over the original patch 
because it checks firmware version, it did not consider non-wl18xx 
modules. 

I guess we need to throw in something like:

strcmp(pdev_data->family->name, "wl18xx")

...in the if statement. 

Br,
Peter

Re: [PATCH] wifi: wlcore: Add support for IGTK key

[Andreas Kemnade]

On Fri, 8 May 2026 15:55:07 +0200 (CEST)
Peter Åstrand <astrand@lysator.liu.se> wrote:

> On Fri, 8 May 2026, Andreas Kemnade wrote:
> 
> > Hi,
> > 
> > On Fri, 16 Jan 2026 18:58:58 +0100 (CET)
> > Peter Åstrand <astrand@lysator.liu.se> wrote:
> >   
> > > This change re-applies commit 2b7aadd3b9e1 ("wlcore: Adding suppoprt for IGTK key in
> > > wlcore driver") (sic), but only enables WLAN_CIPHER_SUITE_AES_CMAC with modern
> > > firmware. This patch is required to support WPA3 connections.
> > >   
> > 
> > I have seen this after this patch:
> > [  484.113311] wlcore: WARNING could not set keys
> > [  484.117828] wlcore: ERROR Could not add or replace key
> > [  484.123016] wlan0: failed to set key (5, ff:ff:ff:ff:ff:ff) to hardware (-5)
> > [  484.123046] wlcore: Hardware recovery in progress. FW ver: Rev 7.3.10.0.142
> > [  484.139923] wlcore: pc: 0x0, hint_sts: 0x00000048 count: 1
> > [  484.145721] wlcore: down
> > [  484.148986] ieee80211 phy0: Hardware restart was requested
> > [  484.610473] wlcore: firmware booted (Rev 7.3.10.0.142)
> > [  484.633758] wlcore: Association completed.
> > [  484.690490] wlcore: ERROR command execute failure 14
> > [  484.690490] ------------[ cut here ]------------
> > [  484.700195] WARNING: drivers/net/wireless/ti/wlcore/main.c:872 at wl12xx_queue_recovery_work+0x64/0x74 [wlcore], CPU#0: kworker/0:0/892
> > 
> > This repeats endlessly.
> > As soon as I set pmf to 1 in wpa_supplciant, once per second. Reverting this patch helps. Seen this
> > on the Epson Moverio BT-200.  
> 
> Thanks for this feedback. From the firmware version, I assume that this is 
> not wl18xx but probably wl12xx? Unfortunately I have no experience with 
> that module. So, while my patch is an improvement over the original patch 
> because it checks firmware version, it did not consider non-wl18xx 
> modules. 
>                 
This is:

compatible = "ti,wl1283";

Regards,
Andreas