| From 942407d049fcf285ac17ac98f0e58197038aa4ec Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 11 Apr 2021 13:25:44 +0300 |
| Subject: iwlwifi: dbg: disable ini debug in 9000 family and below |
| |
| From: Mukesh Sisodiya <mukesh.sisodiya@intel.com> |
| |
| [ Upstream commit 7c81a025054cd0aeeeaf17aba2e9757f0a6a38a1 ] |
| |
| Yoyo based debug is not applicable to old devices. As init debug is |
| enabled by default in the driver, it needs to be disabled to work the |
| old debug mechanism in old devices. |
| |
| Signed-off-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com> |
| Fixes: b0d8d2c27007 ("iwlwifi: yoyo: enable yoyo by default") |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/iwlwifi.20210411132130.805401a1b8ec.I30db38184a418cfc1c5ca1a305cc14a52501d415@changeid |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c |
| index a80a35a7740f..900bf546d86e 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c |
| @@ -1,6 +1,6 @@ |
| // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause |
| /* |
| - * Copyright (C) 2018-2020 Intel Corporation |
| + * Copyright (C) 2018-2021 Intel Corporation |
| */ |
| #include <linux/firmware.h> |
| #include "iwl-drv.h" |
| @@ -424,7 +424,8 @@ void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans) |
| const struct firmware *fw; |
| int res; |
| |
| - if (!iwlwifi_mod_params.enable_ini) |
| + if (!iwlwifi_mod_params.enable_ini || |
| + trans->trans_cfg->device_family <= IWL_DEVICE_FAMILY_9000) |
| return; |
| |
| res = firmware_request_nowarn(&fw, "iwl-debug-yoyo.bin", dev); |
| -- |
| 2.30.2 |
| |