From 7c7742990b15ded9d0e97405b5704faf7e14401a Mon Sep 17 00:00:00 2001 From: Sajini R Date: Mon, 22 Aug 2022 17:58:22 +0530 Subject: [PATCH] qcacmn: Initial changes for IPQ5332 target compilation Added device ID and target type checks for IPQ5332 target compilation. CRs-Fixed: 3273865 Change-Id: I98a768394cc539549fc41d756c9c9d90034627f5 --- gpio/dispatcher/src/wlan_gpio_tgt_api.c | 2 ++ target_if/cfr/src/target_if_cfr.c | 5 +++++ target_if/dfs/src/target_if_dfs_full_offload.c | 2 +- target_if/spectral/target_if_spectral.c | 7 ++++++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gpio/dispatcher/src/wlan_gpio_tgt_api.c b/gpio/dispatcher/src/wlan_gpio_tgt_api.c index 1985a2b401..7ab6b2d6cb 100644 --- a/gpio/dispatcher/src/wlan_gpio_tgt_api.c +++ b/gpio/dispatcher/src/wlan_gpio_tgt_api.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 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 above @@ -103,6 +104,7 @@ static bool tgt_gpio_disabled(struct wlan_objmgr_psoc *psoc) (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCA8074V2) || (target_type == TARGET_TYPE_QCA9574) || + (target_type == TARGET_TYPE_QCA5332) || (target_type == TARGET_TYPE_QCA5018) || (target_type == TARGET_TYPE_QCA6018)) { return true; diff --git a/target_if/cfr/src/target_if_cfr.c b/target_if/cfr/src/target_if_cfr.c index 188bc37796..4538ff1198 100644 --- a/target_if/cfr/src/target_if_cfr.c +++ b/target_if/cfr/src/target_if_cfr.c @@ -248,6 +248,7 @@ void target_if_cfr_fill_header(struct csi_cfr_header *hdr, if (target_type == TARGET_TYPE_QCN9000) hdr->cmn.cfr_metadata_version = CFR_META_VERSION_9; else if (target_type == TARGET_TYPE_QCN9224 || + target_type == TARGET_TYPE_QCA5332 || target_type == TARGET_TYPE_QCA6490 || target_type == TARGET_TYPE_QCA6750 || target_type == TARGET_TYPE_KIWI || @@ -267,6 +268,8 @@ void target_if_cfr_fill_header(struct csi_cfr_header *hdr, hdr->cmn.chip_type = CFR_CAPTURE_RADIO_SPRUCE; else if (target_type == TARGET_TYPE_QCN9224) hdr->cmn.chip_type = CFR_CAPTURE_RADIO_WAIKIKI; + else if (target_type == TARGET_TYPE_QCA5332) + hdr->cmn.chip_type = CFR_CAPTURE_RADIO_MIAMI; else if (target_type == TARGET_TYPE_QCA6490) hdr->cmn.chip_type = CFR_CAPTURE_RADIO_HSP; else if (target_type == TARGET_TYPE_QCA6750) @@ -457,6 +460,7 @@ target_if_cfr_init_pdev(struct wlan_objmgr_psoc *psoc, (target_type == TARGET_TYPE_QCN9000) || (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCA5018) || + (target_type == TARGET_TYPE_QCA5332) || (target_type == TARGET_TYPE_QCN9224)) { pa->is_cfr_capable = cfr_sc->is_cfr_capable; return cfr_enh_init_pdev(psoc, pdev); @@ -484,6 +488,7 @@ target_if_cfr_deinit_pdev(struct wlan_objmgr_psoc *psoc, (target_type == TARGET_TYPE_QCN9000) || (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCA5018) || + (target_type == TARGET_TYPE_QCA5332) || (target_type == TARGET_TYPE_QCN9224)) { return cfr_enh_deinit_pdev(psoc, pdev); } else diff --git a/target_if/dfs/src/target_if_dfs_full_offload.c b/target_if/dfs/src/target_if_dfs_full_offload.c index 44014228f0..cc0f937215 100644 --- a/target_if/dfs/src/target_if_dfs_full_offload.c +++ b/target_if/dfs/src/target_if_dfs_full_offload.c @@ -430,7 +430,7 @@ free_vdevref: #if (defined(WLAN_DFS_FULL_OFFLOAD) || defined(QCA_WIFI_QCA8074) || \ defined(QCA_WIFI_QCA6018) || defined(QCA_WIFI_QCA5018) || \ - defined(QCA_WIFI_QCA9574)) + defined(QCA_WIFI_QCA9574) || defined(QCA_WIFI_QCA5332)) QDF_STATUS target_process_bang_radar_cmd( struct wlan_objmgr_pdev *pdev, struct dfs_emulate_bang_radar_test_cmd *dfs_unit_test) diff --git a/target_if/spectral/target_if_spectral.c b/target_if/spectral/target_if_spectral.c index 41065ce001..e0306439e2 100644 --- a/target_if/spectral/target_if_spectral.c +++ b/target_if/spectral/target_if_spectral.c @@ -617,7 +617,8 @@ target_if_send_vdev_spectral_enable_cmd(struct target_if_spectral *spectral, */ static inline bool is_spectral_arch_beryllium(uint32_t target_tpe) { - if (target_tpe == TARGET_TYPE_QCN9224) + if ((target_tpe == TARGET_TYPE_QCN9224) || + (target_tpe == TARGET_TYPE_QCA5332)) return true; return false; @@ -3154,6 +3155,7 @@ target_if_spectral_len_adj_swar_init(struct spectral_fft_bin_len_adj_swar *swar, target_type == TARGET_TYPE_QCA9574 || target_type == TARGET_TYPE_QCA6018 || target_type == TARGET_TYPE_QCN6122 || + target_type == TARGET_TYPE_QCA5332 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCN9000 || target_type == TARGET_TYPE_QCA6490 || @@ -3201,6 +3203,7 @@ target_if_spectral_report_params_init( target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6750 || target_type == TARGET_TYPE_QCA6490 || + target_type == TARGET_TYPE_QCA5332 || target_type == TARGET_TYPE_QCN9224 || target_type == TARGET_TYPE_KIWI || target_type == TARGET_TYPE_MANGO) { @@ -3649,6 +3652,7 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) if (target_type == TARGET_TYPE_QCA8074 || target_type == TARGET_TYPE_QCA8074V2 || target_type == TARGET_TYPE_QCA9574 || + target_type == TARGET_TYPE_QCA5332 || target_type == TARGET_TYPE_QCA6018 || target_type == TARGET_TYPE_QCA5018 || target_type == TARGET_TYPE_QCA6390 || @@ -3672,6 +3676,7 @@ target_if_pdev_spectral_init(struct wlan_objmgr_pdev *pdev) (target_type == TARGET_TYPE_QCA9574) || (target_type == TARGET_TYPE_QCA6018) || (target_type == TARGET_TYPE_QCA5018) || + (target_type == TARGET_TYPE_QCA5332) || (target_type == TARGET_TYPE_QCN6122) || (target_type == TARGET_TYPE_QCN9000) || (target_type == TARGET_TYPE_QCA6290) ||