Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75094dc8 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE 



This Kconfig option allows to load a firmware for
debugging with a different name. This mechanism has not
been used for a few years now and replacing the firmware
file works as well.
Kill this Kconfig option and all the code that goes with it.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 13303c0f

drivers/net/wireless/intel/iwlwifi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -134,12 +134,6 @@ config IWLWIFI_DEBUGFS 
	  is a low-impact option that allows getting insight into the

	  driver's state at runtime.



config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

        bool "Experimental uCode support"

        depends on IWLWIFI_DEBUG

        ---help---

	  Enable use of experimental ucode for testing and debugging.



config IWLWIFI_DEVICE_TRACING

	bool "iwlwifi device access tracing"

	depends on EVENT_TRACING

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

+9 −26
Original line number Diff line number Diff line
@@ -211,20 +211,12 @@ static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc, 
static void iwl_req_fw_callback(const struct firmware *ucode_raw,

				void *context);



#define UCODE_EXPERIMENTAL_INDEX	100

#define UCODE_EXPERIMENTAL_TAG		"exp"



static int iwl_request_firmware(struct iwl_drv *drv, bool first)

{

	const char *name_pre = drv->cfg->fw_name_pre;

	char tag[8];



	if (first) {

#ifdef CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

		drv->fw_index = UCODE_EXPERIMENTAL_INDEX;

		strcpy(tag, UCODE_EXPERIMENTAL_TAG);

	} else if (drv->fw_index == UCODE_EXPERIMENTAL_INDEX) {

#endif

		drv->fw_index = drv->cfg->ucode_api_max;

		sprintf(tag, "%d", drv->fw_index);

	} else {
@@ -240,9 +232,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) 
	snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",

		 name_pre, tag);



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

		       (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)

				? "EXPERIMENTAL " : "",

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

		       drv->firmware_name);



	return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
@@ -541,9 +531,7 @@ static int iwl_parse_v1_v2_firmware(struct iwl_drv *drv, 
	}



	if (build)

		sprintf(buildstr, " build %u%s", build,

		       (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)

				? " (EXP)" : "");

		sprintf(buildstr, " build %u", build);

	else

		buildstr[0] = '\0';
@@ -627,9 +615,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
	build = le32_to_cpu(ucode->build);



	if (build)

		sprintf(buildstr, " build %u%s", build,

		       (drv->fw_index == UCODE_EXPERIMENTAL_INDEX)

				? " (EXP)" : "");

		sprintf(buildstr, " build %u", build);

	else

		buildstr[0] = '\0';
@@ -1274,8 +1260,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	 * firmware filename ... but we don't check for that and only rely

	 * on the API version read from firmware header from here on forward

	 */

	/* no api version check required for experimental uCode */

	if (drv->fw_index != UCODE_EXPERIMENTAL_INDEX) {

	if (api_ver < api_min || api_ver > api_max) {

		IWL_ERR(drv,

			"Driver unable to support your firmware API. "
@@ -1283,7 +1267,6 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
			api_max, api_ver);

		goto try_again;

	}

	}



	/*

	 * In mvm uCode there is no difference between data and instructions