samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: convert target HT cap bitmap to host bitmap

Browse Source 
HT cap bit map is different for tlv and non-tlv based firmware.
Convert target cap to host cap bitmap to abstract out the differences.

Change-Id: Ia803efa3a895c7faa159d8051277d2a926b365a5
This commit is contained in:
Nandha Kishore Easwaran
2017-06-15 10:29:29 +05:30
committed by snandini
parent 4aec367c8f
commit a769b36571
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wmi_unified_non_tlv.c
View File

@@ -5406,6 +5406,27 @@ static bool is_service_enabled_non_tlv(wmi_unified_t wmi_handle,
service_id); service_id);
} }
static inline void copy_ht_cap_info(uint32_t ev_target_cap,
struct wlan_psoc_target_capability_info *cap)
{
cap->ht_cap_info |= ev_target_cap & (
WMI_HT_CAP_ENABLED
| WMI_HT_CAP_HT20_SGI
| WMI_HT_CAP_DYNAMIC_SMPS
| WMI_HT_CAP_TX_STBC
| WMI_HT_CAP_TX_STBC_MASK_SHIFT
| WMI_HT_CAP_RX_STBC
| WMI_HT_CAP_RX_STBC_MASK_SHIFT
| WMI_HT_CAP_LDPC
| WMI_HT_CAP_L_SIG_TXOP_PROT
| WMI_HT_CAP_MPDU_DENSITY
| WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT
| WMI_HT_CAP_HT40_SGI
| WMI_HT_CAP_IBF_BFER);
if (ev_target_cap & WMI_HT_CAP_IBF_BFER)
cap->ht_cap_info |= WMI_HOST_HT_CAP_IBF_BFER;
}
/** /**
* extract_service_ready_non_tlv() - extract service ready event * extract_service_ready_non_tlv() - extract service ready event
* @wmi_handle: wmi handle * @wmi_handle: wmi handle
@@ -5425,7 +5446,7 @@ static QDF_STATUS extract_service_ready_non_tlv(wmi_unified_t wmi_handle,
cap->phy_capability = ev->phy_capability; cap->phy_capability = ev->phy_capability;
cap->max_frag_entry = ev->max_frag_entry; cap->max_frag_entry = ev->max_frag_entry;
cap->num_rf_chains = ev->num_rf_chains; cap->num_rf_chains = ev->num_rf_chains;
cap->ht_cap_info = ev->ht_cap_info; copy_ht_cap_info(ev->ht_cap_info, cap);
cap->vht_cap_info = ev->vht_cap_info; cap->vht_cap_info = ev->vht_cap_info;
cap->vht_supp_mcs = ev->vht_supp_mcs; cap->vht_supp_mcs = ev->vht_supp_mcs;
cap->hw_min_tx_power = ev->hw_min_tx_power; cap->hw_min_tx_power = ev->hw_min_tx_power;

25
wmi_unified_tlv.c
View File

@@ -15391,6 +15391,29 @@ static bool is_service_enabled_tlv(wmi_unified_t wmi_handle,
} }
#endif #endif
static inline void copy_ht_cap_info(uint32_t ev_target_cap,
struct wlan_psoc_target_capability_info *cap)
{
/* except LDPC all flags are common betwen legacy and here
* also IBFEER is not defined for TLV
*/
cap->ht_cap_info |= ev_target_cap & (
WMI_HT_CAP_ENABLED
| WMI_HT_CAP_HT20_SGI
| WMI_HT_CAP_DYNAMIC_SMPS
| WMI_HT_CAP_TX_STBC
| WMI_HT_CAP_TX_STBC_MASK_SHIFT
| WMI_HT_CAP_RX_STBC
| WMI_HT_CAP_RX_STBC_MASK_SHIFT
| WMI_HT_CAP_LDPC
| WMI_HT_CAP_L_SIG_TXOP_PROT
| WMI_HT_CAP_MPDU_DENSITY
| WMI_HT_CAP_MPDU_DENSITY_MASK_SHIFT
| WMI_HT_CAP_HT40_SGI);
if (ev_target_cap & WMI_HT_CAP_LDPC)
cap->ht_cap_info |= WMI_HOST_HT_CAP_RX_LDPC |
WMI_HOST_HT_CAP_TX_LDPC;
}
/** /**
* extract_service_ready_tlv() - extract service ready event * extract_service_ready_tlv() - extract service ready event
* @wmi_handle: wmi handle * @wmi_handle: wmi handle
@@ -15417,7 +15440,7 @@ static QDF_STATUS extract_service_ready_tlv(wmi_unified_t wmi_handle,
cap->phy_capability = ev->phy_capability; cap->phy_capability = ev->phy_capability;
cap->max_frag_entry = ev->max_frag_entry; cap->max_frag_entry = ev->max_frag_entry;
cap->num_rf_chains = ev->num_rf_chains; cap->num_rf_chains = ev->num_rf_chains;
cap->ht_cap_info = ev->ht_cap_info; copy_ht_cap_info(ev->ht_cap_info, cap);
cap->vht_cap_info = ev->vht_cap_info; cap->vht_cap_info = ev->vht_cap_info;
cap->vht_supp_mcs = ev->vht_supp_mcs; cap->vht_supp_mcs = ev->vht_supp_mcs;
cap->hw_min_tx_power = ev->hw_min_tx_power; cap->hw_min_tx_power = ev->hw_min_tx_power;