kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwlwifi: add generic chunk size of tm dumpit packet

Browse source 
Use generic chunk size of dumpit packet for
all necessary testmode commands instead of
add declaration individually.

Signed-off-by: Kenny Hsu <kenny.hsu@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Hsu, Kenny 2011-11-22 23:05:02 -08:00 committed by Wey-Yi Guy
parent 76de2f29d4
commit e056a6533b
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/net/wireless/iwlwifi/iwl-sv-open.c
View file

@ -575,7 +575,7 @@ static int iwl_testmode_trace(struct ieee80211_hw *hw, struct nlattr **tb)
} }
priv->testmode_trace.num_chunks = priv->testmode_trace.num_chunks =
DIV_ROUND_UP(priv->testmode_trace.buff_size, DIV_ROUND_UP(priv->testmode_trace.buff_size,
TRACE_CHUNK_SIZE); DUMP_CHUNK_SIZE);
break; break;
case IWL_TM_CMD_APP2DEV_END_TRACE: case IWL_TM_CMD_APP2DEV_END_TRACE:
@ -607,15 +607,15 @@ static int iwl_testmode_trace_dump(struct ieee80211_hw *hw, struct nlattr **tb,
idx = cb->args[4]; idx = cb->args[4];
if (idx >= priv->testmode_trace.num_chunks) if (idx >= priv->testmode_trace.num_chunks)
return -ENOENT; return -ENOENT;
length = TRACE_CHUNK_SIZE; length = DUMP_CHUNK_SIZE;
if (((idx + 1) == priv->testmode_trace.num_chunks) && if (((idx + 1) == priv->testmode_trace.num_chunks) &&
(priv->testmode_trace.buff_size % TRACE_CHUNK_SIZE)) (priv->testmode_trace.buff_size % DUMP_CHUNK_SIZE))
length = priv->testmode_trace.buff_size % length = priv->testmode_trace.buff_size %
TRACE_CHUNK_SIZE; DUMP_CHUNK_SIZE;
NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length, NLA_PUT(skb, IWL_TM_ATTR_TRACE_DUMP, length,
priv->testmode_trace.trace_addr + priv->testmode_trace.trace_addr +
(TRACE_CHUNK_SIZE * idx)); (DUMP_CHUNK_SIZE * idx));
idx++; idx++;
cb->args[4] = idx; cb->args[4] = idx;
return 0; return 0;
@ -728,7 +728,7 @@ static int iwl_testmode_sram(struct ieee80211_hw *hw, struct nlattr **tb)
priv->testmode_sram.buff_addr, priv->testmode_sram.buff_addr,
priv->testmode_sram.buff_size / 4); priv->testmode_sram.buff_size / 4);
priv->testmode_sram.num_chunks = priv->testmode_sram.num_chunks =
DIV_ROUND_UP(priv->testmode_sram.buff_size, TRACE_CHUNK_SIZE); DIV_ROUND_UP(priv->testmode_sram.buff_size, DUMP_CHUNK_SIZE);
priv->testmode_sram.sram_readed = true; priv->testmode_sram.sram_readed = true;
return 0; return 0;
} }
@ -746,15 +746,15 @@ static int iwl_testmode_sram_dump(struct ieee80211_hw *hw, struct nlattr **tb,
iwl_sram_cleanup(priv); iwl_sram_cleanup(priv);
return -ENOENT; return -ENOENT;
} }
length = TRACE_CHUNK_SIZE; length = DUMP_CHUNK_SIZE;
if (((idx + 1) == priv->testmode_sram.num_chunks) && if (((idx + 1) == priv->testmode_sram.num_chunks) &&
(priv->testmode_sram.buff_size % TRACE_CHUNK_SIZE)) (priv->testmode_sram.buff_size % DUMP_CHUNK_SIZE))
length = priv->testmode_sram.buff_size % length = priv->testmode_sram.buff_size %
TRACE_CHUNK_SIZE; DUMP_CHUNK_SIZE;
NLA_PUT(skb, IWL_TM_ATTR_SRAM_DUMP, length, NLA_PUT(skb, IWL_TM_ATTR_SRAM_DUMP, length,
priv->testmode_sram.buff_addr + priv->testmode_sram.buff_addr +
(TRACE_CHUNK_SIZE * idx)); (DUMP_CHUNK_SIZE * idx));
idx++; idx++;
cb->args[4] = idx; cb->args[4] = idx;
return 0; return 0;

4
drivers/net/wireless/iwlwifi/iwl-testmode.h
View file

@ -250,6 +250,8 @@ enum iwl_tm_attr_t {
#define TRACE_BUFF_SIZE_MIN 0x20000 #define TRACE_BUFF_SIZE_MIN 0x20000
#define TRACE_BUFF_SIZE_DEF TRACE_BUFF_SIZE_MIN #define TRACE_BUFF_SIZE_DEF TRACE_BUFF_SIZE_MIN
#define TRACE_BUFF_PADD 0x2000 #define TRACE_BUFF_PADD 0x2000
#define TRACE_CHUNK_SIZE (PAGE_SIZE - 1024)
/* Maximum data size of each dump it packet */
#define DUMP_CHUNK_SIZE (PAGE_SIZE - 1024)
#endif #endif