ath10k: Add support to provide higher range mem chunks in wmi init command
PATCH v2 1/1 ath10k: Add support to provide higher range mem chunks in wmi init command
With the current implementation of wmi init command, there is no provision for the host driver to provide mem chunks addresses with more than 32-bit, to the firmware. WCN3990 is a 35-bit target and can accept mem chunks addresses which are above 32-bit.
If firmware supports address range more than 32 bit, it advertises the support by setting the WMI_SERVICE_EXTEND_ADDRESS service. Based on this service fill the upper bits of paddr while providing the mem chunks in the wmi init command.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01552-QCAHLSWMTPL-1
--- drivers/net/wireless/ath/ath10k/wmi-tlv.c | 6 ++++++ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 29 +++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath10k/wmi.h | 3 +++ 3 files changed, 38 insertions(+)
drivers/net/wireless/ath/ath10k/wmi-tlv.c +6 -0
@@ -1538,6 +1538,12 @@ static enum wmi_txbf_conf ath10k_wmi_tlv_txbf_conf_scheme(struct ath10k *ar) chunk->size =__cpu_to_le32 (ar->wmi.mem_chunks[i].len); chunk->req_id =__cpu_to_le32 (ar->wmi.mem_chunks[i].req_id); +if (test_bit (WMI_SERVICE_SUPPORT_EXTEND_ADDRESS , + ar->wmi.svc_map)) + chunk->ptr_high =__cpu_to_le32 + (upper_32_bits + (ar->wmi.mem_chunks[i].paddr)); + ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi-tlv chunk %d len %d, addr 0x%llx, id 0x%x\n", i,
drivers/net/wireless/ath/ath10k/wmi-tlv.h +29 -0
@@ -1394,6 +1394,30 @@ enum wmi_tlv_service {WMI_TLV_SERVICE_AP_TWT =153 ,WMI_TLV_SERVICE_GMAC_OFFLOAD_SUPPORT =154 ,WMI_TLV_SERVICE_SPOOF_MAC_SUPPORT =155 , +WMI_TLV_SERVICE_PEER_TID_CONFIGS_SUPPORT =156 , +WMI_TLV_SERVICE_VDEV_SWRETRY_PER_AC_CONFIG_SUPPORT =157 , +WMI_TLV_SERVICE_DUAL_BEACON_ON_SINGLE_MAC_SCC_SUPPORT =158 , +WMI_TLV_SERVICE_DUAL_BEACON_ON_SINGLE_MAC_MCC_SUPPORT =159 , +WMI_TLV_SERVICE_MOTION_DET =160 , +WMI_TLV_SERVICE_INFRA_MBSSID =161 , +WMI_TLV_SERVICE_OBSS_SPATIAL_REUSE =162 , +WMI_TLV_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT =163 , +WMI_TLV_SERVICE_NAN_DBS_SUPPORT =164 , +WMI_TLV_SERVICE_NDI_DBS_SUPPORT =165 , +WMI_TLV_SERVICE_NAN_SAP_SUPPORT =166 , +WMI_TLV_SERVICE_NDI_SAP_SUPPORT =167 , +WMI_TLV_SERVICE_CFR_CAPTURE_SUPPORT =168 , +WMI_TLV_SERVICE_CFR_CAPTURE_IND_MSG_TYPE_1 =169 , +WMI_TLV_SERVICE_ESP_SUPPORT =170 , +WMI_TLV_SERVICE_PEER_CHWIDTH_CHANGE =171 , +WMI_TLV_SERVICE_WLAN_HPCS_PULSE =172 , +WMI_TLV_SERVICE_PER_VDEV_CHAINMASK_CONFIG_SUPPORT =173 , +WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI =174 , +WMI_TLV_SERVICE_NAN_DISABLE_SUPPORT =175 , +WMI_TLV_SERVICE_HTT_H2T_NO_HTC_HDR_LEN_IN_MSG_LEN =176 , +WMI_TLV_SERVICE_COEX_SUPPORT_UNEQUAL_ISOLATION =177 , +WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT =178 , +WMI_TLV_SERVICE_SUPPORT_EXTEND_ADDRESS =179 , WMI_TLV_MAX_EXT_SERVICE = 256, };
@@ -1564,6 +1588,11 @@ enum wmi_tlv_service {SVCMAP (WMI_TLV_SERVICE_SPOOF_MAC_SUPPORT ,WMI_SERVICE_SPOOF_MAC_SUPPORT ,WMI_TLV_MAX_SERVICE ); + +SVCMAP (WMI_TLV_SERVICE_SUPPORT_EXTEND_ADDRESS , +WMI_SERVICE_SUPPORT_EXTEND_ADDRESS , +WMI_TLV_MAX_SERVICE ); + }#undef SVCMAP
drivers/net/wireless/ath/ath10k/wmi.h +3 -0
@@ -205,6 +205,7 @@ enum wmi_service {WMI_SERVICE_SPOOF_MAC_SUPPORT ,WMI_SERVICE_TX_DATA_ACK_RSSI ,WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT , +WMI_SERVICE_SUPPORT_EXTEND_ADDRESS ,/* keep last */ WMI_SERVICE_MAX,
@@ -2990,6 +2991,8 @@ struct host_memory_chunk {__le32 ptr;/* size of the chunk */ __le32 size; +/* the upper 32 bit address valid only for more than 32 bit target */ +__le32 ptr_high; } __packed;struct wmi_host_mem_chunks {
Signature · 1 line
1.9.1
Quoted 11 lines · Surabhi Vishnoi
With the current implementation of wmi init command, there is no provision for the host driver to provide mem chunks addresses with more than 32-bit, to the firmware. WCN3990 is a 35-bit target and can accept mem chunks addresses which are above 32-bit.
If firmware supports address range more than 32 bit, it advertises the support by setting the
WMI_SERVICE_EXTEND_ADDRESSservice. Based on this service fill the upper bits of paddr while providing the mem chunks in the wmi init command.
Quoted 4 lines
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01552-QCAHLSWMTPL-1Signed-off-by Surabhi Vishnoi <[email protected]>
Does not apply and I even tried to find a commit from December to make it work, and as the sha1 is not valid so 3-way merge won't work either. I strongly recommend to use pristine ath.git master branch (meaning that there are no other unapplied patches on top) when submitting patches, otherwise this can happen. Please rebase and resubmit.
Applying: ath10k: Add support to provide higher range mem chunks in wmi init command
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi-tlv.c).
error: could not build fake ancestor
Patch failed at 0001 ath10k: Add support to provide higher range mem chunks in wmi init comman
Signature · 6 lines
Kalle Valo _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k