From: Luca Coelho <luca@coelho.fi>
To: kvalo@codeaurora.org
Cc: linux-wireless@vger.kernel.org,
Shahar S Matityahu <shahar.s.matityahu@intel.com>,
Luca Coelho <luciano.coelho@intel.com>
Subject: [PATCH 05/13] iwlwifi: add FW_INFO debug level
Date: Wed, 3 Apr 2019 12:22:16 +0300 [thread overview]
Message-ID: <20190403092224.815-6-luca@coelho.fi> (raw)
In-Reply-To: <20190403092224.815-1-luca@coelho.fi>
From: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Add FW_INFO debug level. This level is enabled if INFO or FW debug
levels are set.
Also, set fw request and callback prints under this debug level.
Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 2 ++
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
index 655ff5694560..d3ba6a1422ee 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-debug.h
@@ -218,5 +218,7 @@ do { \
#define IWL_DEBUG_TPT(p, f, a...) IWL_DEBUG(p, IWL_DL_TPT, f, ## a)
#define IWL_DEBUG_RPM(p, f, a...) IWL_DEBUG(p, IWL_DL_RPM, f, ## a)
#define IWL_DEBUG_LAR(p, f, a...) IWL_DEBUG(p, IWL_DL_LAR, f, ## a)
+#define IWL_DEBUG_FW_INFO(p, f, a...) \
+ IWL_DEBUG(p, IWL_DL_INFO | IWL_DL_FW, f, ## a)
#endif
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 689a65b11cc3..1ad739bace0f 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -252,8 +252,8 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first)
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
cfg->fw_name_pre, tag);
- IWL_DEBUG_INFO(drv, "attempting to load firmware '%s'\n",
- drv->firmware_name);
+ IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",
+ drv->firmware_name);
return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
drv->trans->dev,
@@ -1318,8 +1318,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
if (!ucode_raw)
goto try_again;
- IWL_DEBUG_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n",
- drv->firmware_name, ucode_raw->size);
+ IWL_DEBUG_FW_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n",
+ drv->firmware_name, ucode_raw->size);
/* Make sure that we got at least the API version number */
if (ucode_raw->size < 4) {
--
2.20.1
next prev parent reply other threads:[~2019-04-03 9:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 9:22 [PATCH 00/13] iwlwifi: updates intended for v5.2 2019-04-03 Luca Coelho
2019-04-03 9:22 ` [PATCH 01/13] iwlwifi: bump FW API to 47 for 22000 series Luca Coelho
2019-04-03 9:22 ` [PATCH 02/13] iwlwifi: mvm: set 512 TX queue slots for AX210 devices Luca Coelho
2019-04-03 9:22 ` [PATCH 03/13] iwlwifi: unite macros with same meaning Luca Coelho
2019-04-03 9:22 ` [PATCH 04/13] iwlwifi: dbg_ini: support notification and dhc regions type parsing Luca Coelho
2019-04-03 9:22 ` Luca Coelho [this message]
2019-04-03 9:22 ` [PATCH 06/13] iwlwifi: dbg_ini: add debug prints to the ini flows Luca Coelho
2019-04-04 8:58 ` [PATCH v2 " Luca Coelho
2019-04-03 9:22 ` [PATCH 07/13] iwlwifi: rs: consider LDPC capability in case of HE Luca Coelho
2019-04-03 9:22 ` [PATCH 08/13] iwlwifi: dbg: add periphery memory dumping support to ax210 device family Luca Coelho
2019-04-03 9:22 ` [PATCH 09/13] iwlwifi: dbg: add lmac and umac PC registers to periphery dump Luca Coelho
2019-04-03 9:22 ` [PATCH 10/13] iwlwifi: mvm: support rtt confidence indication Luca Coelho
2019-04-03 9:22 ` [PATCH 11/13] iwlwifi: remove unused 0x40C0 PCI device IDs Luca Coelho
2019-04-03 9:22 ` [PATCH 12/13] iwlwifi: mvm: Change an 'else if' into an 'else' in iwl_mvm_send_add_bcast_sta Luca Coelho
2019-04-03 9:22 ` [PATCH 13/13] iwlwifi: dbg_ini: set dump bit only when trigger collection is certain Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190403092224.815-6-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
--cc=shahar.s.matityahu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox