samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
複製 0
程式碼 問題管理 合併請求 Actions Packages Projects 版本發佈 Wiki Activity

qcacmn: Clean up spectral, tif and umac component prints

瀏覽代碼 
Clean up spectral, tif and umac component prints by correcting trace
levels for regularly occurring prints and removing newlines from
converged print APIs since qdf_trace_msg appends them by default.

Change-Id: Ib10f1b1c54ecbcb9f4076be7c2c4708359d488e0
CRs-Fixed: 2243843
This commit is contained in:
Aditya Sathish
2018-07-20 14:26:31 +05:30
committed by nshrivas
父節點 1c42c27c80
當前提交 f78a3d8ca5
共有 12 個文件被更改，包括 233 次插入 和 252 次删除
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/pktlog/linux_ac.c
查看文件

@@ -422,7 +422,7 @@ static int pktlog_attach(struct hif_opaque_softc *scn)
pl_info_lnx = kmalloc(sizeof(*pl_info_lnx), GFP_KERNEL);
if (pl_info_lnx == NULL) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s: Allocation failed for pl_info\n",
"%s: Allocation failed for pl_info",
__func__);
goto attach_fail1;
}
@@ -560,7 +560,7 @@ static int __pktlog_open(struct inode *i, struct file *f)
scn = cds_get_context(QDF_MODULE_ID_HIF);
if (!scn) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: Invalid scn context\n", __func__);
qdf_print("%s: Invalid scn context", __func__);
ASSERT(0);
return -EINVAL;
}
@@ -569,7 +569,7 @@ static int __pktlog_open(struct inode *i, struct file *f)
if (!pl_dev) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: Invalid pktlog handle\n", __func__);
qdf_print("%s: Invalid pktlog handle", __func__);
ASSERT(0);
return -ENODEV;
}
@@ -625,7 +625,7 @@ static int __pktlog_release(struct inode *i, struct file *f)
scn = cds_get_context(QDF_MODULE_ID_HIF);
if (!scn) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: Invalid scn context\n", __func__);
qdf_print("%s: Invalid scn context", __func__);
ASSERT(0);
return -EINVAL;
}
@@ -634,7 +634,7 @@ static int __pktlog_release(struct inode *i, struct file *f)
if (!pl_dev) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: Invalid pktlog handle\n", __func__);
qdf_print("%s: Invalid pktlog handle", __func__);
ASSERT(0);
return -ENODEV;
}

63
utils/pktlog/pktlog_ac.c
查看文件

@@ -176,7 +176,7 @@ wdi_pktlog_subscribe(struct cdp_pdev *cdp_pdev, int32_t log_state)
#endif
if (!cdp_pdev) {
qdf_print("Invalid pdev in %s\n", __func__);
qdf_print("Invalid pdev in %s", __func__);
return A_ERROR;
}
@@ -246,7 +246,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process TX message
*/
if (process_tx_info(pdev, log_data)) {
qdf_print("Unable to process TX info\n");
qdf_print("Unable to process TX info");
return;
}
break;
@@ -257,7 +257,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process RX message for local frames
*/
if (process_rx_info(pdev, log_data)) {
qdf_print("Unable to process RX info\n");
qdf_print("Unable to process RX info");
return;
}
break;
@@ -268,7 +268,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process RX message for remote frames
*/
if (process_rx_info_remote(pdev, log_data)) {
qdf_print("Unable to process RX info\n");
qdf_print("Unable to process RX info");
return;
}
break;
@@ -279,7 +279,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process RATE_FIND message
*/
if (process_rate_find(pdev, log_data)) {
qdf_print("Unable to process RC_FIND info\n");
qdf_print("Unable to process RC_FIND info");
return;
}
break;
@@ -290,7 +290,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process RATE_UPDATE message
*/
if (process_rate_update(pdev, log_data)) {
qdf_print("Unable to process RC_UPDATE\n");
qdf_print("Unable to process RC_UPDATE");
return;
}
break;
@@ -301,7 +301,7 @@ void pktlog_callback(void *pdev, enum WDI_EVENT event, void *log_data,
* process SW EVENT message
*/
if (process_sw_event(pdev, log_data)) {
qdf_print("Unable to process SW_EVENT\n");
qdf_print("Unable to process SW_EVENT");
return;
}
break;
@@ -319,7 +319,7 @@ lit_pktlog_callback(void *context, enum WDI_EVENT event, void *log_data,
case WDI_EVENT_RX_DESC:
{
if (process_rx_desc_remote(context, log_data)) {
qdf_print("Unable to process RX info\n");
qdf_print("Unable to process RX info");
return;
}
break;
@@ -328,7 +328,7 @@ lit_pktlog_callback(void *context, enum WDI_EVENT event, void *log_data,
{
if (process_pktlog_lite(context, log_data,
PKTLOG_TYPE_LITE_T2H)) {
qdf_print("Unable to process lite_t2h\n");
qdf_print("Unable to process lite_t2h");
return;
}
break;
@@ -337,7 +337,7 @@ lit_pktlog_callback(void *context, enum WDI_EVENT event, void *log_data,
{
if (process_pktlog_lite(context, log_data,
PKTLOG_TYPE_LITE_RX)) {
qdf_print("Unable to process lite_rx\n");
qdf_print("Unable to process lite_rx");
return;
}
break;
@@ -452,14 +452,14 @@ int pktlog_disable(struct hif_opaque_softc *scn)
if (pktlog_wma_post_msg(0, WMI_PDEV_PKTLOG_DISABLE_CMDID, 0, 0)) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Failed to disable pktlog in target\n");
qdf_print("Failed to disable pktlog in target");
return -EINVAL;
}
if (pl_dev->is_pktlog_cb_subscribed &&
wdi_pktlog_unsubscribe(txrx_pdev, pl_info->log_state)) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Cannot unsubscribe pktlog from the WDI\n");
qdf_print("Cannot unsubscribe pktlog from the WDI");
return -EINVAL;
}
pl_dev->is_pktlog_cb_subscribed = false;
@@ -477,7 +477,7 @@ void pktlog_init(struct hif_opaque_softc *scn)
struct ath_pktlog_info *pl_info;
if (pl_dev == NULL || pl_dev->pl_info == NULL) {
qdf_print("pl_dev or pl_info is invalid\n");
qdf_print("pl_dev or pl_info is invalid");
return;
}
@@ -526,28 +526,28 @@ static int __pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
int error;
if (!scn) {
qdf_print("%s: Invalid scn context\n", __func__);
qdf_print("%s: Invalid scn context", __func__);
ASSERT(0);
return -EINVAL;
}
pl_dev = get_pktlog_handle();
if (!pl_dev) {
qdf_print("%s: Invalid pktlog context\n", __func__);
qdf_print("%s: Invalid pktlog context", __func__);
ASSERT(0);
return -EINVAL;
}
cdp_pdev = get_txrx_context();
if (!cdp_pdev) {
qdf_print("%s: Invalid txrx context\n", __func__);
qdf_print("%s: Invalid txrx context", __func__);
ASSERT(0);
return -EINVAL;
}
pl_info = pl_dev->pl_info;
if (!pl_info) {
qdf_print("%s: Invalid pl_info context\n", __func__);
qdf_print("%s: Invalid pl_info context", __func__);
ASSERT(0);
return -EINVAL;
}
@@ -564,7 +564,7 @@ static int __pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
if (is_iwpriv_command == 0 && log_state == 0 &&
pl_dev->vendor_cmd_send == false) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: pktlog operation not in progress\n", __func__);
qdf_print("%s: pktlog operation not in progress", __func__);
return 0;
}
@@ -575,16 +575,16 @@ static int __pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
if (error != 0) {
pl_info->curr_pkt_state =
PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: pktlog buff alloc failed\n",
__func__);
qdf_print("%s: pktlog buff alloc failed",
__func__);
return -ENOMEM;
}
if (!pl_info->buf) {
pl_info->curr_pkt_state =
PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: pktlog buf alloc failed\n",
__func__);
qdf_print("%s: pktlog buf alloc failed",
__func__);
ASSERT(0);
return -ENOMEM;
}
@@ -614,13 +614,13 @@ static int __pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
if (error) {
pl_info->curr_pkt_state =
PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Unable to subscribe to the WDI %s\n",
__func__);
qdf_print("Unable to subscribe to the WDI %s",
__func__);
return -EINVAL;
}
} else {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Unable to subscribe %d to the WDI %s\n",
qdf_print("Unable to subscribe %d to the WDI %s",
log_state, __func__);
return -EINVAL;
}
@@ -628,7 +628,7 @@ static int __pktlog_enable(struct hif_opaque_softc *scn, int32_t log_state,
if (pktlog_enable_tgt(scn, log_state, ini_triggered,
user_triggered)) {
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Device cannot be enabled, %s\n", __func__);
qdf_print("Device cannot be enabled, %s", __func__);
return -EINVAL;
}
pl_dev->is_pktlog_cb_subscribed = true;
@@ -714,10 +714,9 @@ static int __pktlog_setsize(struct hif_opaque_softc *scn, int32_t size)
pl_info->curr_pkt_state = PKTLOG_OPR_IN_PROGRESS;
if (size < ONE_MEGABYTE || size > MAX_ALLOWED_PKTLOG_SIZE) {
qdf_print("%s: Cannot Set Pktlog Buffer size of %d bytes."
"Min required is %d MB and Max allowed is %d MB.\n",
__func__, size, (ONE_MEGABYTE/ONE_MEGABYTE),
(MAX_ALLOWED_PKTLOG_SIZE/ONE_MEGABYTE));
qdf_print("%s: Cannot Set Pktlog Buffer size of %d bytes.Min required is %d MB and Max allowed is %d MB.",
__func__, size, (ONE_MEGABYTE / ONE_MEGABYTE),
(MAX_ALLOWED_PKTLOG_SIZE / ONE_MEGABYTE));
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("%s: Invalid requested buff size", __func__);
return -EINVAL;
@@ -743,7 +742,7 @@ static int __pktlog_setsize(struct hif_opaque_softc *scn, int32_t size)
wdi_pktlog_unsubscribe(pdev, pl_info->log_state)) {
pl_info->curr_pkt_state =
PKTLOG_OPR_NOT_IN_PROGRESS;
qdf_print("Cannot unsubscribe pktlog from the WDI\n");
qdf_print("Cannot unsubscribe pktlog from the WDI");
spin_unlock_bh(&pl_info->log_lock);
return -EFAULT;
}
@@ -753,7 +752,7 @@ static int __pktlog_setsize(struct hif_opaque_softc *scn, int32_t size)
}
if (size != 0) {
qdf_print("%s: New Pktlog Buff Size is %d\n", __func__, size);
qdf_print("%s: New Pktlog Buff Size is %d", __func__, size);
pl_info->buf_size = size;
}
pl_info->curr_pkt_state = PKTLOG_OPR_NOT_IN_PROGRESS;

34
utils/pktlog/pktlog_internal.c
查看文件

@@ -294,7 +294,7 @@ fill_ieee80211_hdr_data(struct cdp_pdev *pdev,
}
if (tx_desc_id >= txrx_pdev->tx_desc.pool_size) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
"%s: drop due to invalid msdu id = %x\n",
"%s: drop due to invalid msdu id = %x",
__func__, tx_desc_id);
return;
}
@@ -307,7 +307,7 @@ fill_ieee80211_hdr_data(struct cdp_pdev *pdev,
qdf_nbuf_peek_header(netbuf, &addr, &len);
if (len < (2 * IEEE80211_ADDR_LEN)) {
qdf_print("TX frame does not have a valid address\n");
qdf_print("TX frame does not have a valid address");
return;
}
/* Adding header information for the TX data frames */
@@ -383,7 +383,7 @@ A_STATUS process_tx_info(struct cdp_pdev *txrx_pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -469,7 +469,7 @@ A_STATUS process_tx_info(struct cdp_pdev *txrx_pdev, void *data)
uint32_t len;
if (!txrx_pdev) {
qdf_print("Invalid pdev in %s\n", __func__);
qdf_print("Invalid pdev in %s", __func__);
return A_ERROR;
}
@@ -493,7 +493,7 @@ A_STATUS process_tx_info(struct cdp_pdev *txrx_pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -736,7 +736,7 @@ A_STATUS process_rx_info(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -812,7 +812,7 @@ A_STATUS process_rx_info(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -886,7 +886,7 @@ A_STATUS process_rate_find(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -966,7 +966,7 @@ A_STATUS process_rate_find(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -1027,11 +1027,11 @@ A_STATUS process_sw_event(void *pdev, void *data)
uint32_t *pl_tgt_hdr;
if (!pdev) {
qdf_print("Invalid pdev in %s\n", __func__);
qdf_print("Invalid pdev in %s", __func__);
return A_ERROR;
}
if (!data) {
qdf_print("Invalid data in %s\n", __func__);
qdf_print("Invalid data in %s", __func__);
return A_ERROR;
}
if (!pl_dev) {
@@ -1053,7 +1053,7 @@ A_STATUS process_sw_event(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -1115,11 +1115,11 @@ A_STATUS process_sw_event(void *pdev, void *data)
uint32_t *pl_tgt_hdr;
if (!pdev) {
qdf_print("Invalid pdev in %s\n", __func__);
qdf_print("Invalid pdev in %s", __func__);
return A_ERROR;
}
if (!data) {
qdf_print("Invalid data in %s\n", __func__);
qdf_print("Invalid data in %s", __func__);
return A_ERROR;
}
if (!pl_dev) {
@@ -1139,7 +1139,7 @@ A_STATUS process_sw_event(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -1208,7 +1208,7 @@ A_STATUS process_rate_update(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}
@@ -1286,7 +1286,7 @@ A_STATUS process_rate_update(void *pdev, void *data)
(ATH_PKTLOG_HDR_SIZE_OFFSET + 1)) ||
len < (sizeof(uint32_t) *
(ATH_PKTLOG_HDR_TYPE_SPECIFIC_DATA_OFFSET + 1))) {
qdf_print("Invalid msdu len in %s\n", __func__);
qdf_print("Invalid msdu len in %s", __func__);
qdf_assert(0);
return A_ERROR;
}