qcacmn: Reduce Shadow Register Logging
Change the log level to info. Remove repeated log messages.
Remove extra \n from many hif log prints
Change-Id: Ie3d254888f0a0d37e0bc0c81c6186cb172e882c8
CRs-Fixed: 1026520
diff --git a/hif/src/ce/ce_bmi.c b/hif/src/ce/ce_bmi.c
index f8a982e..8f773da 100644
--- a/hif/src/ce/ce_bmi.c
+++ b/hif/src/ce/ce_bmi.c
@@ -240,7 +240,7 @@
&completed_nbytes, &id,
&flags) != QDF_STATUS_SUCCESS) {
if (i++ > BMI_RSP_TO_MILLISEC) {
- HIF_ERROR("%s:error, can't get bmi response\n",
+ HIF_ERROR("%s:error, can't get bmi response",
__func__);
status = QDF_STATUS_E_BUSY;
break;
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c
index 0a78d3e..fdc6261 100644
--- a/hif/src/ce/ce_main.c
+++ b/hif/src/ce/ce_main.c
@@ -636,11 +636,6 @@
return (struct CE_handle *)CE_state;
}
-#ifdef ADRASTEA_SHADOW_REGISTERS
- HIF_ERROR("%s: Using Shadow Registers instead of CE Registers\n",
- __func__);
-#endif
-
if (CE_state->src_sz_max)
QDF_ASSERT(CE_state->src_sz_max == attr->src_sz_max);
else
@@ -979,7 +974,7 @@
{
struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx);
- HIF_INFO("Enabling fastpath mode\n");
+ HIF_INFO("%s, Enabling fastpath mode", __func__);
scn->fastpath_mode_on = true;
}
@@ -1471,7 +1466,7 @@
/* daemonize("hif_compl_thread"); */
if (scn->ce_count == 0) {
- HIF_ERROR("%s: Invalid ce_count\n", __func__);
+ HIF_ERROR("%s: Invalid ce_count", __func__);
return -EINVAL;
}
@@ -2199,12 +2194,12 @@
init_tasklet_workers(hif_hdl);
- HIF_TRACE("%s: X, ret = %d\n", __func__, rv);
+ HIF_TRACE("%s: X, ret = %d", __func__, rv);
#ifdef ADRASTEA_SHADOW_REGISTERS
- HIF_ERROR("Using Shadow Registers instead of CE Registers\n");
+ HIF_INFO("%s, Using Shadow Registers instead of CE Registers", __func__);
for (i = 0; i < NUM_SHADOW_REGISTERS; i++) {
- HIF_ERROR("%s Shadow Register%d is mapped to address %x\n",
+ HIF_INFO("%s Shadow Register%d is mapped to address %x",
__func__, i,
(A_TARGET_READ(scn, (SHADOW_ADDRESS(i))) << 2));
}
@@ -2215,7 +2210,7 @@
err:
/* Failure, so clean up */
hif_unconfig_ce(scn);
- HIF_TRACE("%s: X, ret = %d\n", __func__, rv);
+ HIF_TRACE("%s: X, ret = %d", __func__, rv);
return QDF_STATUS_SUCCESS != QDF_STATUS_E_FAILURE;
}
@@ -2238,7 +2233,7 @@
QDF_ASSERT(scn != NULL);
if (!scn->fastpath_mode_on) {
- HIF_WARN("Fastpath mode disabled\n");
+ HIF_WARN("%s: Fastpath mode disabled", __func__);
return QDF_STATUS_E_FAILURE;
}
@@ -2592,8 +2587,8 @@
srri_from_ddr = SRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr));
if (read_from_hw != srri_from_ddr) {
- HIF_ERROR("error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x\n",
- srri_from_ddr, read_from_hw,
+ HIF_ERROR("%s: error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x",
+ __func__, srri_from_ddr, read_from_hw,
CE_MISC_INT_STATUS_GET(scn, CE_ctrl_addr));
QDF_ASSERT(0);
}
@@ -2611,7 +2606,7 @@
drri_from_ddr = DRRI_FROM_DDR_ADDR(VADDR_FOR_CE(scn, CE_ctrl_addr));
if (read_from_hw != drri_from_ddr) {
- HIF_ERROR("error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x\n",
+ HIF_ERROR("error: read from ddr = %d actual read from register = %d, CE_MISC_INT_STATUS_GET = 0x%x",
drri_from_ddr, read_from_hw,
CE_MISC_INT_STATUS_GET(scn, CE_ctrl_addr));
QDF_ASSERT(0);
@@ -2695,7 +2690,7 @@
low_paddr = BITS0_TO_31(paddr_rri_on_ddr);
high_paddr = BITS32_TO_35(paddr_rri_on_ddr);
- HIF_ERROR("%s using srri and drri from DDR\n", __func__);
+ HIF_INFO("%s using srri and drri from DDR", __func__);
WRITE_CE_DDR_ADDRESS_FOR_RRI_LOW(scn, low_paddr);
WRITE_CE_DDR_ADDRESS_FOR_RRI_HIGH(scn, high_paddr);
diff --git a/hif/src/ce/ce_service.c b/hif/src/ce/ce_service.c
index 5fb2044..d809b00 100644
--- a/hif/src/ce/ce_service.c
+++ b/hif/src/ce/ce_service.c
@@ -782,7 +782,7 @@
if (deltacount < 2) {
if (sendhead)
return msdu;
- qdf_print("Out of descriptor\n");
+ HIF_ERROR("%s: Out of descriptors", __func__);
src_ring->write_index = write_index;
war_ce_src_ring_write_idx_set(scn, ctrl_addr,
write_index);
@@ -900,8 +900,8 @@
if (qdf_unlikely(CE_RING_DELTA(nentries_mask, write_index,
sw_index-1) < 1)) {
/* ol_tx_stats_inc_ring_error(sc->scn->pdev_txrx_handle, 1); */
- qdf_print("ce send fail %d %d %d\n", nentries_mask,
- write_index, sw_index);
+ HIF_ERROR("%s: ce send fail %d %d %d", __func__, nentries_mask,
+ write_index, sw_index);
return 1;
}
@@ -1792,7 +1792,7 @@
return CE_state->receive_count;
if (Q_TARGET_ACCESS_BEGIN(scn) < 0) {
- HIF_ERROR("[premature rc=0]\n");
+ HIF_ERROR("[premature rc=0]");
return 0; /* no work done */
}
@@ -1987,7 +1987,7 @@
qdf_spin_unlock(&CE_state->ce_index_lock);
target_access_end:
if (Q_TARGET_ACCESS_END(scn) < 0)
- HIF_ERROR("<--[premature rc=%d]\n", CE_state->receive_count);
+ HIF_ERROR("<--[premature rc=%d]", CE_state->receive_count);
return CE_state->receive_count;
}
@@ -2144,7 +2144,7 @@
struct CE_state *CE_state = (struct CE_state *)copyeng;
if (CE_state == NULL) {
- pr_err("%s: Error CE state = NULL\n", __func__);
+ HIF_ERROR("%s: Error CE state = NULL", __func__);
return;
}
CE_state->send_context = ce_send_context;
@@ -2172,7 +2172,7 @@
struct CE_state *CE_state = (struct CE_state *)copyeng;
if (CE_state == NULL) {
- pr_err("%s: ERROR CE state = NULL\n", __func__);
+ HIF_ERROR("%s: ERROR CE state = NULL", __func__);
return;
}
CE_state->recv_context = CE_recv_context;
diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c
index fdb1a73..dcc9ea7 100644
--- a/hif/src/hif_main.c
+++ b/hif/src/hif_main.c
@@ -644,31 +644,31 @@
case AR9887_DEVICE_ID:
*hif_type = HIF_TYPE_AR9888;
*target_type = TARGET_TYPE_AR9888;
- HIF_INFO(" *********** AR9887 **************\n");
+ HIF_INFO(" *********** AR9887 **************");
break;
case QCA9984_DEVICE_ID:
*hif_type = HIF_TYPE_QCA9984;
*target_type = TARGET_TYPE_QCA9984;
- HIF_INFO(" *********** QCA9984 *************\n");
+ HIF_INFO(" *********** QCA9984 *************");
break;
case QCA9888_DEVICE_ID:
*hif_type = HIF_TYPE_QCA9888;
*target_type = TARGET_TYPE_QCA9888;
- HIF_INFO(" *********** QCA9888 *************\n");
+ HIF_INFO(" *********** QCA9888 *************");
break;
case AR900B_DEVICE_ID:
*hif_type = HIF_TYPE_AR900B;
*target_type = TARGET_TYPE_AR900B;
- HIF_INFO(" *********** AR900B *************\n");
+ HIF_INFO(" *********** AR900B *************");
break;
case IPQ4019_DEVICE_ID:
*hif_type = HIF_TYPE_IPQ4019;
*target_type = TARGET_TYPE_IPQ4019;
- HIF_INFO(" *********** IPQ4019 *************\n");
+ HIF_INFO(" *********** IPQ4019 *************");
break;
default:
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c
index 45735c0..e532601 100644
--- a/hif/src/hif_napi.c
+++ b/hif/src/hif_napi.c
@@ -167,11 +167,11 @@
NAPI_DEBUG("-->(id=%d, force=%d)", id, force);
if (0 == (hif->napi_data.state & HIF_NAPI_INITED)) {
- HIF_ERROR("%s: NAPI not initialized or entry %d not created\n",
+ HIF_ERROR("%s: NAPI not initialized or entry %d not created",
__func__, id);
rc = -EINVAL;
} else if (0 == (hif->napi_data.ce_map & (0x01 << ce))) {
- HIF_ERROR("%s: NAPI instance %d (pipe %d) not created\n",
+ HIF_ERROR("%s: NAPI instance %d (pipe %d) not created",
__func__, id, ce);
rc = -EINVAL;
} else {
@@ -184,11 +184,11 @@
if (hif->napi_data.state == HIF_NAPI_CONF_UP) {
if (force) {
napi_disable(&(napii->napi));
- HIF_INFO("%s: NAPI entry %d force disabled\n",
+ HIF_INFO("%s: NAPI entry %d force disabled",
__func__, id);
NAPI_DEBUG("NAPI %d force disabled", id);
} else {
- HIF_ERROR("%s: Cannot destroy active NAPI %d\n",
+ HIF_ERROR("%s: Cannot destroy active NAPI %d",
__func__, id);
rc = -EPERM;
}
@@ -216,7 +216,7 @@
/* hif->napi_data.state = 0; */
memset(napid,
0, sizeof(struct qca_napi_data));
- HIF_INFO("%s: no NAPI instances. Zapped.\n",
+ HIF_INFO("%s: no NAPI instances. Zapped.",
__func__);
}
}
@@ -280,33 +280,33 @@
case NAPI_EVT_CMD_STATE: {
int on = (data != ((void *)0));
- HIF_INFO("%s: received evnt: CONF %s; v = %d (state=0x%0x)\n",
+ HIF_INFO("%s: received evnt: CONF %s; v = %d (state=0x%0x)",
__func__,
(event == NAPI_EVT_INI_FILE)?".ini file":"cmd",
on, prev_state);
if (on)
if (prev_state & HIF_NAPI_CONF_UP) {
- HIF_INFO("%s: duplicate NAPI conf ON msg\n",
+ HIF_INFO("%s: duplicate NAPI conf ON msg",
__func__);
} else {
- HIF_INFO("%s: setting configuration to ON\n",
+ HIF_INFO("%s: setting configuration to ON",
__func__);
hif->napi_data.state |= HIF_NAPI_CONF_UP;
}
else /* off request */
if (prev_state & HIF_NAPI_CONF_UP) {
- HIF_INFO("%s: setting configuration to OFF\n",
+ HIF_INFO("%s: setting configuration to OFF",
__func__);
hif->napi_data.state &= ~HIF_NAPI_CONF_UP;
} else {
- HIF_INFO("%s: duplicate NAPI conf OFF msg\n",
+ HIF_INFO("%s: duplicate NAPI conf OFF msg",
__func__);
}
break;
}
/* case NAPI_INIT_FILE/CMD_STATE */
default: {
- HIF_ERROR("%s: unknown event: %d (data=0x%0lx)\n",
+ HIF_ERROR("%s: unknown event: %d (data=0x%0lx)",
__func__, event, (unsigned long) data);
break;
} /* default */
@@ -334,7 +334,7 @@
}
}
} else {
- HIF_INFO("%s: no change in hif napi state (still %d)\n",
+ HIF_INFO("%s: no change in hif napi state (still %d)",
__func__, prev_state);
rc = (hif->napi_data.state == ENABLE_NAPI_MASK);
}