From 70ade22606f123e3fcaa8be3c69db4bcff3db2a0 Mon Sep 17 00:00:00 2001 From: narayan Date: Thu, 28 Oct 2021 16:06:46 +0530 Subject: [PATCH] qcacmn: Enable CFR support for QCA9574 Enable CFR host support for QCA9574. Change-Id: I8d6a0f5b59715f244256854fc2132f33f841f316 CRs-Fixed: 3062447 --- target_if/cfr/src/target_if_cfr.c | 10 ++++++++-- umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target_if/cfr/src/target_if_cfr.c b/target_if/cfr/src/target_if_cfr.c index b1b442ab8c..1acad86f5f 100644 --- a/target_if/cfr/src/target_if_cfr.c +++ b/target_if/cfr/src/target_if_cfr.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -249,6 +250,9 @@ void target_if_cfr_fill_header(struct csi_cfr_header *hdr, } else if (target_type == TARGET_TYPE_QCA8074V2) { hdr->cmn.cfr_metadata_version = CFR_META_VERSION_6; hdr->cmn.chip_type = CFR_CAPTURE_RADIO_HKV2; + } else if (target_type == TARGET_TYPE_QCA9574) { + hdr->cmn.cfr_metadata_version = CFR_META_VERSION_6; + hdr->cmn.chip_type = CFR_CAPTURE_RADIO_ALDER; } else { if (target_type == TARGET_TYPE_QCN9000) hdr->cmn.cfr_metadata_version = CFR_META_VERSION_7; @@ -430,7 +434,8 @@ target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc, target_type = target_if_cfr_get_target_type(psoc); - if (target_type == TARGET_TYPE_QCA8074V2) { + if ((target_type == TARGET_TYPE_QCA8074V2) || + (target_type == TARGET_TYPE_QCA9574)) { pa->is_cfr_capable = cfr_sc->is_cfr_capable; return cfr_dbr_init_pdev(psoc, pdev); } else if ((target_type == TARGET_TYPE_IPQ4019) || @@ -463,7 +468,8 @@ target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc, target_type = target_if_cfr_get_target_type(psoc); - if (target_type == TARGET_TYPE_QCA8074V2) { + if ((target_type == TARGET_TYPE_QCA8074V2) || + (target_type == TARGET_TYPE_QCA9574)) { return cfr_dbr_deinit_pdev(psoc, pdev); } else if ((target_type == TARGET_TYPE_IPQ4019) || (target_type == TARGET_TYPE_QCA9984) || diff --git a/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h b/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h index 182e3c6e7d..2b0a657ae7 100644 --- a/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h +++ b/umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021 Qualcomm Innovation Center, Inc. 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 @@ -114,6 +115,7 @@ enum cfrradiotype { CFR_CAPTURE_RADIO_MAPLE, CFR_CAPTURE_RADIO_MOSELLE, CFR_CAPTURE_RADIO_SPRUCE, + CFR_CAPTURE_RADIO_ALDER, CFR_CAPTURE_RADIO_MAX = 0xFF, };