diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c index 894f46e21e..d928303113 100644 --- a/hif/src/ce/ce_main.c +++ b/hif/src/ce/ce_main.c @@ -1851,7 +1851,7 @@ void hif_enable_fastpath(struct hif_opaque_softc *hif_ctx) struct hif_softc *scn = HIF_GET_SOFTC(hif_ctx); if (ce_srng_based(scn)) { - HIF_INFO("%s, srng rings do not support fastpath", __func__); + hif_warn("srng rings do not support fastpath"); return; } HIF_DBG("%s, Enabling fastpath mode", __func__); diff --git a/hif/src/ce/ce_service_srng.c b/hif/src/ce/ce_service_srng.c index a3f53b80b6..21b22c1687 100644 --- a/hif/src/ce/ce_service_srng.c +++ b/hif/src/ce/ce_service_srng.c @@ -807,7 +807,7 @@ static void ce_srng_dest_ring_setup(struct hif_softc *scn, struct hal_srng_params ring_params = {0}; bool status_ring_timer_thresh_work_arround = true; - HIF_INFO("%s: ce_id %d", __func__, ce_id); + hif_debug("ce_id: %d", ce_id); ring_params.ring_base_paddr = dest_ring->base_addr_CE_space; ring_params.ring_base_vaddr = dest_ring->base_addr_owner_space; @@ -868,7 +868,7 @@ static void ce_srng_status_ring_setup(struct hif_softc *scn, uint32_t ce_id, { struct hal_srng_params ring_params = {0}; - HIF_INFO("%s: ce_id %d", __func__, ce_id); + hif_debug("ce_id: %d", ce_id); ce_srng_msi_ring_params_setup(scn, ce_id, &ring_params); diff --git a/hif/src/ce/ce_tasklet.c b/hif/src/ce/ce_tasklet.c index a83bcd1344..b9de93c6a2 100644 --- a/hif/src/ce/ce_tasklet.c +++ b/hif/src/ce/ce_tasklet.c @@ -470,7 +470,7 @@ int hif_drain_tasklets(struct hif_softc *scn) return -EFAULT; } - HIF_INFO("%s: Waiting for CE to finish access", __func__); + hif_info("Waiting for CE to finish access"); msleep(10); } return 0; diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index ea92de3b28..e45f641de1 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -123,7 +123,7 @@ void hif_vote_link_down(struct hif_opaque_softc *hif_ctx) QDF_BUG(scn); scn->linkstate_vote--; - HIF_INFO("Down_linkstate_vote %d", scn->linkstate_vote); + hif_info("Down_linkstate_vote %d", scn->linkstate_vote); if (scn->linkstate_vote == 0) hif_bus_prevent_linkdown(scn, false); } @@ -145,7 +145,7 @@ void hif_vote_link_up(struct hif_opaque_softc *hif_ctx) QDF_BUG(scn); scn->linkstate_vote++; - HIF_INFO("Up_linkstate_vote %d", scn->linkstate_vote); + hif_info("Up_linkstate_vote %d", scn->linkstate_vote); if (scn->linkstate_vote == 1) hif_bus_prevent_linkdown(scn, true); } @@ -1104,56 +1104,56 @@ int hif_get_device_type(uint32_t device_id, case AR9887_DEVICE_ID: *hif_type = HIF_TYPE_AR9888; *target_type = TARGET_TYPE_AR9888; - HIF_INFO(" *********** AR9887 **************"); + hif_info(" *********** AR9887 **************"); break; case QCA9984_DEVICE_ID: *hif_type = HIF_TYPE_QCA9984; *target_type = TARGET_TYPE_QCA9984; - HIF_INFO(" *********** QCA9984 *************"); + hif_info(" *********** QCA9984 *************"); break; case QCA9888_DEVICE_ID: *hif_type = HIF_TYPE_QCA9888; *target_type = TARGET_TYPE_QCA9888; - HIF_INFO(" *********** QCA9888 *************"); + hif_info(" *********** QCA9888 *************"); break; case AR900B_DEVICE_ID: *hif_type = HIF_TYPE_AR900B; *target_type = TARGET_TYPE_AR900B; - HIF_INFO(" *********** AR900B *************"); + hif_info(" *********** AR900B *************"); break; case IPQ4019_DEVICE_ID: *hif_type = HIF_TYPE_IPQ4019; *target_type = TARGET_TYPE_IPQ4019; - HIF_INFO(" *********** IPQ4019 *************"); + hif_info(" *********** IPQ4019 *************"); break; case QCA8074_DEVICE_ID: *hif_type = HIF_TYPE_QCA8074; *target_type = TARGET_TYPE_QCA8074; - HIF_INFO(" *********** QCA8074 *************\n"); + hif_info(" *********** QCA8074 *************"); break; case QCA6290_EMULATION_DEVICE_ID: case QCA6290_DEVICE_ID: *hif_type = HIF_TYPE_QCA6290; *target_type = TARGET_TYPE_QCA6290; - HIF_INFO(" *********** QCA6290EMU *************\n"); + hif_info(" *********** QCA6290EMU *************"); break; case QCN9000_DEVICE_ID: *hif_type = HIF_TYPE_QCN9000; *target_type = TARGET_TYPE_QCN9000; - HIF_INFO(" *********** QCN9000 *************\n"); + hif_info(" *********** QCN9000 *************"); break; case QCN9100_DEVICE_ID: *hif_type = HIF_TYPE_QCN9100; *target_type = TARGET_TYPE_QCN9100; - HIF_INFO(" *********** QCN9100 *************\n"); + hif_info(" *********** QCN9100 *************"); break; case QCN7605_DEVICE_ID: @@ -1163,34 +1163,34 @@ int hif_get_device_type(uint32_t device_id, case QCN7605_COMPOSITE_V2: *hif_type = HIF_TYPE_QCN7605; *target_type = TARGET_TYPE_QCN7605; - HIF_INFO(" *********** QCN7605 *************\n"); + hif_info(" *********** QCN7605 *************"); break; case QCA6390_DEVICE_ID: case QCA6390_EMULATION_DEVICE_ID: *hif_type = HIF_TYPE_QCA6390; *target_type = TARGET_TYPE_QCA6390; - HIF_INFO(" *********** QCA6390 *************\n"); + hif_info(" *********** QCA6390 *************"); break; case QCA6490_DEVICE_ID: case QCA6490_EMULATION_DEVICE_ID: *hif_type = HIF_TYPE_QCA6490; *target_type = TARGET_TYPE_QCA6490; - HIF_INFO(" *********** QCA6490 *************\n"); + hif_info(" *********** QCA6490 *************"); break; case QCA6750_DEVICE_ID: case QCA6750_EMULATION_DEVICE_ID: *hif_type = HIF_TYPE_QCA6750; *target_type = TARGET_TYPE_QCA6750; - HIF_INFO(" *********** QCA6750 *************\n"); + hif_info(" *********** QCA6750 *************"); break; case QCA8074V2_DEVICE_ID: *hif_type = HIF_TYPE_QCA8074V2; *target_type = TARGET_TYPE_QCA8074V2; - HIF_INFO(" *********** QCA8074V2 *************\n"); + hif_info(" *********** QCA8074V2 *************"); break; case QCA6018_DEVICE_ID: @@ -1202,13 +1202,13 @@ int hif_get_device_type(uint32_t device_id, case RUMIM2M_DEVICE_ID_NODE5: *hif_type = HIF_TYPE_QCA6018; *target_type = TARGET_TYPE_QCA6018; - HIF_INFO(" *********** QCA6018 *************\n"); + hif_info(" *********** QCA6018 *************"); break; case QCA5018_DEVICE_ID: *hif_type = HIF_TYPE_QCA5018; *target_type = TARGET_TYPE_QCA5018; - HIF_INFO(" *********** qca5018 *************\n"); + hif_info(" *********** qca5018 *************"); break; default: @@ -1691,7 +1691,7 @@ irqreturn_t hif_wake_interrupt_handler(int irq, void *context) struct hif_softc *scn = context; struct hif_opaque_softc *hif_ctx = GET_HIF_OPAQUE_HDL(scn); - HIF_INFO("wake interrupt received on irq %d", irq); + hif_info("wake interrupt received on irq %d", irq); if (hif_pm_runtime_get_monitor_wake_intr(hif_ctx)) { hif_pm_runtime_set_monitor_wake_intr(hif_ctx, 0); diff --git a/hif/src/hif_runtime_pm.c b/hif/src/hif_runtime_pm.c index 781244398f..e986bd97b5 100644 --- a/hif/src/hif_runtime_pm.c +++ b/hif/src/hif_runtime_pm.c @@ -374,14 +374,13 @@ void hif_pm_runtime_start(struct hif_softc *scn) struct hif_runtime_pm_ctx *rpm_ctx = hif_bus_get_rpm_ctx(scn); if (!scn->hif_config.enable_runtime_pm) { - HIF_INFO("%s: RUNTIME PM is disabled in ini\n", __func__); + hif_info("RUNTIME PM is disabled in ini"); return; } if (mode == QDF_GLOBAL_FTM_MODE || QDF_IS_EPPING_ENABLED(mode) || mode == QDF_GLOBAL_MONITOR_MODE) { - HIF_INFO("%s: RUNTIME PM is disabled for FTM/EPPING mode\n", - __func__); + hif_info("RUNTIME PM is disabled for FTM/EPPING mode"); return; } @@ -389,7 +388,7 @@ void hif_pm_runtime_start(struct hif_softc *scn) hif_pm_runtime_lock_timeout_fn, scn, QDF_TIMER_TYPE_WAKE_APPS); - HIF_INFO("%s: Enabling RUNTIME PM, Delay: %d ms", __func__, + hif_info("Enabling RUNTIME PM, Delay: %d ms", scn->hif_config.runtime_pm_delay); qdf_atomic_set(&rpm_ctx->pm_state, HIF_PM_RUNTIME_STATE_ON); @@ -581,7 +580,7 @@ int hif_pm_runtime_sync_resume(struct hif_opaque_softc *hif_ctx) pm_state = qdf_atomic_read(&rpm_ctx->pm_state); if (pm_state == HIF_PM_RUNTIME_STATE_SUSPENDED || pm_state == HIF_PM_RUNTIME_STATE_SUSPENDING) - HIF_INFO("Runtime PM resume is requested by %ps", + hif_info("Runtime PM resume is requested by %ps", (void *)_RET_IP_); rpm_ctx->pm_stats.request_resume++; @@ -1051,7 +1050,7 @@ int hif_pm_runtime_request_resume(struct hif_opaque_softc *hif_ctx) pm_state = qdf_atomic_read(&rpm_ctx->pm_state); if (pm_state == HIF_PM_RUNTIME_STATE_SUSPENDED || pm_state == HIF_PM_RUNTIME_STATE_SUSPENDING) - HIF_INFO("Runtime PM resume is requested by %ps", + hif_info("Runtime PM resume is requested by %ps", (void *)_RET_IP_); rpm_ctx->pm_stats.request_resume++; @@ -1532,7 +1531,7 @@ int hif_runtime_lock_init(qdf_runtime_lock_t *lock, const char *name) { struct hif_pm_runtime_lock *context; - HIF_INFO("Initializing Runtime PM wakelock %s", name); + hif_info("Initializing Runtime PM wakelock %s", name); context = qdf_mem_malloc(sizeof(*context)); if (!context) @@ -1562,7 +1561,7 @@ void hif_runtime_lock_deinit(struct hif_opaque_softc *hif_ctx, return; } - HIF_INFO("Deinitializing Runtime PM wakelock %s", context->name); + hif_info("Deinitializing Runtime PM wakelock %s", context->name); /* * Ensure to delete the context list entry and reduce the usage count diff --git a/hif/src/ipcie/if_ipci.c b/hif/src/ipcie/if_ipci.c index 3acc28d31e..72182fec9c 100644 --- a/hif/src/ipcie/if_ipci.c +++ b/hif/src/ipcie/if_ipci.c @@ -151,7 +151,7 @@ int hif_ipci_bus_configure(struct hif_softc *hif_sc) hif_sc->wake_irq = hif_ce_msi_map_ce_to_irq(hif_sc, wake_ce_id); - HIF_INFO("expecting wake from ce %d, irq %d", + hif_info("expecting wake from ce %d, irq %d", wake_ce_id, hif_sc->wake_irq); A_TARGET_ACCESS_UNLIKELY(hif_sc); @@ -284,7 +284,7 @@ void hif_ipci_disable_bus(struct hif_softc *scn) } scn->mem = NULL; } - HIF_INFO("%s: X", __func__); + hif_info("X"); } #if defined(CONFIG_PCI_MSM) @@ -292,7 +292,7 @@ void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag) { int errno; - HIF_INFO("wlan: %s pcie power collapse", flag ? "disable" : "enable"); + hif_info("wlan: %s pcie power collapse", flag ? "disable" : "enable"); hif_runtime_prevent_linkdown(scn, flag); errno = pld_wlan_pm_control(scn->qdf_dev->dev, flag); @@ -302,7 +302,7 @@ void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag) #else void hif_ipci_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_INFO("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); + hif_info("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); hif_runtime_prevent_linkdown(scn, flag); } #endif diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index f6fb1aee6c..2a12c9e92c 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -1057,7 +1057,7 @@ void hif_pci_enable_power_management(struct hif_softc *hif_sc, mode = hif_get_conparam(hif_sc); if (mode == QDF_GLOBAL_FTM_MODE) { - HIF_INFO("%s: Enable power gating for FTM mode", __func__); + hif_info("Enable power gating for FTM mode"); hif_enable_power_gating(pci_ctx); return; } @@ -1857,7 +1857,7 @@ static int hif_enable_pci_nopld(struct hif_pci_softc *sc, goto err_iomap; } - HIF_INFO("*****BAR is %pK\n", (void *)mem); + hif_info("*****BAR is %pK", (void *)mem); sc->mem = mem; @@ -1870,8 +1870,7 @@ static int hif_enable_pci_nopld(struct hif_pci_softc *sc, (device_id == RUMIM2M_DEVICE_ID_NODE5)) { mem = mem + 0x0c000000; sc->mem = mem; - HIF_INFO("%s: Changing PCI mem base to %pK\n", - __func__, sc->mem); + hif_info("Changing PCI mem base to %pK", sc->mem); } sc->mem_len = pci_resource_len(pdev, BAR_NUM); @@ -2211,7 +2210,7 @@ void hif_pci_disable_bus(struct hif_softc *scn) sc->hif_pci_deinit(sc); scn->mem = NULL; } - HIF_INFO("%s: X", __func__); + hif_info("X"); } #ifdef FEATURE_RUNTIME_PM @@ -2264,7 +2263,7 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) { int errno; - HIF_INFO("wlan: %s pcie power collapse", flag ? "disable" : "enable"); + hif_info("wlan: %s pcie power collapse", flag ? "disable" : "enable"); hif_runtime_prevent_linkdown(scn, flag); errno = pld_wlan_pm_control(scn->qdf_dev->dev, flag); @@ -2274,7 +2273,7 @@ void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) #else void hif_pci_prevent_linkdown(struct hif_softc *scn, bool flag) { - HIF_INFO("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); + hif_info("wlan: %s pcie power collapse", (flag ? "disable" : "enable")); hif_runtime_prevent_linkdown(scn, flag); } #endif @@ -3442,7 +3441,7 @@ err_enable_pci: if (probe_again && (probe_again <= ATH_PCI_PROBE_RETRY_MAX)) { int delay_time; - HIF_INFO("%s: pci reprobe", __func__); + hif_info("pci reprobe"); /* 10, 40, 90, 100, 100, ... */ delay_time = max(100, 10 * (probe_again * probe_again)); qdf_mdelay(delay_time); @@ -3582,7 +3581,7 @@ int hif_force_wake_request(struct hif_opaque_softc *hif_handle) * without entering low power state. */ if (!pld_is_device_awake(scn->qdf_dev->dev)) - HIF_INFO("%s: state-change event races, ignore", __func__); + hif_info("state-change event races, ignore"); HIF_STATS_INC(pci_scn, mhi_force_wake_success, 1); hif_write32_mb(scn, @@ -3651,7 +3650,7 @@ int hif_force_wake_request(struct hif_opaque_softc *hif_handle) * without entering low power state. */ if (!pld_is_device_awake(scn->qdf_dev->dev)) - HIF_INFO("%s: state-change event races, ignore", __func__); + hif_info("state-change event races, ignore"); HIF_STATS_INC(pci_scn, mhi_force_wake_success, 1); diff --git a/hif/src/sdio/if_sdio.c b/hif/src/sdio/if_sdio.c index 99e6e86045..5be07e7fc6 100644 --- a/hif/src/sdio/if_sdio.c +++ b/hif/src/sdio/if_sdio.c @@ -273,7 +273,7 @@ int hif_check_fw_reg(struct hif_opaque_softc *hif_ctx) hif_err("Get fw indication failed"); return 1; } - HIF_INFO("%s: fw indication is 0x%x def 0x%x.\n", __func__, + hif_info("fw indication is 0x%x def 0x%x", fw_indication, FW_IND_HELPER); if (fw_indication & FW_IND_HELPER) ret = 0; diff --git a/hif/src/sdio/native_sdio/src/dev_quirks.c b/hif/src/sdio/native_sdio/src/dev_quirks.c index fe10065391..916135b9a7 100644 --- a/hif/src/sdio/native_sdio/src/dev_quirks.c +++ b/hif/src/sdio/native_sdio/src/dev_quirks.c @@ -266,8 +266,7 @@ void hif_sdio_quirk_write_cccr(struct hif_softc *ol_sc, struct sdio_func *func) (unsigned int)writecccr1value, err); else - HIF_INFO("%s Write CCCR 0x%02X to 0x%02X OK\n", - __func__, + hif_info("%s Write CCCR 0x%02X to 0x%02X OK", (unsigned int)writecccr1, writecccr1value); } @@ -281,8 +280,7 @@ void hif_sdio_quirk_write_cccr(struct hif_softc *ol_sc, struct sdio_func *func) (unsigned int)writecccr2value, err); else - HIF_INFO("%s Write CCCR 0x%02X to 0x%02X OK\n", - __func__, + hif_info("%s Write CCCR 0x%02X to 0x%02X OK", (unsigned int)writecccr2, (unsigned int)writecccr2value); } @@ -295,8 +293,7 @@ void hif_sdio_quirk_write_cccr(struct hif_softc *ol_sc, struct sdio_func *func) (unsigned int)writecccr3value, err); else - HIF_INFO("%s Write CCCR 0x%02X to 0x%02X OK\n", - __func__, + hif_info("%s Write CCCR 0x%02X to 0x%02X OK", (unsigned int)writecccr3, (unsigned int)writecccr3value); } @@ -309,8 +306,7 @@ void hif_sdio_quirk_write_cccr(struct hif_softc *ol_sc, struct sdio_func *func) (unsigned int)writecccr4value, err); else - HIF_INFO("%s Write CCCR 0x%02X to 0x%02X OK\n", - __func__, + hif_info("%s Write CCCR 0x%02X to 0x%02X OK", (unsigned int)writecccr4, (unsigned int)writecccr4value); } @@ -357,7 +353,7 @@ int hif_sdio_quirk_mod_strength(struct hif_softc *ol_sc, struct sdio_func *func) hif_err("write 0x%x 0x%x error:%d", addr, value, ret); break; } - HIF_INFO("%s: addr 0x%x val 0x%x", __func__, addr, value); + hif_info("addr 0x%x val 0x%x", addr, value); addr = WINDOW_WRITE_ADDR_ADDRESS; value = 0x50F8; @@ -366,7 +362,7 @@ int hif_sdio_quirk_mod_strength(struct hif_softc *ol_sc, struct sdio_func *func) hif_err("write 0x%x 0x%x error:%d", addr, value, ret); break; } - HIF_INFO("%s: addr 0x%x val 0x%x\n", __func__, addr, value); + hif_info("addr 0x%x val 0x%x", addr, value); break; } @@ -422,13 +418,12 @@ QDF_STATUS hif_sdio_set_bus_speed(struct hif_softc *ol_sc, if (clock > device->host->f_max) clock = device->host->f_max; - HIF_INFO("%s: Clock setting: (%d,%d)\n", __func__, + hif_info("Clock setting: (%d,%d)", func->card->cis.max_dtr, device->host->f_max); /* Limit clock if specified */ if (mmcclock > 0) { - HIF_INFO("%s: Limit clock from %d to %d\n", - __func__, clock, clock_set); + hif_info("Limit clock from %d to %d", clock, clock_set); device->host->ios.clock = clock_set; device->host->ops->set_ios(device->host, &device->host->ios); @@ -501,7 +496,7 @@ QDF_STATUS hif_sdio_set_bus_width(struct hif_softc *ol_sc, status = qdf_status_from_os_return(ret); out: - HIF_INFO("%s: Bus with : %d\n", __func__, mmcbuswidth); + hif_debug("Bus width: %d", mmcbuswidth); #endif return status; } @@ -584,7 +579,7 @@ void hif_un_mask_interrupt(struct hif_sdio_dev *device) * instead of interrupt mode. */ if (brokenirq) { - HIF_INFO("%s: Using broken IRQ mode", __func__); + hif_info("Using broken IRQ mode"); device->func->card->host->caps &= ~MMC_CAP_SDIO_IRQ; } /* Register the IRQ Handler */ diff --git a/hif/src/sdio/native_sdio/src/hif.c b/hif/src/sdio/native_sdio/src/hif.c index eea5935bb1..9ca2e21ca7 100644 --- a/hif/src/sdio/native_sdio/src/hif.c +++ b/hif/src/sdio/native_sdio/src/hif.c @@ -352,7 +352,7 @@ QDF_STATUS hif_sdio_probe(struct hif_softc *ol_sc, scn->ramdump_base ? "ok" : "null", scn->ramdump_size); } else { - HIF_INFO("%s: ramdump base %pK size %lu", __func__, + hif_info("ramdump base %pK size %lu", scn->ramdump_base, scn->ramdump_size); } @@ -577,8 +577,8 @@ static QDF_STATUS hif_device_inserted(struct hif_softc *ol_sc, QDF_STATUS ret = QDF_STATUS_SUCCESS; struct hif_sdio_dev *device = NULL; - HIF_INFO("%s: F%X, VID: 0x%X, DevID: 0x%X, block size: 0x%X/0x%X\n", - __func__, func->num, func->vendor, id->device, + hif_info("F%X, VID: 0x%X, DevID: 0x%X, block size: 0x%X/0x%X", + func->num, func->vendor, id->device, func->max_blksize, func->cur_blksize); /* dma_mask should be populated here. Use the parent device's setting */ @@ -596,7 +596,7 @@ static QDF_STATUS hif_device_inserted(struct hif_softc *ol_sc, hif_sdio_set_drvdata(ol_sc, func, hifdevice); if (device->is_suspend) { - HIF_INFO("%s: Resume from suspend", __func__); + hif_info("Resume from suspend"); ret = reinit_sdio(device); } break; @@ -797,7 +797,7 @@ int hif_device_suspend(struct hif_softc *ol_sc, struct device *dev) /* setting power_config before hif_configure_device to * skip sdio r/w when suspending with cut power */ - HIF_INFO("%s: Power cut", __func__); + hif_info("Power cut"); config = HIF_DEVICE_POWER_CUT; device->power_config = config; @@ -816,7 +816,7 @@ int hif_device_suspend(struct hif_softc *ol_sc, struct device *dev) } if (pm_flag & MMC_PM_WAKE_SDIO_IRQ) { - HIF_INFO("%s: WOW mode ", __func__); + hif_info("WOW mode"); config = HIF_DEVICE_POWER_DOWN; hif_configure_device(ol_sc, device, HIF_DEVICE_POWER_STATE_CHANGE, @@ -831,7 +831,7 @@ int hif_device_suspend(struct hif_softc *ol_sc, struct device *dev) device->device_state = HIF_DEVICE_STATE_WOW; return 0; } else { - HIF_INFO("%s: deep sleep enter", __func__); + hif_info("deep sleep enter"); msleep(100); hif_mask_interrupt(device); device->device_state = HIF_DEVICE_STATE_DEEPSLEEP; @@ -967,7 +967,7 @@ static struct hif_sdio_dev *add_hif_device(struct hif_softc *ol_sc, hifdevice->power_config = HIF_DEVICE_POWER_UP; hifdevice->device_state = HIF_DEVICE_STATE_ON; ret = hif_sdio_set_drvdata(ol_sc, func, hifdevice); - HIF_INFO("status %d", ret); + hif_info("status %d", ret); return hifdevice; } diff --git a/hif/src/sdio/transfer/adma.c b/hif/src/sdio/transfer/adma.c index 8f7318ef9d..09f10f7bd5 100644 --- a/hif/src/sdio/transfer/adma.c +++ b/hif/src/sdio/transfer/adma.c @@ -235,8 +235,7 @@ uint8_t pipeid uint8_t hif_dev_map_adma_chan_to_pipe(struct hif_sdio_device *pdev, uint8_t chan, bool upload) { - HIF_INFO("%s: chan: %u, %s", __func__, chan, - upload ? "Upload" : "Download"); + hif_info("chan: %u, %s", chan, upload ? "Upload" : "Download"); if (chan == 0) /* chan 0 is mapped to HTT */ return upload ? 1 : 0; @@ -523,7 +522,7 @@ int hif_dev_register_channels(struct hif_sdio_dev *dev, struct sdio_func *func) hif_err("Channel registration failed"); } else { dev->al_chan[chan]->priv = (void *)dev; - HIF_INFO("%s: chan %s : id : %u", __func__, + hif_info("chan %s : id : %u", chan_data[chan]->name, dev->al_chan[chan]->channel_id); } @@ -598,7 +597,7 @@ hif_read_write(struct hif_sdio_dev *dev, /*sdio r/w action is not needed when suspend, so just return */ if ((dev->is_suspend) && (dev->power_config == HIF_DEVICE_POWER_CUT)) { - HIF_INFO("%s: skip in suspend", __func__); + hif_info("skip in suspend"); return QDF_STATUS_SUCCESS; } diff --git a/hif/src/snoc/if_ahb.c b/hif/src/snoc/if_ahb.c index eb9e961c8b..b9fe3dd4d3 100644 --- a/hif/src/snoc/if_ahb.c +++ b/hif/src/snoc/if_ahb.c @@ -489,8 +489,7 @@ void hif_ahb_disable_bus(struct hif_softc *scn) (struct qdf_pfm_hndl *)pdev, &vmres, IORESOURCE_MEM, 0); if (QDF_IS_STATUS_ERROR(status)) { - HIF_INFO("%s: Failed to get IORESOURCE_MEM\n", - __func__); + hif_info("Failed to get IORESOURCE_MEM"); return; } memres = (struct resource *)vmres; @@ -573,14 +572,12 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc, &vmres, IORESOURCE_MEM, 0); if (QDF_IS_STATUS_ERROR(status)) { - HIF_INFO("%s: Failed to get IORESOURCE_MEM\n", - __func__); + hif_err("Failed to get IORESOURCE_MEM"); return status; } memres = (struct resource *)vmres; if (!memres) { - HIF_INFO("%s: Failed to get IORESOURCE_MEM\n", - __func__); + hif_err("Failed to get IORESOURCE_MEM"); return QDF_STATUS_E_IO; } @@ -597,7 +594,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc, &mem); #endif if (QDF_IS_STATUS_ERROR(status)) { - HIF_INFO("ath: ioremap error\n"); + hif_err("ath: ioremap error"); ret = PTR_ERR(mem); goto err_cleanup1; } @@ -609,7 +606,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc, ret = pfrm_dma_set_mask(dev, 32); if (ret) { - HIF_INFO("ath: 32-bit DMA not available\n"); + hif_err("ath: 32-bit DMA not available"); status = QDF_STATUS_E_IO; goto err_cleanup1; } @@ -638,7 +635,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc, sc->mem_ce = ioremap_nocache(HOST_CE_ADDRESS, HOST_CE_SIZE); if (IS_ERR(sc->mem_ce)) { - HIF_INFO("CE: ioremap failed\n"); + hif_err("CE: ioremap failed"); return QDF_STATUS_E_IO; } ol_sc->mem_ce = sc->mem_ce; @@ -650,7 +647,7 @@ QDF_STATUS hif_ahb_enable_bus(struct hif_softc *ol_sc, (tgt_info->target_type != TARGET_TYPE_QCN9100) && (tgt_info->target_type != TARGET_TYPE_QCA6018)) { if (hif_ahb_enable_radio(sc, pdev, id) != 0) { - HIF_INFO("error in enabling soc\n"); + hif_err("error in enabling soc"); return QDF_STATUS_E_IO; } @@ -669,7 +666,7 @@ err_target_sync: (tgt_info->target_type != TARGET_TYPE_QCN9100) && (tgt_info->target_type != TARGET_TYPE_QCA5018) && (tgt_info->target_type != TARGET_TYPE_QCA6018)) { - HIF_INFO("Error: Disabling target\n"); + hif_err("Disabling target"); hif_ahb_disable_bus(ol_sc); } err_cleanup1: diff --git a/hif/src/snoc/if_ahb_reset.c b/hif/src/snoc/if_ahb_reset.c index 963678aadf..e6cc5ae209 100644 --- a/hif/src/snoc/if_ahb_reset.c +++ b/hif/src/snoc/if_ahb_reset.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -65,8 +65,7 @@ static int clk_enable_disable(struct device *dev, const char *str, int enable) clk_t = clk_get(dev, str); if (IS_ERR(clk_t)) { - HIF_INFO("%s: Failed to get %s clk %ld\n", - __func__, str, PTR_ERR(clk_t)); + hif_err("Failed to get %s clk %ld", str, PTR_ERR(clk_t)); return -EFAULT; } if (true == enable) { @@ -74,8 +73,7 @@ static int clk_enable_disable(struct device *dev, const char *str, int enable) status = qal_vbus_enable_devclk((struct qdf_dev_clk *)clk_t); ret = qdf_status_to_os_return(status); if (ret) { - HIF_INFO("%s: err enabling clk %s , error:%d\n", - __func__, str, ret); + hif_err("enabling clk: %s, error: %d", str, ret); } } else { /* Disable and unprepare clk */ @@ -136,20 +134,17 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, ret = of_property_read_u32(dev_node, "qca,msi_addr", &msi_addr); if (ret) { - HIF_INFO("%s: Unable to get msi_addr - error:%d\n", - __func__, ret); + hif_err("Unable to get msi_addr - error :%d", ret); return -EIO; } ret = of_property_read_u32(dev_node, "qca,msi_base", &msi_base); if (ret) { - HIF_INFO("%s: Unable to get msi_base - error:%d\n", - __func__, ret); + hif_err("Unable to get msi_base - error: %d", ret); return -EIO; } ret = of_property_read_u32(dev_node, "core-id", &wifi_core_id); if (ret) { - HIF_INFO("%s: Unable to get core-id - error:%d\n", - __func__, ret); + hif_err("Unable to get core-id - error: %d", ret); return -EIO; } @@ -174,15 +169,14 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, if (scn->target_info.target_type == TARGET_TYPE_IPQ4019) { ret = hif_ahb_clk_enable_disable(&pdev->dev, 1); if (ret) { - HIF_INFO("%s:Error while enabling clock :%d\n", - __func__, ret); + hif_err("Error while enabling clock :%d", ret); return ret; } } mem_gcc = ioremap_nocache(GCC_BASE, GCC_SIZE); if (IS_ERR(mem_gcc)) { - HIF_INFO("%s: GCC ioremap failed\n", __func__); + hif_err("GCC ioremap failed"); return PTR_ERR(mem_gcc); } gcc_fepll_pll_div = hif_read32_mb(sc, mem_gcc + @@ -194,8 +188,7 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, >> GCC_FEPLL_PLL_CLK_WIFI_1_SEL_SHIFT); current_freq = wifi_cpu_freq[clk_sel]; - HIF_INFO("Wifi%d CPU frequency %u\n", wifi_core_id, - current_freq); + hif_debug("Wifi%d CPU frequency %u", wifi_core_id, current_freq); hif_write32_mb(sc, sc->mem + FW_CPU_PLL_CONFIG, gcc_fepll_pll_div); iounmap(mem_gcc); @@ -206,8 +199,7 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, "wifi_radio_cold", &vrstctl); reset_ctl = (struct reset_control *)vrstctl; if (IS_ERR(reset_ctl)) { - HIF_INFO("%s: Failed to get radio cold reset control\n", - __func__); + hif_err("Failed to get radio cold reset control"); ret = PTR_ERR(reset_ctl); goto err_reset; } @@ -221,8 +213,7 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, "wifi_radio_warm", &vrstctl); reset_ctl = (struct reset_control *)vrstctl; if (IS_ERR(reset_ctl)) { - HIF_INFO("%s: Failed to get radio warm reset control\n", - __func__); + hif_err("Failed to get radio warm reset control"); ret = PTR_ERR(reset_ctl); goto err_reset; } @@ -236,8 +227,7 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, "wifi_radio_srif", &vrstctl); reset_ctl = (struct reset_control *)vrstctl; if (IS_ERR(reset_ctl)) { - HIF_INFO("%s: Failed to get radio srif reset control\n", - __func__); + hif_err("Failed to get radio srif reset control"); ret = PTR_ERR(reset_ctl); goto err_reset; } @@ -251,7 +241,7 @@ int hif_ahb_enable_radio(struct hif_pci_softc *sc, "wifi_cpu_init", &vrstctl); reset_ctl = (struct reset_control *)vrstctl; if (IS_ERR(reset_ctl)) { - HIF_INFO("%s: Failed to get cpu init reset control", __func__); + hif_err("Failed to get cpu init reset control"); ret = PTR_ERR(reset_ctl); goto err_reset; } @@ -316,7 +306,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) mem_tcsr = ioremap_nocache(TCSR_BASE, TCSR_SIZE); if (IS_ERR(mem_tcsr)) { - HIF_INFO("%s: TCSR ioremap failed\n", __func__); + hif_err("TCSR ioremap failed"); return; } reg_value = hif_read32_mb(sc, mem_tcsr + haltreq_offset); @@ -338,7 +328,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) AHB_RESET_TYPE, &vrstctl); core_resetctl = (struct reset_control *)vrstctl; if (IS_ERR(core_resetctl)) { - HIF_INFO("Failed to get wifi core cold reset control\n"); + hif_err("Failed to get wifi core cold reset control"); return; } @@ -356,8 +346,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) "wifi_radio_cold", &vrstctl); resetctl = (struct reset_control *)vrstctl; if (IS_ERR(resetctl)) { - HIF_INFO("%s: Failed to get radio cold reset control\n", - __func__); + hif_err("Failed to get radio cold reset control"); return; } qal_vbus_activate_dev_rstctl((struct qdf_pfm_hndl *)&pdev->dev, @@ -371,8 +360,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) "wifi_radio_warm", &vrstctl); resetctl = (struct reset_control *)vrstctl; if (IS_ERR(resetctl)) { - HIF_INFO("%s: Failed to get radio warm reset control\n", - __func__); + hif_err("Failed to get radio warm reset control"); return; } qal_vbus_activate_dev_rstctl((struct qdf_pfm_hndl *)&pdev->dev, @@ -386,8 +374,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) "wifi_radio_srif", &vrstctl); resetctl = (struct reset_control *)vrstctl; if (IS_ERR(resetctl)) { - HIF_INFO("%s: Failed to get radio srif reset control\n", - __func__); + hif_err("Failed to get radio srif reset control"); return; } qal_vbus_activate_dev_rstctl((struct qdf_pfm_hndl *)&pdev->dev, @@ -401,7 +388,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) "wifi_cpu_init", &vrstctl); resetctl = (struct reset_control *)vrstctl; if (IS_ERR(resetctl)) { - HIF_INFO("%s: Failed to get cpu init reset control", __func__); + hif_err("Failed to get cpu init reset control"); return; } qal_vbus_activate_dev_rstctl((struct qdf_pfm_hndl *)&pdev->dev, @@ -426,7 +413,7 @@ void hif_ahb_device_reset(struct hif_softc *scn) qal_vbus_release_dev_rstctl((struct qdf_pfm_hndl *)&pdev->dev, (struct qdf_vbus_rstctl *)core_resetctl); iounmap(mem_tcsr); - HIF_INFO("Reset complete for wifi core id : %d\n", wifi_core_id); + hif_info("Reset complete for wifi core id: %d", wifi_core_id); } #else void hif_ahb_device_reset(struct hif_softc *scn) diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c index 2ca81eb3c0..4e61eaaa9c 100644 --- a/hif/src/snoc/if_snoc.c +++ b/hif/src/snoc/if_snoc.c @@ -181,7 +181,7 @@ int hif_snoc_bus_configure(struct hif_softc *scn) scn->wake_irq = pld_get_irq(scn->qdf_dev->dev, wake_ce_id); - HIF_INFO(FL("expecting wake from ce %d, irq %d"), + hif_info("expecting wake from ce %d, irq %d", wake_ce_id, scn->wake_irq); return 0; diff --git a/hif/src/usb/hif_usb.c b/hif/src/usb/hif_usb.c index 4fe24bf27e..52328c00ef 100644 --- a/hif/src/usb/hif_usb.c +++ b/hif/src/usb/hif_usb.c @@ -789,27 +789,27 @@ void hif_dump_info(struct hif_opaque_softc *scn) i, pipe->urb_cnt, pipe->usb_pipe_handle); if (usb_pipeisoc(pipe->usb_pipe_handle)) - HIF_INFO("Pipe Type ISOC"); + hif_info("Pipe Type ISOC"); else if (usb_pipebulk(pipe->usb_pipe_handle)) - HIF_INFO("Pipe Type BULK"); + hif_info("Pipe Type BULK"); else if (usb_pipeint(pipe->usb_pipe_handle)) - HIF_INFO("Pipe Type INT"); + hif_info("Pipe Type INT"); else if (usb_pipecontrol(pipe->usb_pipe_handle)) - HIF_INFO("Pipe Type control"); + hif_info("Pipe Type control"); } for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) { ep_desc = &iface_desc->endpoint[i].desc; if (ep_desc) { - HIF_INFO( - "ep_desc : %pK Index : %d: DescType : %d Addr : %d Maxp : %d Atrrib : %d", + hif_info( + "ep_desc: %pK Index: %d: DescType: %d Addr: %d Maxp: %d Atrrib: %d", ep_desc, i, ep_desc->bDescriptorType, ep_desc->bEndpointAddress, ep_desc->wMaxPacketSize, ep_desc->bmAttributes); if ((ep_desc) && (usb_endpoint_type(ep_desc) == USB_ENDPOINT_XFER_ISOC)) { - HIF_INFO("ISOC EP Detected"); + hif_info("ISOC EP Detected"); } } } @@ -912,7 +912,7 @@ void hif_send_complete_check(struct hif_opaque_softc *scn, void hif_suspend_wow(struct hif_opaque_softc *scn) { - HIF_INFO("HIFsuspendwow - TODO"); + hif_info("HIFsuspendwow - TODO"); } /** diff --git a/hif/src/usb/if_usb.c b/hif/src/usb/if_usb.c index 157f65f594..8e0c39048a 100644 --- a/hif/src/usb/if_usb.c +++ b/hif/src/usb/if_usb.c @@ -204,8 +204,7 @@ QDF_STATUS hif_usb_enable_bus(struct hif_softc *scn, sc = HIF_GET_USB_SOFTC(scn); - HIF_INFO("%s hif_softc %pK usbdev %pK interface %pK\n", - __func__, + hif_debug("hif_softc %pK usbdev %pK interface %pK", scn, usbdev, interface);