Implement the WMI resource configuration for QCN9575. Add ath12k_wifi8_wmi_init_qcn9575() in wifi8/wmi.c to populate the WMI resource configuration struct used during firmware initialization, setting vdev and peer counts, RF TX/RX chain masks, scan and power-save limits, EMA and TWT parameters, and peer metadata version. Set the QCN9575 hw params wmi_init pointer to ath12k_wifi8_wmi_init_qcn9575 and build wifi8/wmi.c from wifi8/Makefile. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1 Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3 Signed-off-by: Madhavan Ganesan --- drivers/net/wireless/ath/ath12k/hw.h | 2 + drivers/net/wireless/ath/ath12k/wifi8/Makefile | 3 +- drivers/net/wireless/ath/ath12k/wifi8/hw.c | 3 +- drivers/net/wireless/ath/ath12k/wifi8/wmi.c | 57 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath12k/wifi8/wmi.h | 13 ++++++ 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h index 96776c6e2050..b8045b33ca0d 100644 --- a/drivers/net/wireless/ath/ath12k/hw.h +++ b/drivers/net/wireless/ath/ath12k/hw.h @@ -77,6 +77,8 @@ #define TARGET_DMA_BURST_SIZE 1 #define TARGET_RX_BATCHMODE 1 #define TARGET_EMA_MAX_PROFILE_PERIOD 8 +/* host supports peer map v3 and unmap v2 */ +#define TARGET_PEER_MAP_UNMAP_VERSION 0x32 #define ATH12K_HW_DEFAULT_QUEUE 0 #define ATH12K_HW_MAX_QUEUES 4 diff --git a/drivers/net/wireless/ath/ath12k/wifi8/Makefile b/drivers/net/wireless/ath/ath12k/wifi8/Makefile index 3717b00741fd..989e640c7b41 100644 --- a/drivers/net/wireless/ath/ath12k/wifi8/Makefile +++ b/drivers/net/wireless/ath/ath12k/wifi8/Makefile @@ -6,4 +6,5 @@ ath12k_wifi8-y += ce.o \ hal_qcn9575.o \ hw.o \ mhi.o \ - pci.o + pci.o \ + wmi.o diff --git a/drivers/net/wireless/ath/ath12k/wifi8/hw.c b/drivers/net/wireless/ath/ath12k/wifi8/hw.c index fa64b865b931..74873fc5f3f3 100644 --- a/drivers/net/wireless/ath/ath12k/wifi8/hw.c +++ b/drivers/net/wireless/ath/ath12k/wifi8/hw.c @@ -16,6 +16,7 @@ #include "hal.h" #include "hw.h" #include "mhi.h" +#include "wmi.h" static const struct ath12k_hw_params ath12k_wifi8_hw_params[] = { { @@ -70,7 +71,7 @@ static const struct ath12k_hw_params ath12k_wifi8_hw_params[] = { .mhi_config = &ath12k_wifi8_mhi_config_qcn9575, - .wmi_init = NULL, + .wmi_init = ath12k_wifi8_wmi_init_qcn9575, .qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01), diff --git a/drivers/net/wireless/ath/ath12k/wifi8/wmi.c b/drivers/net/wireless/ath/ath12k/wifi8/wmi.c new file mode 100644 index 000000000000..c575cae2582d --- /dev/null +++ b/drivers/net/wireless/ath/ath12k/wifi8/wmi.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#include "../core.h" +#include "wmi.h" + +void ath12k_wifi8_wmi_init_qcn9575(struct ath12k_base *ab, + struct ath12k_wmi_resource_config_arg *config) +{ + config->num_vdevs = ab->num_radios * TARGET_NUM_VDEVS(ab); + config->num_peers = ab->num_radios * + ath12k_core_get_max_peers_per_radio(ab); + config->num_offload_peers = TARGET_NUM_OFFLD_PEERS; + config->num_offload_reorder_buffs = TARGET_NUM_OFFLD_REORDER_BUFFS; + config->num_peer_keys = TARGET_NUM_PEER_KEYS; + config->ast_skid_limit = TARGET_AST_SKID_LIMIT; + config->tx_chain_mask = (1 << ab->target_caps.num_rf_chains) - 1; + config->rx_chain_mask = (1 << ab->target_caps.num_rf_chains) - 1; + config->rx_timeout_pri[0] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[1] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[2] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[3] = TARGET_RX_TIMEOUT_HI_PRI; + + if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) + config->rx_decap_mode = TARGET_DECAP_MODE_RAW; + else + config->rx_decap_mode = TARGET_DECAP_MODE_NATIVE_WIFI; + + config->scan_max_pending_req = TARGET_SCAN_MAX_PENDING_REQS; + config->bmiss_offload_max_vdev = TARGET_BMISS_OFFLOAD_MAX_VDEV; + config->roam_offload_max_vdev = TARGET_ROAM_OFFLOAD_MAX_VDEV; + config->roam_offload_max_ap_profiles = TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES; + config->num_mcast_groups = TARGET_NUM_MCAST_GROUPS; + config->num_mcast_table_elems = TARGET_NUM_MCAST_TABLE_ELEMS; + config->mcast2ucast_mode = TARGET_MCAST2UCAST_MODE; + config->tx_dbg_log_size = TARGET_TX_DBG_LOG_SIZE; + config->num_wds_entries = TARGET_NUM_WDS_ENTRIES; + config->dma_burst_size = TARGET_DMA_BURST_SIZE; + config->rx_skip_defrag_timeout_dup_detection_check = + TARGET_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK; + config->vow_config = TARGET_VOW_CONFIG; + config->gtk_offload_max_vdev = TARGET_GTK_OFFLOAD_MAX_VDEV; + config->num_msdu_desc = TARGET_NUM_MSDU_DESC; + config->beacon_tx_offload_max_vdev = ab->num_radios * TARGET_MAX_BCN_OFFLD; + config->rx_batchmode = TARGET_RX_BATCHMODE; + config->peer_map_unmap_version = TARGET_PEER_MAP_UNMAP_VERSION; + config->twt_ap_pdev_count = ab->num_radios; + config->twt_ap_sta_count = 1000; + config->ema_max_vap_cnt = ab->num_radios; + config->ema_max_profile_period = TARGET_EMA_MAX_PROFILE_PERIOD; + config->beacon_tx_offload_max_vdev += config->ema_max_vap_cnt; + + if (test_bit(WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT, ab->wmi_ab.svc_map)) + config->peer_metadata_ver = ATH12K_PEER_METADATA_V1B; +} diff --git a/drivers/net/wireless/ath/ath12k/wifi8/wmi.h b/drivers/net/wireless/ath/ath12k/wifi8/wmi.h new file mode 100644 index 000000000000..a66ede369ba3 --- /dev/null +++ b/drivers/net/wireless/ath/ath12k/wifi8/wmi.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause-Clear */ +/* + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#ifndef ATH12K_WIFI8_WMI_H +#define ATH12K_WIFI8_WMI_H + +#include "../core.h" + +void ath12k_wifi8_wmi_init_qcn9575(struct ath12k_base *ab, + struct ath12k_wmi_resource_config_arg *config); +#endif -- 2.34.1