From 2de6147eafdcb0a422e6380954b4646210c1248d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Sep 2025 15:41:03 +0200 Subject: [PATCH] 6.16-stable patches added patches: wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch --- queue-6.16/series | 2 + ...fix-byte-count-table-for-old-devices.patch | 38 +++++++++++++++++ ...ix-byte-count-table-for-some-devices.patch | 41 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 queue-6.16/wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch create mode 100644 queue-6.16/wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch diff --git a/queue-6.16/series b/queue-6.16/series index c24acdefe0..8447c63798 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -134,3 +134,5 @@ mm-hugetlb-fix-folio-is-still-mapped-when-deleted.patch mm-damon-sysfs-do-not-ignore-callback-s-return-value-in-damon_sysfs_damon_call.patch fbcon-fix-integer-overflow-in-fbcon_do_set_font.patch fbcon-fix-oob-access-in-font-allocation.patch +wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch +wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch diff --git a/queue-6.16/wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch b/queue-6.16/wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch new file mode 100644 index 0000000000..21cf0d6355 --- /dev/null +++ b/queue-6.16/wifi-iwlwifi-fix-byte-count-table-for-old-devices.patch @@ -0,0 +1,38 @@ +From stable+bounces-181672-greg=kroah.com@vger.kernel.org Thu Sep 25 10:00:35 2025 +From: Johannes Berg +Date: Thu, 25 Sep 2025 10:00:06 +0200 +Subject: wifi: iwlwifi: fix byte count table for old devices +To: stable@vger.kernel.org +Cc: linux-wireless@vger.kernel.org, Johannes Berg , Emmanuel Grumbach +Message-ID: <20250925080010.9298-3-johannes@sipsolutions.net> + +From: Johannes Berg + +commit 586e3cb33ba6890054b95aa0ade0a165890efabd upstream. + +For devices handled by iwldvm, bc_table_dword was never set, but I missed +that during the removal thereof. Change the logic to not treat the byte +count table as dwords for devices older than 9000 series to fix that. + +Fixes: 6570ea227826 ("wifi: iwlwifi: remove bc_table_dword transport config") +Signed-off-by: Johannes Berg +Reviewed-by: Emmanuel Grumbach +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250828095500.eccd7d3939f1.Ibaffa06d0b3aa5f35a9451d94af34de208b8a2bc@changeid +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +@@ -2093,7 +2093,8 @@ static void iwl_txq_gen1_update_byte_cnt + break; + } + +- if (trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) ++ if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 && ++ trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) + len = DIV_ROUND_UP(len, 4); + + if (WARN_ON(len > 0xFFF || write_ptr >= TFD_QUEUE_SIZE_MAX)) diff --git a/queue-6.16/wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch b/queue-6.16/wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch new file mode 100644 index 0000000000..f7cb7e6424 --- /dev/null +++ b/queue-6.16/wifi-iwlwifi-pcie-fix-byte-count-table-for-some-devices.patch @@ -0,0 +1,41 @@ +From stable+bounces-181673-greg=kroah.com@vger.kernel.org Thu Sep 25 10:00:41 2025 +From: Johannes Berg +Date: Thu, 25 Sep 2025 10:00:07 +0200 +Subject: wifi: iwlwifi: pcie: fix byte count table for some devices +To: stable@vger.kernel.org +Cc: linux-wireless@vger.kernel.org, Johannes Berg , David Wang <00107082@163.com> +Message-ID: <20250925080010.9298-4-johannes@sipsolutions.net> + +From: Johannes Berg + +commit a38108a23ab558b834d71d542d32c05ab0fb64d4 upstream. + +In my previous fix for this condition, I erroneously listed 9000 +instead of 7000 family, when 7000/8000 were already using iwlmvm. +Thus the condition ended up wrong, causing the issue I had fixed +for older devices to suddenly appear on 7000/8000 family devices. +Correct the condition accordingly. + +Reported-by: David Wang <00107082@163.com> +Closes: https://lore.kernel.org/r/20250909165811.10729-1-00107082@163.com/ +Fixes: 586e3cb33ba6 ("wifi: iwlwifi: fix byte count table for old devices") +Signed-off-by: Johannes Berg +Signed-off-by: Miri Korenblit +Link: https://patch.msgid.link/20250915102743.777aaafbcc6c.I84404edfdfbf400501f6fb06def5b86c501da198@changeid +Signed-off-by: Miri Korenblit +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +@@ -2093,7 +2093,7 @@ static void iwl_txq_gen1_update_byte_cnt + break; + } + +- if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_9000 && ++ if (trans->mac_cfg->device_family >= IWL_DEVICE_FAMILY_7000 && + trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_AX210) + len = DIV_ROUND_UP(len, 4); + -- 2.47.3