This is a note to let you know that I've just added the patch titled
iwlwifi: fix Bz NMI behaviour
to the 5.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-fix-bz-nmi-behaviour.patch
and it can be found in the queue-5.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From fdfde0cb79264f88992e72b5a056a3a3284fcaad Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Fri, 10 Dec 2021 09:06:11 +0200
Subject: iwlwifi: fix Bz NMI behaviour
From: Johannes Berg <johannes.berg@xxxxxxxxx>
commit fdfde0cb79264f88992e72b5a056a3a3284fcaad upstream.
Contrary to what was stated before, the hardware hasn't changed
the bits here yet. In any case, the new CSR is also directly
(lower 16 bits) connected to UREG_DOORBELL_TO_ISR6, so if it
still changes the changes would be there. Adjust the code and
comments accordingly.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Fixes: 6c0795f1a524 ("iwlwifi: implement Bz NMI behaviour")
Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
Link: https://lore.kernel.org/r/iwlwifi.20211210090244.75b6207536e3.I7d170a48a9096e6b7269c3a9f447c326f929b171@changeid
Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 5 +++--
drivers/net/wireless/intel/iwlwifi/iwl-io.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -105,9 +105,10 @@
/* GIO Chicken Bits (PCI Express bus link power management) */
#define CSR_GIO_CHICKEN_BITS (CSR_BASE+0x100)
-/* Doorbell NMI (since Bz) */
+/* Doorbell - since Bz
+ * connected to UREG_DOORBELL_TO_ISR6 (lower 16 bits only)
+ */
#define CSR_DOORBELL_VECTOR (CSR_BASE + 0x130)
-#define CSR_DOORBELL_VECTOR_NMI BIT(1)
/* host chicken bits */
#define CSR_HOST_CHICKEN (CSR_BASE + 0x204)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -218,7 +218,7 @@ void iwl_force_nmi(struct iwl_trans *tra
UREG_DOORBELL_TO_ISR6_NMI_BIT);
else
iwl_write32(trans, CSR_DOORBELL_VECTOR,
- CSR_DOORBELL_VECTOR_NMI);
+ UREG_DOORBELL_TO_ISR6_NMI_BIT);
}
IWL_EXPORT_SYMBOL(iwl_force_nmi);
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-5.16/um-virtio_uml-fix-time-travel-external-time-propagat.patch
queue-5.16/mac80211-allow-non-standard-vht-mcs-10-11.patch
queue-5.16/iwlwifi-mvm-synchronize-with-fw-after-multicast-comm.patch
queue-5.16/um-fix-ndelay-udelay-defines.patch
queue-5.16/um-gitignore-add-kernel-capflags.c.patch
queue-5.16/iwlwifi-fix-bz-nmi-behaviour.patch
queue-5.16/iwlwifi-remove-module-loading-failure-message.patch
queue-5.16/iwlwifi-mvm-fix-32-bit-build-in-ftm.patch
queue-5.16/um-rename-set_signals-to-um_set_signals.patch
queue-5.16/lib-logic_iomem-fix-32-bit-build.patch
queue-5.16/lib-logic_iomem-fix-operation-on-32-bit.patch
queue-5.16/um-virt-pci-fix-32-bit-compile.patch
queue-5.16/iwlwifi-fix-leaks-bad-data-after-failed-firmware-loa.patch
