From: Shahar S Matityahu Date: Sun, 19 May 2019 07:16:13 +0000 (+0300) Subject: iwlwifi: dbg: don't stop dbg recording before entering D3 from 9000 devices X-Git-Tag: v5.3-rc1~140^2~52^2~1^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c040fe83423af70effda7112641fba84d541ce57;p=thirdparty%2Fkernel%2Flinux.git iwlwifi: dbg: don't stop dbg recording before entering D3 from 9000 devices From 9000 device family the FW automatically stops the debug recording and the driver should not stop it as well. Signed-off-by: Shahar S Matityahu Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index 749912b08b318..0e3db81fcf610 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -1078,11 +1078,12 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, #endif /* - * TODO: this is needed because the firmware is not stopping - * the recording automatically before entering D3. This can - * be removed once the FW starts doing that. + * Prior to 9000 device family the driver needs to stop the dbg + * recording before entering D3. In later devices the FW stops the + * recording automatically. */ - _iwl_fw_dbg_stop_recording(mvm->fwrt.trans, NULL); + if (mvm->trans->cfg->device_family < IWL_DEVICE_FAMILY_9000) + _iwl_fw_dbg_stop_recording(mvm->trans, NULL); /* must be last -- this switches firmware state */ ret = iwl_mvm_send_cmd(mvm, &d3_cfg_cmd);