Commit 2953c393 authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: add FW_INFO debug level 



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: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 77f99ae6

drivers/net/wireless/intel/iwlwifi/iwl-debug.h

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+4 −4
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ 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",

	IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",

			  drv->firmware_name);



	return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
@@ -1318,7 +1318,7 @@ 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",

	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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE