AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 11:18:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: remove IWLWIFI_DEBUG_EXPERIMENTAL_UCODE

Browse Source 
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Emmanuel Grumbach 2016-04-10 08:48:46 +03:00 committed by Luca Coelho
parent 13303c0fb1
commit 75094dc848
2 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/intel/iwlwifi/Kconfig
View File

@ -134,12 +134,6 @@ config IWLWIFI_DEBUGFS
is a low-impact option that allows getting insight into the is a low-impact option that allows getting insight into the
driver's state at runtime. 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 config IWLWIFI_DEVICE_TRACING
bool "iwlwifi device access tracing" bool "iwlwifi device access tracing"
depends on EVENT_TRACING depends on EVENT_TRACING

35
drivers/net/wireless/intel/iwlwifi/iwl-drv.c
View File

@ -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, static void iwl_req_fw_callback(const struct firmware *ucode_raw,
void *context); void *context);
#define UCODE_EXPERIMENTAL_INDEX 100
#define UCODE_EXPERIMENTAL_TAG "exp"
static int iwl_request_firmware(struct iwl_drv *drv, bool first) static int iwl_request_firmware(struct iwl_drv *drv, bool first)
{ {
const char *name_pre = drv->cfg->fw_name_pre; const char *name_pre = drv->cfg->fw_name_pre;
char tag[8]; char tag[8];
if (first) { 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; drv->fw_index = drv->cfg->ucode_api_max;
sprintf(tag, "%d", drv->fw_index); sprintf(tag, "%d", drv->fw_index);
} else { } 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", snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
name_pre, tag); name_pre, tag);
IWL_DEBUG_INFO(drv, "attempting to load firmware %s'%s'\n", IWL_DEBUG_INFO(drv, "attempting to load firmware '%s'\n",
(drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
? "EXPERIMENTAL " : "",
drv->firmware_name); drv->firmware_name);
return request_firmware_nowait(THIS_MODULE, 1, 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) if (build)
sprintf(buildstr, " build %u%s", build, sprintf(buildstr, " build %u", build);
(drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
? " (EXP)" : "");
else else
buildstr[0] = '\0'; buildstr[0] = '\0';
@ -627,9 +615,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
build = le32_to_cpu(ucode->build); build = le32_to_cpu(ucode->build);
if (build) if (build)
sprintf(buildstr, " build %u%s", build, sprintf(buildstr, " build %u", build);
(drv->fw_index == UCODE_EXPERIMENTAL_INDEX)
? " (EXP)" : "");
else else
buildstr[0] = '\0'; buildstr[0] = '\0';
@ -1274,15 +1260,12 @@ 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 * firmware filename ... but we don't check for that and only rely
* on the API version read from firmware header from here on forward * on the API version read from firmware header from here on forward
*/ */
/* no api version check required for experimental uCode */ if (api_ver < api_min || api_ver > api_max) {
if (drv->fw_index != UCODE_EXPERIMENTAL_INDEX) { IWL_ERR(drv,
if (api_ver < api_min || api_ver > api_max) { "Driver unable to support your firmware API. "
IWL_ERR(drv, "Driver supports v%u, firmware is v%u.\n",
"Driver unable to support your firmware API. " api_max, api_ver);
"Driver supports v%u, firmware is v%u.\n", goto try_again;
api_max, api_ver);
goto try_again;
}
} }
/* /*