From 37d7d4bed0a44e73167926f2c47dbb2ce90c4beb Mon Sep 17 00:00:00 2001 From: chunquan Date: Thu, 17 Mar 2022 17:01:44 +0800 Subject: [PATCH] qcacmn: Replace blacklist abbreviation bl for dl Replace blacklist abbreviation bl for denylist dl. Change-Id: Ifdb65060ec65fa65a0804c040734e2563c064b1b CRs-Fixed: 3153293 --- hif/src/hif_irq_affinity.c | 18 +++++++++--------- hif/src/hif_napi.c | 18 +++++++++--------- wmi/inc/wmi_unified_param.h | 18 +++++++++--------- wmi/inc/wmi_unified_priv.h | 2 +- wmi/src/wmi_unified_tlv.c | 8 ++++---- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/hif/src/hif_irq_affinity.c b/hif/src/hif_irq_affinity.c index 70939e530d..3315515ca9 100644 --- a/hif/src/hif_irq_affinity.c +++ b/hif/src/hif_irq_affinity.c @@ -426,16 +426,16 @@ hncm_return: /** - * hif_exec_bl_irq() - calls irq_modify_status to enable/disable denylisting + * hif_exec_dl_irq() - calls irq_modify_status to enable/disable denylisting * @napid: pointer to qca_napi_data structure - * @bl_flag: denylist flag to enable/disable denylisting + * @dl_flag: denylist flag to enable/disable denylisting * * The function enables/disables denylisting for all the copy engine * interrupts on which NAPI is enabled. * * Return: None */ -static inline void hif_exec_bl_irq(struct qca_napi_data *napid, bool bl_flag) +static inline void hif_exec_dl_irq(struct qca_napi_data *napid, bool dl_flag) { int i, j; struct hif_exec_context *exec_ctx; @@ -450,7 +450,7 @@ static inline void hif_exec_bl_irq(struct qca_napi_data *napid, bool bl_flag) if (!(exec_ctx)) continue; - if (bl_flag == true) + if (dl_flag == true) for (j = 0; j < exec_ctx->numirq; j++) qdf_dev_modify_irq_status(exec_ctx->os_irq[j], 0, @@ -460,7 +460,7 @@ static inline void hif_exec_bl_irq(struct qca_napi_data *napid, bool bl_flag) qdf_dev_modify_irq_status(exec_ctx->os_irq[j], QDF_IRQ_NO_BALANCING, 0); - hif_debug("bl_flag %d CE %d", bl_flag, i); + hif_debug("dl_flag %d CE %d", dl_flag, i); } } @@ -486,12 +486,12 @@ int hif_exec_cpu_denylist(struct qca_napi_data *napid, int rc = 0; static int ref_count; /* = 0 by the compiler */ uint8_t flags = napid->flags; - bool bl_en = flags & QCA_NAPI_FEATURE_IRQ_BLACKLISTING; + bool dl_en = flags & QCA_NAPI_FEATURE_IRQ_BLACKLISTING; bool ccb_en = flags & QCA_NAPI_FEATURE_CORE_CTL_BOOST; NAPI_DEBUG("-->%s(%d %d)", __func__, flags, op); - if (!(bl_en && ccb_en)) { + if (!(dl_en && ccb_en)) { rc = -EINVAL; goto out; } @@ -507,7 +507,7 @@ int hif_exec_cpu_denylist(struct qca_napi_data *napid, rc = hif_napi_core_ctl_set_boost(true); NAPI_DEBUG("boost_on() returns %d - refcnt=%d", rc, ref_count); - hif_exec_bl_irq(napid, true); + hif_exec_dl_irq(napid, true); } break; case DENYLIST_OFF: @@ -518,7 +518,7 @@ int hif_exec_cpu_denylist(struct qca_napi_data *napid, rc = hif_napi_core_ctl_set_boost(false); NAPI_DEBUG("boost_off() returns %d - refcnt=%d", rc, ref_count); - hif_exec_bl_irq(napid, false); + hif_exec_dl_irq(napid, false); } break; default: diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index dc65591893..f582a8412e 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -1634,16 +1634,16 @@ hncm_return: /** - * hif_napi_bl_irq() - calls irq_modify_status to enable/disable denylisting + * hif_napi_dl_irq() - calls irq_modify_status to enable/disable denylisting * @napid: pointer to qca_napi_data structure - * @bl_flag: denylist flag to enable/disable denylisting + * @dl_flag: denylist flag to enable/disable denylisting * * The function enables/disables denylisting for all the copy engine * interrupts on which NAPI is enabled. * * Return: None */ -static inline void hif_napi_bl_irq(struct qca_napi_data *napid, bool bl_flag) +static inline void hif_napi_dl_irq(struct qca_napi_data *napid, bool dl_flag) { int i; struct qca_napi_info *napii; @@ -1658,13 +1658,13 @@ static inline void hif_napi_bl_irq(struct qca_napi_data *napid, bool bl_flag) if (!(napii)) continue; - if (bl_flag == true) + if (dl_flag == true) qdf_dev_modify_irq_status(napii->irq, 0, QDF_IRQ_NO_BALANCING); else qdf_dev_modify_irq_status(napii->irq, QDF_IRQ_NO_BALANCING, 0); - hif_debug("bl_flag %d CE %d", bl_flag, i); + hif_debug("dl_flag %d CE %d", dl_flag, i); } } @@ -1690,12 +1690,12 @@ int hif_napi_cpu_denylist(struct qca_napi_data *napid, int rc = 0; static int ref_count; /* = 0 by the compiler */ uint8_t flags = napid->flags; - bool bl_en = flags & QCA_NAPI_FEATURE_IRQ_BLACKLISTING; + bool dl_en = flags & QCA_NAPI_FEATURE_IRQ_BLACKLISTING; bool ccb_en = flags & QCA_NAPI_FEATURE_CORE_CTL_BOOST; NAPI_DEBUG("-->%s(%d %d)", __func__, flags, op); - if (!(bl_en && ccb_en)) { + if (!(dl_en && ccb_en)) { rc = -EINVAL; goto out; } @@ -1711,7 +1711,7 @@ int hif_napi_cpu_denylist(struct qca_napi_data *napid, rc = hif_napi_core_ctl_set_boost(true); NAPI_DEBUG("boost_on() returns %d - refcnt=%d", rc, ref_count); - hif_napi_bl_irq(napid, true); + hif_napi_dl_irq(napid, true); } break; case DENYLIST_OFF: @@ -1722,7 +1722,7 @@ int hif_napi_cpu_denylist(struct qca_napi_data *napid, rc = hif_napi_core_ctl_set_boost(false); NAPI_DEBUG("boost_off() returns %d - refcnt=%d", rc, ref_count); - hif_napi_bl_irq(napid, false); + hif_napi_dl_irq(napid, false); } } break; diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 61cee0ca9d..7990047d51 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -7971,12 +7971,12 @@ struct wmi_roam_wtc_btm_trigger_data { * @rssi_score: AP RSSI score * @total_score: Total score of the candidate AP. * @etp: Estimated throughput value of the AP in Mbps - * @bl_reason: Denylist reason - * @bl_source: Source of adding AP to BL - * @bl_timestamp:This timestamp indicates the time when AP added + * @dl_reason: Denylist reason + * @dl_source: Source of adding AP to DL + * @dl_timestamp:This timestamp indicates the time when AP added * to denylist. - * @bl_original_timeout: Original timeout value in milli seconds - * when AP added to BL + * @dl_original_timeout: Original timeout value in milli seconds + * when AP added to DL */ struct wmi_roam_candidate_info { uint32_t timestamp; @@ -7989,10 +7989,10 @@ struct wmi_roam_candidate_info { uint32_t rssi_score; uint32_t total_score; uint32_t etp; - uint32_t bl_reason; - uint32_t bl_source; - uint32_t bl_timestamp; - uint32_t bl_original_timeout; + uint32_t dl_reason; + uint32_t dl_source; + uint32_t dl_timestamp; + uint32_t dl_original_timeout; }; /** diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index f6b5b4a7d8..e8d0dd6fc0 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -429,7 +429,7 @@ QDF_STATUS (*extract_roam_event)(wmi_unified_t wmi_handle, void *evt_buf, uint32_t len, struct roam_offload_roam_event *roam_event); QDF_STATUS -(*extract_btm_bl_event)(wmi_unified_t wmi_handle, +(*extract_btm_dl_event)(wmi_unified_t wmi_handle, uint8_t *event, uint32_t data_len, struct roam_denylist_event **dst_list); QDF_STATUS diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 318f9e789b..a0048012fb 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -16322,10 +16322,10 @@ extract_roam_scan_ap_stats_tlv(wmi_unified_t wmi_handle, void *evt_buf, dst->cu_score = src->cu_score; dst->total_score = src->total_score; dst->timestamp = src->timestamp; - dst->bl_reason = src->bl_reason; - dst->bl_source = src->bl_source; - dst->bl_timestamp = src->bl_timestamp; - dst->bl_original_timeout = src->bl_original_timeout; + dst->dl_reason = src->bl_reason; + dst->dl_source = src->bl_source; + dst->dl_timestamp = src->bl_timestamp; + dst->dl_original_timeout = src->bl_original_timeout; src++; dst++;