diff options
| author | Henry Tung | 2025-05-04 18:29:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-05-15 18:27:48 +0000 |
| commit | d2d9b1eaeb4268fa869d8e8766f92ee4f6e9eba9 (patch) | |
| tree | 5d593a16a5872c895fd93899ac74cd86593146ea | |
| parent | ba37852951743f0348b89a6172d30179fa138b04 (diff) | |
| download | openwrt-d2d9b1eaeb4268fa869d8e8766f92ee4f6e9eba9.tar.gz | |
mac80211: ath11k: fix broadcast failures during GTK rekeying
Revert key_cipher change to NONE when clearing key.
Setting to NONE triggers asserts in the firmware and causes broadcast
drops with ath11k firmware 2.9.0.1, so until a future blob
fixes this, revert this as a workaround.
Imported from
https://git.codelinaro.org/clo/qsdk/oss/system/feeds/wlan-open/-/blob/win.wlan_host_opensource.3.0.r24/patches/ath11k/350-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch
Related discussion links:
- https://github.com/openwrt/openwrt/issues/9555
- https://lore.kernel.org/linux-wireless/Z2Q9POuV-6MIdzRf@pilgrim/T/#t
Signed-off-by: Henry Tung <henryptung@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18705
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 94e04a4513b6697160a852ee353e57647560bdca)
Link: https://github.com/openwrt/openwrt/pull/18754
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/kernel/mac80211/patches/ath11k/940-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/ath11k/940-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch b/package/kernel/mac80211/patches/ath11k/940-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch new file mode 100644 index 0000000000..ec2dc222b6 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k/940-ath11k-Revert-clear-the-keys-properly-when-DISABLE_K.patch @@ -0,0 +1,48 @@ +From 52393e2ae12f18fb1a60578c24c46ebab292ddb6 Mon Sep 17 00:00:00 2001 +From: Rameshkumar Sundaram <quic_ramess@quicinc.com> +Date: Mon, 28 Mar 2022 13:21:04 +0530 +Subject: [PATCH] ath11k: Revert: clear the keys properly when DISABLE_KEY +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reverting the Upstream clear key change added as a part of +436a4e886598 ("ath11k: clear the keys properly +when DISABLE_KEY") +This change exposed a race in WLAN Firmware where target asserts +are seen frequently due FW not synchronizing ath11k host’s clear +key commands(CIPHER changes to NONE) with frames in TX queue. +Hence reverting this change untill FW fixes to synchronize +ath11k host’s clear key command are available. + +Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com> +--- + drivers/net/wireless/ath/ath11k/mac.c | 4 +++- + drivers/net/wireless/ath/ath11k/wmi.c | 3 +-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4222,7 +4222,9 @@ static int ath11k_install_key(struct ath + return 0; + + if (cmd == DISABLE_KEY) { +- arg.key_cipher = WMI_CIPHER_NONE; ++ /* TODO: Check if FW expects value other than NONE for del */ ++ /* arg.key_cipher = WMI_CIPHER_NONE; */ ++ arg.key_len = 0; + arg.key_data = NULL; + goto install; + } +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -1854,8 +1854,7 @@ int ath11k_wmi_vdev_install_key(struct a + tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | + FIELD_PREP(WMI_TLV_LEN, key_len_aligned); +- if (arg->key_data) +- memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned); ++ memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned); + + ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_INSTALL_KEY_CMDID); + if (ret) { |