Commit fa879490 authored by Tomislav Požega's avatar Tomislav Požega Committed by Kalle Valo

ath10k: add 2ghz channel arguments to service ready structure

Add lowest/highest 2ghz channel arguments for use within WMI service
ready structure.
Signed-off-by: default avatarTomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 6aff90c5
...@@ -967,6 +967,8 @@ struct ath10k { ...@@ -967,6 +967,8 @@ struct ath10k {
u32 num_rf_chains; u32 num_rf_chains;
u32 max_spatial_stream; u32 max_spatial_stream;
/* protected by conf_mutex */ /* protected by conf_mutex */
u32 low_2ghz_chan;
u32 high_2ghz_chan;
u32 low_5ghz_chan; u32 low_5ghz_chan;
u32 high_5ghz_chan; u32 high_5ghz_chan;
bool ani_enabled; bool ani_enabled;
......
...@@ -1207,6 +1207,8 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar, ...@@ -1207,6 +1207,8 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar,
arg->phy_capab = ev->phy_capability; arg->phy_capab = ev->phy_capability;
arg->num_rf_chains = ev->num_rf_chains; arg->num_rf_chains = ev->num_rf_chains;
arg->eeprom_rd = reg->eeprom_rd; arg->eeprom_rd = reg->eeprom_rd;
arg->low_2ghz_chan = reg->low_2ghz_chan;
arg->high_2ghz_chan = reg->high_2ghz_chan;
arg->low_5ghz_chan = reg->low_5ghz_chan; arg->low_5ghz_chan = reg->low_5ghz_chan;
arg->high_5ghz_chan = reg->high_5ghz_chan; arg->high_5ghz_chan = reg->high_5ghz_chan;
arg->num_mem_reqs = ev->num_mem_reqs; arg->num_mem_reqs = ev->num_mem_reqs;
......
...@@ -5362,6 +5362,8 @@ ath10k_wmi_main_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, ...@@ -5362,6 +5362,8 @@ ath10k_wmi_main_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb,
arg->phy_capab = ev->phy_capability; arg->phy_capab = ev->phy_capability;
arg->num_rf_chains = ev->num_rf_chains; arg->num_rf_chains = ev->num_rf_chains;
arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd;
arg->low_2ghz_chan = ev->hal_reg_capabilities.low_2ghz_chan;
arg->high_2ghz_chan = ev->hal_reg_capabilities.high_2ghz_chan;
arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan; arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan;
arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan; arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan;
arg->num_mem_reqs = ev->num_mem_reqs; arg->num_mem_reqs = ev->num_mem_reqs;
...@@ -5400,6 +5402,8 @@ ath10k_wmi_10x_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb, ...@@ -5400,6 +5402,8 @@ ath10k_wmi_10x_op_pull_svc_rdy_ev(struct ath10k *ar, struct sk_buff *skb,
arg->phy_capab = ev->phy_capability; arg->phy_capab = ev->phy_capability;
arg->num_rf_chains = ev->num_rf_chains; arg->num_rf_chains = ev->num_rf_chains;
arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd; arg->eeprom_rd = ev->hal_reg_capabilities.eeprom_rd;
arg->low_2ghz_chan = ev->hal_reg_capabilities.low_2ghz_chan;
arg->high_2ghz_chan = ev->hal_reg_capabilities.high_2ghz_chan;
arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan; arg->low_5ghz_chan = ev->hal_reg_capabilities.low_5ghz_chan;
arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan; arg->high_5ghz_chan = ev->hal_reg_capabilities.high_5ghz_chan;
arg->num_mem_reqs = ev->num_mem_reqs; arg->num_mem_reqs = ev->num_mem_reqs;
...@@ -5454,6 +5458,8 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work) ...@@ -5454,6 +5458,8 @@ static void ath10k_wmi_event_service_ready_work(struct work_struct *work)
ar->phy_capability = __le32_to_cpu(arg.phy_capab); ar->phy_capability = __le32_to_cpu(arg.phy_capab);
ar->num_rf_chains = __le32_to_cpu(arg.num_rf_chains); ar->num_rf_chains = __le32_to_cpu(arg.num_rf_chains);
ar->hw_eeprom_rd = __le32_to_cpu(arg.eeprom_rd); ar->hw_eeprom_rd = __le32_to_cpu(arg.eeprom_rd);
ar->low_2ghz_chan = __le32_to_cpu(arg.low_2ghz_chan);
ar->high_2ghz_chan = __le32_to_cpu(arg.high_2ghz_chan);
ar->low_5ghz_chan = __le32_to_cpu(arg.low_5ghz_chan); ar->low_5ghz_chan = __le32_to_cpu(arg.low_5ghz_chan);
ar->high_5ghz_chan = __le32_to_cpu(arg.high_5ghz_chan); ar->high_5ghz_chan = __le32_to_cpu(arg.high_5ghz_chan);
......
...@@ -6870,6 +6870,8 @@ struct wmi_svc_rdy_ev_arg { ...@@ -6870,6 +6870,8 @@ struct wmi_svc_rdy_ev_arg {
__le32 num_rf_chains; __le32 num_rf_chains;
__le32 eeprom_rd; __le32 eeprom_rd;
__le32 num_mem_reqs; __le32 num_mem_reqs;
__le32 low_2ghz_chan;
__le32 high_2ghz_chan;
__le32 low_5ghz_chan; __le32 low_5ghz_chan;
__le32 high_5ghz_chan; __le32 high_5ghz_chan;
const __le32 *service_map; const __le32 *service_map;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment