samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Replace obsolete HIF_TRACE() with hif_info()

Browse Source 
Replace obsolete HIF_TRACE() with hif_info().

Change-Id: I315d86b886ce0bc28c8c967c986095fe2ee46bec
CRs-Fixed: 2779720
This commit is contained in:
Srinivas Girigowda
2020-09-17 20:16:00 -07:00
committed by snandini
parent d79f50ca9c
commit d89e043589
9 changed files with 76 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hif/src/ce/ce_main.c
View File

@@ -3501,11 +3501,11 @@ static void hif_post_static_buf_to_target(struct hif_softc *scn)
target_va = qdf_mem_alloc_consistent(scn->qdf_dev, scn->qdf_dev->dev, target_va = qdf_mem_alloc_consistent(scn->qdf_dev, scn->qdf_dev->dev,
FW_SHARED_MEM, &target_pa); FW_SHARED_MEM, &target_pa);
if (!target_va) { if (!target_va) {
HIF_TRACE("Memory allocation failed could not post target buf"); hif_err("Memory allocation failed could not post target buf");
return; return;
} }
hif_write32_mb(scn, scn->mem + BYPASS_QMI_TEMP_REGISTER, target_pa); hif_write32_mb(scn, scn->mem + BYPASS_QMI_TEMP_REGISTER, target_pa);
HIF_TRACE("target va %pK target pa %pa", target_va, &target_pa); hif_info("target va %pK target pa %pa", target_va, &target_pa);
} }
#endif #endif
@@ -3640,7 +3640,7 @@ int hif_config_ce(struct hif_softc *scn)
err: err:
/* Failure, so clean up */ /* Failure, so clean up */
hif_unconfig_ce(scn); hif_unconfig_ce(scn);
HIF_TRACE("%s: X, ret = %d", __func__, rv); hif_info("X, ret = %d", rv);
return QDF_STATUS_SUCCESS != QDF_STATUS_E_FAILURE; return QDF_STATUS_SUCCESS != QDF_STATUS_E_FAILURE;
} }

8
hif/src/ipcie/if_ipci.c
View File

@@ -557,7 +557,7 @@ int hif_configure_irq(struct hif_softc *scn)
{ {
int ret = 0; int ret = 0;
HIF_TRACE("%s: E", __func__); hif_info("E");
if (hif_is_polled_mode_enabled(GET_HIF_OPAQUE_HDL(scn))) { if (hif_is_polled_mode_enabled(GET_HIF_OPAQUE_HDL(scn))) {
scn->request_irq_done = false; scn->request_irq_done = false;
@@ -673,7 +673,7 @@ QDF_STATUS hif_ipci_enable_bus(struct hif_softc *ol_sc,
tgt_info = hif_get_target_info_handle(hif_hdl); tgt_info = hif_get_target_info_handle(hif_hdl);
hif_ipci_init_deinit_ops_attach(sc, device_id); hif_ipci_init_deinit_ops_attach(sc, device_id);
sc->hif_ipci_get_soc_info(sc, dev); sc->hif_ipci_get_soc_info(sc, dev);
HIF_TRACE("%s: hif_enable_pci done", __func__); hif_debug("hif_enable_pci done");
ret = hif_get_device_type(device_id, revision_id, ret = hif_get_device_type(device_id, revision_id,
&hif_type, &target_type); &hif_type, &target_type);
@@ -681,8 +681,8 @@ QDF_STATUS hif_ipci_enable_bus(struct hif_softc *ol_sc,
hif_err("Invalid device id/revision_id"); hif_err("Invalid device id/revision_id");
return QDF_STATUS_E_ABORTED; return QDF_STATUS_E_ABORTED;
} }
HIF_TRACE("%s: hif_type = 0x%x, target_type = 0x%x", hif_debug("hif_type = 0x%x, target_type = 0x%x",
__func__, hif_type, target_type); hif_type, target_type);
hif_register_tbl_attach(ol_sc, hif_type); hif_register_tbl_attach(ol_sc, hif_type);
hif_target_register_tbl_attach(ol_sc, target_type); hif_target_register_tbl_attach(ol_sc, target_type);

14
hif/src/mp_dev.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2014, 2016-2018 The Linux Foundation. All rights reserved. * Copyright (c) 2013-2014, 2016-2018, 2020 The Linux Foundation. All rights reserved.
* *
* Permission to use, copy, modify, and/or distribute this software for * Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the * any purpose with or without fee is hereby granted, provided that the
@@ -132,7 +132,7 @@ void priv_dump_chaninfo(struct hif_softc *scn)
chain0 = chain_mask & 1; chain0 = chain_mask & 1;
chain1 = chain_mask & 2; chain1 = chain_mask & 2;
HIF_TRACE("%s: E", __func__); hif_info("E");
bw = get_target_reg_bits(scn, scn->mem, BB_chaninfo_ctrl, bw = get_target_reg_bits(scn, scn->mem, BB_chaninfo_ctrl,
CHANINFO_CTRL_CHANINFOMEM_BW_MASK); CHANINFO_CTRL_CHANINFOMEM_BW_MASK);
@@ -246,7 +246,7 @@ void priv_dump_chaninfo(struct hif_softc *scn)
} }
} }
} }
HIF_TRACE("%s: X", __func__); hif_info("X");
} }
void priv_dump_agc(struct hif_softc *scn) void priv_dump_agc(struct hif_softc *scn)
@@ -269,7 +269,7 @@ void priv_dump_agc(struct hif_softc *scn)
set_target_reg_bits(scn, scn->mem, BB_chaninfo_ctrl, set_target_reg_bits(scn, scn->mem, BB_chaninfo_ctrl,
CHANINFOMEM_S2_READ_MASK, 0); CHANINFOMEM_S2_READ_MASK, 0);
HIF_TRACE("%s: AGC history buffer dump: E", __func__); hif_info("AGC history buffer dump: E");
if (chain0) { if (chain0) {
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
hif_write32_mb(scn, scn->mem + hif_write32_mb(scn, scn->mem +
@@ -294,7 +294,7 @@ void priv_dump_agc(struct hif_softc *scn)
qdf_debug("\n"); qdf_debug("\n");
} }
} }
HIF_TRACE("%s: AGC history buffer dump X", __func__); hif_info("AGC history buffer dump X");
/* restore original value */ /* restore original value */
hif_write32_mb(scn, scn->mem + BB_gains_min_offsets, hif_write32_mb(scn, scn->mem + BB_gains_min_offsets,
g_priv_dump_ctx.gain_min_offsets_orig); g_priv_dump_ctx.gain_min_offsets_orig);
@@ -307,7 +307,7 @@ void priv_dump_bbwatchdog(struct hif_softc *scn)
{ {
uint32_t val; uint32_t val;
HIF_TRACE("%s: BB watchdog dump E", __func__); hif_info("BB watchdog dump E");
val = hif_read32_mb(scn, scn->mem + BB_watchdog_status); val = hif_read32_mb(scn, scn->mem + BB_watchdog_status);
qdf_debug("0x%x\t", val); qdf_debug("0x%x\t", val);
val = hif_read32_mb(scn, scn->mem + BB_watchdog_ctrl_1); val = hif_read32_mb(scn, scn->mem + BB_watchdog_ctrl_1);
@@ -316,5 +316,5 @@ void priv_dump_bbwatchdog(struct hif_softc *scn)
qdf_debug("0x%x\t", val); qdf_debug("0x%x\t", val);
val = hif_read32_mb(scn, scn->mem + BB_watchdog_status_B); val = hif_read32_mb(scn, scn->mem + BB_watchdog_status_B);
qdf_debug("0x%x", val); qdf_debug("0x%x", val);
HIF_TRACE("%s: BB watchdog dump X", __func__); hif_info("BB watchdog dump X");
} }

36
hif/src/pcie/if_pci.c
View File

@@ -1231,7 +1231,7 @@ static void hif_set_hia_extnd(struct hif_softc *scn)
struct hif_target_info *tgt_info = hif_get_target_info_handle(hif_hdl); struct hif_target_info *tgt_info = hif_get_target_info_handle(hif_hdl);
uint32_t target_type = tgt_info->target_type; uint32_t target_type = tgt_info->target_type;
HIF_TRACE("%s: E", __func__); hif_info("E");
if ((target_type == TARGET_TYPE_AR900B) || if ((target_type == TARGET_TYPE_AR900B) ||
target_type == TARGET_TYPE_QCA9984 || target_type == TARGET_TYPE_QCA9984 ||
@@ -1408,7 +1408,7 @@ static int hif_set_hia(struct hif_softc *scn)
static struct CE_pipe_config *target_ce_config; static struct CE_pipe_config *target_ce_config;
struct service_to_pipe *target_service_to_ce_map; struct service_to_pipe *target_service_to_ce_map;
HIF_TRACE("%s: E", __func__); hif_info("E");
hif_get_target_ce_config(scn, hif_get_target_ce_config(scn,
&target_ce_config, &target_ce_config_sz, &target_ce_config, &target_ce_config_sz,
@@ -1994,7 +1994,7 @@ static int hif_pci_configure_legacy_irq(struct hif_pci_softc *sc)
struct hif_softc *scn = HIF_GET_SOFTC(sc); struct hif_softc *scn = HIF_GET_SOFTC(sc);
uint32_t target_type = scn->target_info.target_type; uint32_t target_type = scn->target_info.target_type;
HIF_TRACE("%s: E", __func__); hif_info("E");
/* do notn support MSI or MSI IRQ failed */ /* do notn support MSI or MSI IRQ failed */
tasklet_init(&sc->intr_tq, wlan_tasklet, (unsigned long)sc); tasklet_init(&sc->intr_tq, wlan_tasklet, (unsigned long)sc);
@@ -3114,7 +3114,7 @@ int hif_configure_irq(struct hif_softc *scn)
int ret = 0; int ret = 0;
struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(scn); struct hif_pci_softc *sc = HIF_GET_PCI_SOFTC(scn);
HIF_TRACE("%s: E", __func__); hif_info("E");
if (hif_is_polled_mode_enabled(GET_HIF_OPAQUE_HDL(scn))) { if (hif_is_polled_mode_enabled(GET_HIF_OPAQUE_HDL(scn))) {
scn->request_irq_done = false; scn->request_irq_done = false;
@@ -3207,7 +3207,7 @@ static void hif_target_sync(struct hif_softc *scn)
int retry_count = 0; int retry_count = 0;
uint32_t target_type = scn->target_info.target_type; uint32_t target_type = scn->target_info.target_type;
fw_retry: fw_retry:
HIF_TRACE("%s: Loop checking FW signal", __func__); hif_info("Loop checking FW signal");
while (1) { while (1) {
fw_ind = hif_read32_mb(scn, scn->mem + fw_ind = hif_read32_mb(scn, scn->mem +
FW_INDICATOR_ADDRESS); FW_INDICATOR_ADDRESS);
@@ -3231,12 +3231,10 @@ fw_retry:
wait_limit = 500; wait_limit = 500;
goto fw_retry; goto fw_retry;
} }
HIF_TRACE("%s: FW signal timed out", hif_info("FW signal timed out");
__func__);
qdf_assert_always(0); qdf_assert_always(0);
} else { } else {
HIF_TRACE("%s: Got FW signal, retries = %x", hif_info("Got FW signal, retries = %x", 500-wait_limit);
__func__, 500-wait_limit);
} }
} }
hif_write32_mb(scn, scn->mem + PCIE_LOCAL_BASE_ADDRESS + hif_write32_mb(scn, scn->mem + PCIE_LOCAL_BASE_ADDRESS +
@@ -3351,8 +3349,8 @@ QDF_STATUS hif_pci_enable_bus(struct hif_softc *ol_sc,
/* Following print is used by various tools to identify /* Following print is used by various tools to identify
* WLAN SOC (e.g. crash dump analysis and reporting tool). * WLAN SOC (e.g. crash dump analysis and reporting tool).
*/ */
HIF_TRACE("%s: con_mode = 0x%x, WLAN_SOC_device_id = 0x%x", hif_info("con_mode = 0x%x, WLAN_SOC_device_id = 0x%x",
__func__, hif_get_conparam(ol_sc), id->device); hif_get_conparam(ol_sc), id->device);
sc->pdev = pdev; sc->pdev = pdev;
sc->dev = &pdev->dev; sc->dev = &pdev->dev;
@@ -3367,7 +3365,7 @@ again:
hif_err("hif_enable_pci error = %d", ret); hif_err("hif_enable_pci error = %d", ret);
goto err_enable_pci; goto err_enable_pci;
} }
HIF_TRACE("%s: hif_enable_pci done", __func__); hif_info("hif_enable_pci done");
/* Temporary FIX: disable ASPM on peregrine. /* Temporary FIX: disable ASPM on peregrine.
* Will be removed after the OTP is programmed * Will be removed after the OTP is programmed
@@ -3383,8 +3381,8 @@ again:
hif_err("Invalid device id/revision_id"); hif_err("Invalid device id/revision_id");
goto err_tgtstate; goto err_tgtstate;
} }
HIF_TRACE("%s: hif_type = 0x%x, target_type = 0x%x", hif_info("hif_type = 0x%x, target_type = 0x%x",
__func__, hif_type, target_type); hif_type, target_type);
hif_register_tbl_attach(ol_sc, hif_type); hif_register_tbl_attach(ol_sc, hif_type);
hif_target_register_tbl_attach(ol_sc, target_type); hif_target_register_tbl_attach(ol_sc, target_type);
@@ -3400,7 +3398,7 @@ again:
ol_sc->irq_unlazy_disable = 1; ol_sc->irq_unlazy_disable = 1;
if (ce_srng_based(ol_sc)) { if (ce_srng_based(ol_sc)) {
HIF_TRACE("%s:Skip tgt_wake up for srng devices\n", __func__); hif_info("Skip tgt_wake up for srng devices");
} else { } else {
ret = hif_pci_probe_tgt_wakeup(sc); ret = hif_pci_probe_tgt_wakeup(sc);
if (ret < 0) { if (ret < 0) {
@@ -3409,7 +3407,7 @@ again:
probe_again++; probe_again++;
goto err_tgtstate; goto err_tgtstate;
} }
HIF_TRACE("%s: hif_pci_probe_tgt_wakeup done", __func__); hif_info("hif_pci_probe_tgt_wakeup done");
} }
if (!ol_sc->mem_pa) { if (!ol_sc->mem_pa) {
@@ -3533,9 +3531,9 @@ int hif_pci_addr_in_boundary(struct hif_softc *scn, uint32_t offset)
return 0; return 0;
} }
HIF_TRACE("Refusing to read memory at 0x%x - 0x%x (max 0x%zx)\n", hif_info("Refusing to read memory at 0x%x - 0x%x (max 0x%zx)",
offset, (uint32_t)(offset + sizeof(unsigned int)), offset, (uint32_t)(offset + sizeof(unsigned int)),
sc->mem_len); sc->mem_len);
return -EINVAL; return -EINVAL;
} }

20
hif/src/regtable.c
View File

@@ -130,7 +130,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCN9000: case TARGET_TYPE_QCN9000:
scn->targetdef = QCN9000_TARGETDEF; scn->targetdef = QCN9000_TARGETDEF;
scn->target_ce_def = QCN9000_CE_TARGETDEF; scn->target_ce_def = QCN9000_CE_TARGETDEF;
HIF_TRACE("%s: TARGET_TYPE_QCN9000", __func__); hif_info("TARGET_TYPE_QCN9000");
break; break;
#endif #endif
@@ -138,7 +138,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCN9100: case TARGET_TYPE_QCN9100:
scn->targetdef = QCN9100_TARGETDEF; scn->targetdef = QCN9100_TARGETDEF;
scn->target_ce_def = QCN9100_CE_TARGETDEF; scn->target_ce_def = QCN9100_CE_TARGETDEF;
HIF_TRACE("%s: TARGET_TYPE_QCN9100", __func__); hif_info("TARGET_TYPE_QCN9100");
break; break;
#endif #endif
@@ -146,7 +146,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCA5018: case TARGET_TYPE_QCA5018:
scn->targetdef = QCA5018_TARGETDEF; scn->targetdef = QCA5018_TARGETDEF;
scn->target_ce_def = QCA5018_CE_TARGETDEF; scn->target_ce_def = QCA5018_CE_TARGETDEF;
HIF_TRACE("%s: TARGET_TYPE_QCA5018", __func__); hif_info("TARGET_TYPE_QCA5018");
break; break;
#endif #endif
@@ -154,7 +154,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCA6390: case TARGET_TYPE_QCA6390:
scn->targetdef = QCA6390_TARGETdef; scn->targetdef = QCA6390_TARGETdef;
scn->target_ce_def = QCA6390_CE_TARGETdef; scn->target_ce_def = QCA6390_CE_TARGETdef;
HIF_TRACE("%s: TARGET_TYPE_QCA6390", __func__); hif_info("TARGET_TYPE_QCA6390");
break; break;
#endif /* QCA6390_HEADERS_DEF */ #endif /* QCA6390_HEADERS_DEF */
@@ -162,7 +162,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCA6490: case TARGET_TYPE_QCA6490:
scn->targetdef = QCA6490_TARGETdef; scn->targetdef = QCA6490_TARGETdef;
scn->target_ce_def = QCA6490_CE_TARGETdef; scn->target_ce_def = QCA6490_CE_TARGETdef;
HIF_TRACE("%s: TARGET_TYPE_QCA6490", __func__); hif_info("TARGET_TYPE_QCA6490");
break; break;
#endif /* QCA6490_HEADERS_DEF */ #endif /* QCA6490_HEADERS_DEF */
@@ -170,7 +170,7 @@ void hif_target_register_tbl_attach(struct hif_softc *scn, u32 target_type)
case TARGET_TYPE_QCA6750: case TARGET_TYPE_QCA6750:
scn->targetdef = QCA6750_TARGETdef; scn->targetdef = QCA6750_TARGETdef;
scn->target_ce_def = QCA6750_CE_TARGETdef; scn->target_ce_def = QCA6750_CE_TARGETdef;
HIF_TRACE("%s: TARGET_TYPE_QCA6750", __func__); hif_info("TARGET_TYPE_QCA6750");
break; break;
#endif /* QCA6750_HEADERS_DEF */ #endif /* QCA6750_HEADERS_DEF */
default: default:
@@ -253,7 +253,7 @@ void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type)
#if defined(QCA6018_HEADERS_DEF) #if defined(QCA6018_HEADERS_DEF)
case HIF_TYPE_QCA6018: case HIF_TYPE_QCA6018:
scn->hostdef = QCA6018_HOSTDEF; scn->hostdef = QCA6018_HOSTDEF;
HIF_TRACE("%s: HIF_TYPE_QCA6018", __func__); hif_info("HIF_TYPE_QCA6018");
break; break;
#endif #endif
#if defined(QCA6290_HEADERS_DEF) #if defined(QCA6290_HEADERS_DEF)
@@ -280,21 +280,21 @@ void hif_register_tbl_attach(struct hif_softc *scn, u32 hif_type)
#if defined(QCA6390_HEADERS_DEF) #if defined(QCA6390_HEADERS_DEF)
case HIF_TYPE_QCA6390: case HIF_TYPE_QCA6390:
scn->hostdef = QCA6390_HOSTdef; scn->hostdef = QCA6390_HOSTdef;
HIF_TRACE("%s: HIF_TYPE_QCA6390", __func__); hif_info("HIF_TYPE_QCA6390");
break; break;
#endif /* QCA6390_HEADERS_DEF */ #endif /* QCA6390_HEADERS_DEF */
#if defined(QCA6490_HEADERS_DEF) #if defined(QCA6490_HEADERS_DEF)
case HIF_TYPE_QCA6490: case HIF_TYPE_QCA6490:
scn->hostdef = QCA6490_HOSTdef; scn->hostdef = QCA6490_HOSTdef;
HIF_TRACE("%s: HIF_TYPE_QCA6490", __func__); hif_info("HIF_TYPE_QCA6490");
break; break;
#endif /* QCA6490_HEADERS_DEF */ #endif /* QCA6490_HEADERS_DEF */
#if defined(QCA6750_HEADERS_DEF) #if defined(QCA6750_HEADERS_DEF)
case HIF_TYPE_QCA6750: case HIF_TYPE_QCA6750:
scn->hostdef = QCA6750_HOSTdef; scn->hostdef = QCA6750_HOSTdef;
HIF_TRACE("%s: HIF_TYPE_QCA6750", __func__); hif_info("HIF_TYPE_QCA6750");
break; break;
#endif /* QCA6750_HEADERS_DEF */ #endif /* QCA6750_HEADERS_DEF */
default: default:

9
hif/src/snoc/if_ahb.c
View File

@@ -452,11 +452,10 @@ int hif_target_sync_ahb(struct hif_softc *scn)
qdf_mdelay(10); qdf_mdelay(10);
} }
if (wait_limit < 0) { if (wait_limit < 0) {
HIF_TRACE("%s: FW signal timed out", __func__); hif_info("FW signal timed out");
return -EIO; return -EIO;
} }
HIF_TRACE("%s: Got FW signal, retries = %x", __func__, hif_info("Got FW signal, retries = %x", 500-wait_limit);
500-wait_limit);
} }
return 0; return 0;
@@ -656,8 +655,8 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc,
goto err_target_sync; goto err_target_sync;
} }
} }
HIF_TRACE("%s: X - hif_type = 0x%x, target_type = 0x%x", hif_info("X - hif_type = 0x%x, target_type = 0x%x",
__func__, hif_type, target_type); hif_type, target_type);
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
err_target_sync: err_target_sync:

24
hif/src/usb/hif_usb.c
View File

@@ -347,7 +347,7 @@ void hif_usb_device_deinit(struct hif_usb_softc *sc)
{ {
struct HIF_DEVICE_USB *device = &sc->hif_hdl; struct HIF_DEVICE_USB *device = &sc->hif_hdl;
HIF_TRACE("+%s", __func__); hif_info("+");
usb_hif_cleanup_pipe_resources(device); usb_hif_cleanup_pipe_resources(device);
@@ -357,7 +357,7 @@ void hif_usb_device_deinit(struct hif_usb_softc *sc)
if (device->diag_resp_buffer) if (device->diag_resp_buffer)
qdf_mem_free(device->diag_resp_buffer); qdf_mem_free(device->diag_resp_buffer);
HIF_TRACE("-%s", __func__); hif_info("-");
} }
/** /**
@@ -375,7 +375,7 @@ QDF_STATUS hif_usb_device_init(struct hif_usb_softc *sc)
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
struct HIF_USB_PIPE *pipe; struct HIF_USB_PIPE *pipe;
HIF_TRACE("+%s", __func__); hif_info("+");
do { do {
@@ -421,7 +421,7 @@ QDF_STATUS hif_usb_device_init(struct hif_usb_softc *sc)
if (status != QDF_STATUS_SUCCESS) if (status != QDF_STATUS_SUCCESS)
hif_err("abnormal condition (status=%d)", status); hif_err("abnormal condition (status=%d)", status);
HIF_TRACE("+%s", __func__); hif_info("+");
return status; return status;
} }
@@ -436,7 +436,7 @@ QDF_STATUS hif_start(struct hif_opaque_softc *scn)
struct HIF_DEVICE_USB *device = HIF_GET_USB_DEVICE(scn); struct HIF_DEVICE_USB *device = HIF_GET_USB_DEVICE(scn);
int i; int i;
HIF_TRACE("+%s", __func__); hif_info("+");
usb_hif_prestart_recv_pipes(device); usb_hif_prestart_recv_pipes(device);
/* set the TX resource avail threshold for each TX pipe */ /* set the TX resource avail threshold for each TX pipe */
@@ -445,7 +445,7 @@ QDF_STATUS hif_start(struct hif_opaque_softc *scn)
device->pipes[i].urb_alloc / 2; device->pipes[i].urb_alloc / 2;
} }
HIF_TRACE("-%s", __func__); hif_info("-");
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
@@ -459,11 +459,11 @@ void hif_usb_stop_device(struct hif_softc *hif_sc)
{ {
struct HIF_DEVICE_USB *device = HIF_GET_USB_DEVICE(hif_sc); struct HIF_DEVICE_USB *device = HIF_GET_USB_DEVICE(hif_sc);
HIF_TRACE("+%s", __func__); hif_info("+");
usb_hif_flush_all(device); usb_hif_flush_all(device);
HIF_TRACE("-%s", __func__); hif_info("-");
} }
/** /**
@@ -844,7 +844,7 @@ QDF_STATUS hif_diag_read_mem(struct hif_opaque_softc *scn,
{ {
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
HIF_TRACE("+%s", __func__); hif_info("+");
if ((address & 0x3) || ((uintptr_t)data & 0x3)) if ((address & 0x3) || ((uintptr_t)data & 0x3))
return QDF_STATUS_E_IO; return QDF_STATUS_E_IO;
@@ -860,7 +860,7 @@ QDF_STATUS hif_diag_read_mem(struct hif_opaque_softc *scn,
data += sizeof(uint32_t); data += sizeof(uint32_t);
} }
HIF_TRACE("-%s", __func__); hif_info("-");
return status; return status;
} }
qdf_export_symbol(hif_diag_read_mem); qdf_export_symbol(hif_diag_read_mem);
@@ -880,7 +880,7 @@ QDF_STATUS hif_diag_write_mem(struct hif_opaque_softc *scn,
{ {
QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS status = QDF_STATUS_SUCCESS;
HIF_TRACE("+%s", __func__); hif_info("+");
if ((address & 0x3) || ((uintptr_t)data & 0x3)) if ((address & 0x3) || ((uintptr_t)data & 0x3))
return QDF_STATUS_E_IO; return QDF_STATUS_E_IO;
@@ -895,7 +895,7 @@ QDF_STATUS hif_diag_write_mem(struct hif_opaque_softc *scn,
data += sizeof(uint32_t); data += sizeof(uint32_t);
} }
HIF_TRACE("-%s", __func__); hif_info("-");
return status; return status;
} }

14
hif/src/usb/if_usb.c
View File

@@ -153,17 +153,15 @@ static int hif_usb_disable_lpm(struct usb_device *udev)
if (!ret) { if (!ret) {
udev->usb2_hw_lpm_enabled = false; udev->usb2_hw_lpm_enabled = false;
udev->usb2_hw_lpm_capable = false; udev->usb2_hw_lpm_capable = false;
HIF_TRACE("%s: LPM is disabled", __func__); hif_info("LPM is disabled");
} else { } else {
HIF_TRACE("%s: Fail to disable LPM", hif_info("Fail to disable LPM");
__func__);
} }
} else { } else {
HIF_TRACE("%s: hcd doesn't support LPM", hif_info("hcd doesn't support LPM");
__func__);
} }
} else { } else {
HIF_TRACE("%s: LPM isn't enabled", __func__); hif_info("LPM isn't enabled");
} }
exit: exit:
HIF_EXIT(); HIF_EXIT();
@@ -302,7 +300,7 @@ void hif_usb_disable_bus(struct hif_softc *hif_ctx)
struct usb_device *udev = interface_to_usbdev(interface); struct usb_device *udev = interface_to_usbdev(interface);
struct hif_target_info *tgt_info = &hif_ctx->target_info; struct hif_target_info *tgt_info = &hif_ctx->target_info;
HIF_TRACE("%s: trying to remove hif_usb!", __func__); hif_info("trying to remove hif_usb!");
/* disable lpm to avoid following cold reset will /* disable lpm to avoid following cold reset will
* cause xHCI U1/U2 timeout * cause xHCI U1/U2 timeout
@@ -328,7 +326,7 @@ void hif_usb_disable_bus(struct hif_softc *hif_ctx)
hif_usb_device_deinit(sc); hif_usb_device_deinit(sc);
HIF_TRACE("%s hif_usb removed !!!!!!", __func__); hif_info("hif_usb removed !!!!!!");
} }
/** /**

26
hif/src/usb/usbdrv.c
View File

@@ -197,7 +197,7 @@ static void usb_hif_free_pipe_resources(struct HIF_USB_PIPE *pipe)
return; return;
} }
HIF_TRACE("athusb: free resources lpipe:%d hpipe:0x%X urbs:%d avail:%d", hif_info("athusb: free resources lpipe:%d hpipe:0x%X urbs:%d avail:%d",
pipe->logical_pipe_num, pipe->logical_pipe_num,
pipe->usb_pipe_handle, pipe->urb_alloc, pipe->usb_pipe_handle, pipe->urb_alloc,
pipe->urb_cnt); pipe->urb_cnt);
@@ -459,7 +459,7 @@ static void usb_hif_flush_pending_transfers(struct HIF_USB_PIPE *pipe)
{ {
struct HIF_URB_CONTEXT *urb_context; struct HIF_URB_CONTEXT *urb_context;
HIF_TRACE("+%s pipe : %d", __func__, pipe->logical_pipe_num); hif_info("+ pipe: %d", pipe->logical_pipe_num);
while (1) { while (1) {
urb_context = usb_hif_dequeue_pending_transfer(pipe); urb_context = usb_hif_dequeue_pending_transfer(pipe);
@@ -467,16 +467,16 @@ static void usb_hif_flush_pending_transfers(struct HIF_USB_PIPE *pipe)
hif_warn("urb_context is NULL"); hif_warn("urb_context is NULL");
break; break;
} }
HIF_TRACE(" pending urb ctxt: 0x%pK", urb_context); hif_info("pending urb ctxt: 0x%pK", urb_context);
if (urb_context->urb) { if (urb_context->urb) {
HIF_TRACE(" killing urb: 0x%pK", urb_context->urb); hif_info("killing urb: 0x%pK", urb_context->urb);
/* killing the URB will cause the completion routines to /* killing the URB will cause the completion routines to
* run * run
*/ */
usb_kill_urb(urb_context->urb); usb_kill_urb(urb_context->urb);
} }
} }
HIF_TRACE("-%s", __func__); hif_info("-");
} }
/** /**
@@ -490,7 +490,7 @@ void usb_hif_flush_all(struct HIF_DEVICE_USB *device)
int i; int i;
struct HIF_USB_PIPE *pipe; struct HIF_USB_PIPE *pipe;
HIF_TRACE("+%s", __func__); hif_info("+");
for (i = 0; i < HIF_USB_PIPE_MAX; i++) { for (i = 0; i < HIF_USB_PIPE_MAX; i++) {
if (device->pipes[i].device) { if (device->pipes[i].device) {
@@ -501,7 +501,7 @@ void usb_hif_flush_all(struct HIF_DEVICE_USB *device)
} }
} }
HIF_TRACE("-%s", __func__); hif_info("-");
} }
/** /**
@@ -865,7 +865,7 @@ static void usb_hif_post_recv_prestart_transfers(struct HIF_USB_PIPE *recv_pipe,
struct urb *urb; struct urb *urb;
int i, usb_status, buffer_length = HIF_USB_RX_BUFFER_SIZE; int i, usb_status, buffer_length = HIF_USB_RX_BUFFER_SIZE;
HIF_TRACE("+%s", __func__); hif_info("+");
qdf_spin_lock_irqsave(&recv_pipe->device->rx_prestart_lock); qdf_spin_lock_irqsave(&recv_pipe->device->rx_prestart_lock);
for (i = 0; i < prestart_urb; i++) { for (i = 0; i < prestart_urb; i++) {
@@ -912,7 +912,7 @@ static void usb_hif_post_recv_prestart_transfers(struct HIF_USB_PIPE *recv_pipe,
} }
qdf_spin_unlock_irqrestore(&recv_pipe->device->rx_prestart_lock); qdf_spin_unlock_irqrestore(&recv_pipe->device->rx_prestart_lock);
HIF_TRACE("-%s", __func__); hif_info("-");
} }
/** /**
@@ -1084,7 +1084,7 @@ void usb_hif_start_recv_pipes(struct HIF_DEVICE_USB *device)
pipe = &device->pipes[HIF_RX_DATA_PIPE]; pipe = &device->pipes[HIF_RX_DATA_PIPE];
pipe->urb_cnt_thresh = pipe->urb_alloc / 2; pipe->urb_cnt_thresh = pipe->urb_alloc / 2;
HIF_TRACE("Post URBs to RX_DATA_PIPE: %d is_bundle %d", hif_info("Post URBs to RX_DATA_PIPE: %d is_bundle %d",
device->pipes[HIF_RX_DATA_PIPE].urb_cnt, device->pipes[HIF_RX_DATA_PIPE].urb_cnt,
device->is_bundle_enabled); device->is_bundle_enabled);
if (device->is_bundle_enabled) { if (device->is_bundle_enabled) {
@@ -1098,7 +1098,7 @@ void usb_hif_start_recv_pipes(struct HIF_DEVICE_USB *device)
HIF_DBG("athusb bulk recv len %d", buf_len); HIF_DBG("athusb bulk recv len %d", buf_len);
if (!hif_usb_disable_rxdata2) { if (!hif_usb_disable_rxdata2) {
HIF_TRACE("Post URBs to RX_DATA2_PIPE: %d", hif_info("Post URBs to RX_DATA2_PIPE: %d",
device->pipes[HIF_RX_DATA2_PIPE].urb_cnt); device->pipes[HIF_RX_DATA2_PIPE].urb_cnt);
pipe = &device->pipes[HIF_RX_DATA2_PIPE]; pipe = &device->pipes[HIF_RX_DATA2_PIPE];
@@ -1107,8 +1107,8 @@ void usb_hif_start_recv_pipes(struct HIF_DEVICE_USB *device)
} }
if (device->rx_ctrl_pipe_supported) { if (device->rx_ctrl_pipe_supported) {
HIF_TRACE("Post URBs to RX_CONTROL_PIPE: %d", hif_info("Post URBs to RX_CONTROL_PIPE: %d",
device->pipes[HIF_RX_CTRL_PIPE].urb_cnt); device->pipes[HIF_RX_CTRL_PIPE].urb_cnt);
pipe = &device->pipes[HIF_RX_CTRL_PIPE]; pipe = &device->pipes[HIF_RX_CTRL_PIPE];
pipe->urb_cnt_thresh = pipe->urb_alloc / 2; pipe->urb_cnt_thresh = pipe->urb_alloc / 2;