evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwlagn: simplify ucode check code

Browse source 
The code in iwlcore_verify_inst_sparse really
doesn't need to keep track of the number of
errors it encountered since a single one is
fatal.

Also, the code in iwl_verify_inst_full is just
used to print out some things, so rename it to
iwl_print_inst and don't give it a return code
and just make it print out the values.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2011-04-05 09:41:55 -07:00 • committed by John W. Linville
parent 36127db02e
commit fb66216f9e
1 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
View file

@ -542,8 +542,6 @@ int iwlagn_alive_notify(struct iwl_priv *priv)
static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len) static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)
{ {
u32 val; u32 val;
int ret = 0;
u32 errcnt = 0;
u32 i; u32 i;
IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len); IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
@ -555,56 +553,39 @@ static int iwlcore_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32
iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,
i + IWLAGN_RTC_INST_LOWER_BOUND); i + IWLAGN_RTC_INST_LOWER_BOUND);
val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image))
ret = -EIO; return -EIO;
errcnt++;
if (errcnt >= 3)
break;
}
} }
return ret; return 0;
} }
/** static void iwl_print_mismatch_inst(struct iwl_priv *priv,
* iwlcore_verify_inst_full - verify runtime uCode image in card vs. host, __le32 *image, u32 len)
* looking at all data.
*/
static int iwl_verify_inst_full(struct iwl_priv *priv, __le32 *image,
u32 len)
{ {
u32 val; u32 val;
u32 save_len = len; u32 offs;
int ret = 0; int errors = 0;
u32 errcnt;
IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len); IWL_DEBUG_INFO(priv, "ucode inst image size is %u\n", len);
iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR, iwl_write_direct32(priv, HBUS_TARG_MEM_RADDR,
IWLAGN_RTC_INST_LOWER_BOUND); IWLAGN_RTC_INST_LOWER_BOUND);
errcnt = 0; for (offs = 0;
for (; len > 0; len -= sizeof(u32), image++) { offs < len && errors < 20;
offs += sizeof(u32), image++) {
/* read data comes through single port, auto-incr addr */ /* read data comes through single port, auto-incr addr */
/* NOTE: Use the debugless read so we don't flood kernel log /* NOTE: Use the debugless read so we don't flood kernel log
* if IWL_DL_IO is set */ * if IWL_DL_IO is set */
val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT); val = _iwl_read_direct32(priv, HBUS_TARG_MEM_RDAT);
if (val != le32_to_cpu(*image)) { if (val != le32_to_cpu(*image)) {
IWL_ERR(priv, "uCode INST section is invalid at " IWL_ERR(priv, "uCode INST section at "
"offset 0x%x, is 0x%x, s/b 0x%x\n", "offset 0x%x, is 0x%x, s/b 0x%x\n",
save_len - len, val, le32_to_cpu(*image)); offs, val, le32_to_cpu(*image));
ret = -EIO; errors++;
errcnt++;
if (errcnt >= 20)
break;
} }
} }
if (!errcnt)
IWL_DEBUG_INFO(priv,
"ucode image in INSTRUCTION memory is good\n");
return ret;
} }
/** /**
@ -651,5 +632,7 @@ int iwl_verify_ucode(struct iwl_priv *priv)
* Selection of bootstrap image (vs. other images) is arbitrary. */ * Selection of bootstrap image (vs. other images) is arbitrary. */
image = (__le32 *)priv->ucode_boot.v_addr; image = (__le32 *)priv->ucode_boot.v_addr;
len = priv->ucode_boot.len; len = priv->ucode_boot.len;
return iwl_verify_inst_full(priv, image, len); iwl_print_mismatch_inst(priv, image, len);
return -EIO;
} }