wifi: iwlwifi: trans: don't trigger d3 interrupt twice

[ Upstream commit 277f56a141fc54ef7f9e09dba65fb2e12021411d ]

When the IPC registers are used for sleep control, setting
the IPC sleep bit already triggers an interrupt to the fw, so
there is no need to also set the doorbell. Setting also the
doorbell triggers the sleep interrupt twice which lead to
an assert.

Fixes: af08571d3925 ("iwlwifi: pcie: support Bz suspend/resume trigger")
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230413102635.b5f2f6e44d38.I4cb5b6ad4914db47a714e731c4c8b4db679cabce@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index bd50f52..1690d7a 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -1522,19 +1522,16 @@ static int iwl_pcie_d3_handshake(struct iwl_trans *trans, bool suspend)
        struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
        int ret;
 
-       if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_AX210) {
+       if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_AX210)
                iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,
                                    suspend ? UREG_DOORBELL_TO_ISR6_SUSPEND :
                                              UREG_DOORBELL_TO_ISR6_RESUME);
-       } else if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ) {
+       else if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_BZ)
                iwl_write32(trans, CSR_IPC_SLEEP_CONTROL,
                            suspend ? CSR_IPC_SLEEP_CONTROL_SUSPEND :
                                      CSR_IPC_SLEEP_CONTROL_RESUME);
-               iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,
-                                   UREG_DOORBELL_TO_ISR6_SLEEP_CTRL);
-       } else {
+       else
                return 0;
-       }
 
        ret = wait_event_timeout(trans_pcie->sx_waitq,
                                 trans_pcie->sx_complete, 2 * HZ);