From 192c8433f7663e24bdfb62e215dd485c6b594a4c Mon Sep 17 00:00:00 2001 From: Wu Gao Date: Wed, 8 Apr 2020 03:22:40 +0800 Subject: [PATCH] qcacmn: Add chip type for QCA6490 Add chip type for QCA6490, and CFR component will indicate chip type to user space. Change-Id: Ia3e95e06c8cc86bc30b81906f62f3821606a38f7 CRs-Fixed: 2659553 --- target_if/cfr/src/target_if_cfr_6018.c | 3 ++- target_if/cfr/src/target_if_cfr_6490.c | 6 +++++- umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target_if/cfr/src/target_if_cfr_6018.c b/target_if/cfr/src/target_if_cfr_6018.c index 9c1590cc0700..6e80c4924c29 100644 --- a/target_if/cfr/src/target_if_cfr_6018.c +++ b/target_if/cfr/src/target_if_cfr_6018.c @@ -700,7 +700,7 @@ void target_if_cfr_rx_tlv_process(struct wlan_objmgr_pdev *pdev, void *nbuf) header->vendorid = 0x8cfdf0; header->cfr_metadata_version = CFR_META_VERSION_3; header->cfr_data_version = CFR_DATA_VERSION_1; - header->chip_type = CFR_CAPTURE_RADIO_CYP; + header->chip_type = pcfr->chip_type; header->pltform_type = CFR_PLATFORM_TYPE_ARM; header->Reserved = 0; @@ -1580,6 +1580,7 @@ QDF_STATUS cfr_6018_init_pdev(struct wlan_objmgr_psoc *psoc, pcfr->cfr_max_sta_count = MAX_CFR_ENABLED_CLIENTS; pcfr->subbuf_size = STREAMFS_MAX_SUBBUF_CYP; pcfr->num_subbufs = STREAMFS_NUM_SUBBUF_CYP; + pcfr->chip_type = CFR_CAPTURE_RADIO_CYP; if (!pcfr->lut_timer_init) { qdf_timer_init(NULL, diff --git a/target_if/cfr/src/target_if_cfr_6490.c b/target_if/cfr/src/target_if_cfr_6490.c index 1ad3ebae6685..0e25aff300ec 100644 --- a/target_if/cfr/src/target_if_cfr_6490.c +++ b/target_if/cfr/src/target_if_cfr_6490.c @@ -125,6 +125,7 @@ QDF_STATUS cfr_6490_init_pdev(struct wlan_objmgr_psoc *psoc, struct wmi_unified *wmi_handle = NULL; bool is_cfr_disabled; bool cfr_capable; + QDF_STATUS status; if (!psoc || !pdev) { cfr_err("null pdev or psoc"); @@ -169,7 +170,10 @@ QDF_STATUS cfr_6490_init_pdev(struct wlan_objmgr_psoc *psoc, return QDF_STATUS_SUCCESS; } - return cfr_6018_init_pdev(psoc, pdev); + status = cfr_6018_init_pdev(psoc, pdev); + cfr_pdev->chip_type = CFR_CAPTURE_RADIO_HSP; + + return status; } QDF_STATUS cfr_6490_deinit_pdev(struct wlan_objmgr_psoc *psoc, diff --git a/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h b/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h index 1676fcaa2168..25d8e3a0dfcf 100644 --- a/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h +++ b/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h @@ -88,6 +88,7 @@ enum cfrradiotype { CFR_CAPTURE_RADIO_BESRA, CFR_CAPTURE_RADIO_HKV2, CFR_CAPTURE_RADIO_CYP, + CFR_CAPTURE_RADIO_HSP, CFR_CAPTURE_RADIO_MAX = 0xFF, }; @@ -426,6 +427,7 @@ struct cfr_rcc_param { * pdev_obj: pointer to pdev object * is_cfr_capable: flag to determine if cfr is enabled or not * cfr_timer_enable: flag to enable/disable timer + * chip_type: chip type which is defined in enum cfrradiotype * cfr_mem_chunk: Region of memory used for storing cfr data * cfr_max_sta_count: Maximum stations supported in one-shot capture mode * num_subbufs: No. of sub-buffers used in relayfs @@ -467,6 +469,7 @@ struct pdev_cfr { struct wlan_objmgr_pdev *pdev_obj; uint8_t is_cfr_capable; uint8_t cfr_timer_enable; + uint8_t chip_type; struct cfr_wmi_host_mem_chunk cfr_mem_chunk; uint16_t cfr_max_sta_count; uint16_t cfr_current_sta_count;