A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix regression in qdf_trace_hex_dump

Browse source 
During convergence, a new module log level table was introduced, however
qdf_trace_hex_dump still points to the old table. Use the newly
introduced module log level table in qdf_trace_hex_dump.

Change-Id: I243a8c8b0ed84d501a472189d89074815ab67334
CRs-Fixed: 2046137
This commit is contained in:
Dustin Brown 2017-05-11 14:21:06 -07:00 • committed by snandini
commit d7cfa497c7
1 changed files with 39 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

89
qdf/linux/src/qdf_trace.c
View file

@ -317,49 +317,6 @@ void qdf_trace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
}
EXPORT_SYMBOL(qdf_trace_msg);
/**
* qdf_trace_display() - Display trace
*
* Return: None
*/
void qdf_trace_display(void)
{
QDF_MODULE_ID module_id;
pr_err
(" 1)FATAL 2)ERROR 3)WARN 4)INFO 5)INFO_H 6)INFO_M 7)INFO_L 8)DEBUG\n");
for (module_id = 0; module_id < QDF_MODULE_ID_MAX; ++module_id) {
pr_err
("%2d)%s %s %s %s %s %s %s %s %s\n",
(int)module_id, g_qdf_trace_info[module_id].module_name_str,
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_FATAL)) ? "X" :
" ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_ERROR)) ? "X" :
" ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_WARN)) ? "X" :
" ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_INFO)) ? "X" :
" ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_INFO_HIGH)) ? "X"
: " ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_INFO_MED)) ? "X"
: " ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_INFO_LOW)) ? "X"
: " ",
(g_qdf_trace_info[module_id].
module_trace_level & (1 << QDF_TRACE_LEVEL_DEBUG)) ? "X" :
" ");
}
}
EXPORT_SYMBOL(qdf_trace_display);
#define ROW_SIZE 16
/* Buffer size = data bytes(2 hex chars plus space) + NULL */
#define BUFFER_SIZE ((ROW_SIZE * 3) + 1)
@ -382,16 +339,16 @@ void qdf_trace_hex_dump(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
void *data, int buf_len)
{
const u8 *ptr = data;
int i, linelen, remaining = buf_len;
unsigned char linebuf[BUFFER_SIZE];
int i;
if (!(g_qdf_trace_info[module].module_trace_level &
QDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)))
if (!qdf_print_is_verbose_enabled(qdf_pidx, module, level))
return;
for (i = 0; i < buf_len; i += ROW_SIZE) {
linelen = min(remaining, ROW_SIZE);
remaining -= ROW_SIZE;
unsigned char linebuf[BUFFER_SIZE];
int linelen = min(buf_len, ROW_SIZE);
buf_len -= ROW_SIZE;
hex_dump_to_buffer(ptr + i, linelen, ROW_SIZE, 1,
linebuf, sizeof(linebuf), false);
@ -399,7 +356,6 @@ void qdf_trace_hex_dump(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
qdf_trace_msg(module, level, "%.8x: %s", i, linebuf);
}
}
EXPORT_SYMBOL(qdf_trace_hex_dump);
#endif
@ -1805,6 +1761,39 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
};
EXPORT_SYMBOL(g_qdf_category_name);
/**
* qdf_trace_display() - Display trace
*
* Return: None
*/
void qdf_trace_display(void)
{
QDF_MODULE_ID module_id;
pr_err(" 1)FATAL 2)ERROR 3)WARN 4)INFO 5)INFO_H 6)INFO_M 7)INFO_L 8)DEBUG\n");
for (module_id = 0; module_id < QDF_MODULE_ID_MAX; ++module_id) {
pr_err("%2d)%s %s %s %s %s %s %s %s %s\n",
(int)module_id,
g_qdf_category_name[module_id].category_name_str,
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_FATAL) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_ERROR) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_WARN) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_INFO) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_INFO_HIGH) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_INFO_MED) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_INFO_LOW) ? "X" : " ",
qdf_print_is_verbose_enabled(qdf_pidx, module_id,
QDF_TRACE_LEVEL_DEBUG) ? "X" : " ");
}
}
EXPORT_SYMBOL(qdf_trace_display);
#ifdef CONFIG_MCL
#define print_to_console(str)