diff --git a/hal/wifi3.0/hal_generic_api.h b/hal/wifi3.0/hal_generic_api.h index cdeae56a45..a9881d361d 100644 --- a/hal/wifi3.0/hal_generic_api.h +++ b/hal/wifi3.0/hal_generic_api.h @@ -1729,7 +1729,7 @@ void hal_srng_src_hw_init_generic(struct hal_soc *hal, uint32_t reg_val = 0; uint64_t tp_addr = 0; - HIF_DBG("%s: hw_init srng %d", __func__, srng->ring_id); + hal_debug("hw_init srng %d", srng->ring_id); if (srng->flags & HAL_SRNG_MSI_INTR) { SRNG_SRC_REG_WRITE(srng, MSI1_BASE_LSB, @@ -1842,7 +1842,7 @@ void hal_srng_dst_hw_init_generic(struct hal_soc *hal, uint32_t reg_val = 0; uint64_t hp_addr = 0; - HIF_DBG("%s: hw_init srng %d", __func__, srng->ring_id); + hal_debug("hw_init srng %d", srng->ring_id); if (srng->flags & HAL_SRNG_MSI_INTR) { SRNG_DST_REG_WRITE(srng, MSI1_BASE_LSB, diff --git a/hif/src/hif_debug.h b/hif/src/hif_debug.h index c4aa4aa11d..5655a3033d 100644 --- a/hif/src/hif_debug.h +++ b/hif/src/hif_debug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2016, 2018-2019 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 @@ -49,6 +49,8 @@ #define hif_warn(args ...) QDF_TRACE_WARN(QDF_MODULE_ID_HIF, args) #define hif_info(args ...) QDF_TRACE_INFO(QDF_MODULE_ID_HIF, args) #define hif_debug(args ...) QDF_TRACE_DEBUG(QDF_MODULE_ID_HIF, args) +#define hif_info_high(args ...) \ + __QDF_TRACE_FL(QDF_TRACE_LEVEL_INFO_HIGH, QDF_MODULE_ID_HIF, ## args) #define hif_nofl_alert(args ...) \ QDF_TRACE_FATAL_NO_FL(QDF_MODULE_ID_HIF, args) diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 8da565788e..f4d7a086fe 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -3904,8 +3904,8 @@ int hif_pm_runtime_get_sync(struct hif_opaque_softc *hif_ctx) pm_state = qdf_atomic_read(&sc->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", - (void *)_RET_IP_); + hif_info_high("Runtime PM resume is requested by %ps", + (void *)_RET_IP_); sc->pm_stats.runtime_get++; ret = pm_runtime_get_sync(sc->dev); @@ -3918,8 +3918,8 @@ int hif_pm_runtime_get_sync(struct hif_opaque_softc *hif_ctx) if (ret) { sc->pm_stats.runtime_get_err++; - HIF_ERROR("Runtime PM Get Sync error in pm_state: %d, ret: %d", - qdf_atomic_read(&sc->pm_state), ret); + hif_err("Runtime PM Get Sync error in pm_state: %d, ret: %d", + qdf_atomic_read(&sc->pm_state), ret); hif_pm_runtime_put(hif_ctx); } @@ -4028,8 +4028,7 @@ int hif_pm_runtime_get(struct hif_opaque_softc *hif_ctx) int pm_state; if (!scn) { - HIF_ERROR("%s: Could not do runtime get, scn is null", - __func__); + hif_err("Could not do runtime get, scn is null"); return -EFAULT; } @@ -4051,8 +4050,8 @@ int hif_pm_runtime_get(struct hif_opaque_softc *hif_ctx) if (ret && ret != -EINPROGRESS) { sc->pm_stats.runtime_get_err++; - HIF_ERROR("%s: Runtime Get PM Error in pm_state:%d ret: %d", - __func__, qdf_atomic_read(&sc->pm_state), ret); + hif_err("Runtime Get PM Error in pm_state:%d ret: %d", + qdf_atomic_read(&sc->pm_state), ret); } return ret; @@ -4060,8 +4059,8 @@ int hif_pm_runtime_get(struct hif_opaque_softc *hif_ctx) if (pm_state == HIF_PM_RUNTIME_STATE_SUSPENDED || pm_state == HIF_PM_RUNTIME_STATE_SUSPENDING) { - HIF_DBG("Runtime PM resume is requested by %ps", - (void *)_RET_IP_); + hif_info_high("Runtime PM resume is requested by %ps", + (void *)_RET_IP_); ret = -EAGAIN; } else { ret = -EBUSY;