ath11k: Rename atf_config to flag1 in target_resource_config

PATCH In review Jouni Malinen 2 participants 5 messages Jul 20, 2021 – Sep 16, 2021 Qualcomm Atheros ATH11K wireless driver

lore

Share & tools

lore

Jouni Malinen

author

2021-07-20 21:49 UTC #0 lore raw

PATCH 1/3 ath11k: Rename atf_config to flag1 in target_resource_config

From: Seevalamuthu Mariappan <[email protected]>

The flag's purpose is not only meant for ATF configs. Rename atf_config to flag1, so it can be used for future purposes.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1

Signed-off-by Seevalamuthu Mariappan <[email protected]>

Signed-off-by Jouni Malinen <[email protected]>

---
 drivers/net/wireless/ath/ath11k/wmi.c | 2 +-
 drivers/net/wireless/ath/ath11k/wmi.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

drivers/net/wireless/ath/ath11k/wmi.c +1 -1

index 6c253eae9d06..a53783229520 100644
@@ -3495,7 +3495,7 @@ ath11k_wmi_copy_resource_config(struct wmi_resource_config *wmi_cfg,
 	wmi_cfg->bpf_instruction_size = tg_cfg->bpf_instruction_size;
 	wmi_cfg->max_bssid_rx_filters = tg_cfg->max_bssid_rx_filters;
 	wmi_cfg->use_pdev_id = tg_cfg->use_pdev_id;
-	wmi_cfg->flag1 = tg_cfg->atf_config;
+	wmi_cfg->flag1 = tg_cfg->flag1;
 	wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support;
 	wmi_cfg->sched_params = tg_cfg->sched_params;
 	wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count;

drivers/net/wireless/ath/ath11k/wmi.h +1 -1

index d35c47e0b19d..234aa59f708e 100644
@@ -5014,7 +5014,7 @@ struct target_resource_config {
 	u32 vo_minfree;
 	u32 rx_batchmode;
 	u32 tt_support;
-	u32 atf_config;
+	u32 flag1;
 	u32 iphdr_pad_config;
 	u32 qwrap_config:16,
 	    alloc_frag_desc_for_data_pkt:16;

Signature · 7 lines

2.25.1


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Jouni Malinen

author

2021-07-20 21:49 UTC #1 lore raw

PATCH 2/3 ath11k: add support in survey dump with bss_chan_info

From: Seevalamuthu Mariappan <[email protected]>

Survey dump statistics is not displaying channel rx and tx time because the service flag is not enabled. Enable the service flag "bss_chan_info" in wmi_resource_config to fetch and print the stats for the specific pdev.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1

Signed-off-by Ritesh Singh <[email protected]>

Signed-off-by Seevalamuthu Mariappan <[email protected]>

Signed-off-by Jouni Malinen <[email protected]>

---
 drivers/net/wireless/ath/ath11k/hw.c  | 2 ++
 drivers/net/wireless/ath/ath11k/wmi.h | 2 ++
 2 files changed, 4 insertions(+)

drivers/net/wireless/ath/ath11k/hw.c +2 -0

index d9596903b0a5..9dd02f8b1dd2 100644
@@ -97,6 +97,7 @@ static void ath11k_init_wmi_config_qca6390(struct ath11k_base *ab,
 	config->num_multicast_filter_entries = 0x20;
 	config->num_wow_filters = 0x16;
 	config->num_keep_alive_pattern = 0;
+	config->flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64;
 }
 
 static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab)

@@ -197,6 +198,7 @@ static void ath11k_init_wmi_config_ipq8074(struct ath11k_base *ab,
 	config->peer_map_unmap_v2_support = 1;
 	config->twt_ap_pdev_count = ab->num_radios;
 	config->twt_ap_sta_count = 1000;
+	config->flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64;
 }
 
 static int ath11k_hw_mac_id_to_pdev_id_ipq8074(struct ath11k_hw_params *hw,

drivers/net/wireless/ath/ath11k/wmi.h +2 -0

index 234aa59f708e..78849f0255fa 100644
@@ -2244,6 +2244,8 @@ struct wmi_init_cmd {
 	u32 num_host_mem_chunks;
 } __packed;
 
+#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5)
+
 struct wmi_resource_config {
 	u32 tlv_header;
 	u32 num_vdevs;

Signature · 7 lines

2.25.1


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Jouni Malinen

author

2021-07-20 21:50 UTC #2 lore raw

PATCH 3/3 ath11k: Align bss_chan_info structure with firmware

In reply to Jouni Malinen

From: Seevalamuthu Mariappan <[email protected]>

pdev_id in structure 'wmi_pdev_bss_chan_info_event' is wrongly placed at the beginning. This causes invalid values in survey dump. Hence, align the structure with the firmware.

Note: The firmware releases follow this order since the feature was implemented. Also, it is not changing across the branches including QCA6390.

Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1

Signed-off-by Ritesh Singh <[email protected]>

Signed-off-by Seevalamuthu Mariappan <[email protected]>

Signed-off-by Jouni Malinen <[email protected]>

---
 drivers/net/wireless/ath/ath11k/wmi.c | 1 +
 drivers/net/wireless/ath/ath11k/wmi.h | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

drivers/net/wireless/ath/ath11k/wmi.c +1 -0

index a53783229520..e3d11a0a7b7c 100644
@@ -1339,6 +1339,7 @@ int ath11k_wmi_pdev_bss_chan_info_request(struct ath11k *ar,
 				     WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST) |
 			  FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
 	cmd->req_type = type;
+	cmd->pdev_id = ar->pdev->pdev_id;
 
 	ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
 		   "WMI bss chan info req type %d\n", type);

drivers/net/wireless/ath/ath11k/wmi.h +2 -1

index 78849f0255fa..799b3bd96a27 100644
@@ -2962,6 +2962,7 @@ struct wmi_pdev_bss_chan_info_req_cmd {
 	u32 tlv_header;
 	/* ref wmi_bss_chan_info_req_type */
 	u32 req_type;
+	u32 pdev_id;
 } __packed;
 
 struct wmi_ap_ps_peer_cmd {

@@ -4058,7 +4059,6 @@ struct wmi_vdev_stopped_event {
 } __packed;
 
 struct wmi_pdev_bss_chan_info_event {
-	u32 pdev_id;
 	u32 freq;	/* Units in MHz */
 	u32 noise_floor;	/* units are dBm */
 	/* rx clear - how often the channel was unused */

@@ -4076,6 +4076,7 @@ struct wmi_pdev_bss_chan_info_event {
 	/*rx_cycle cnt for my bss in 64bits format */
 	u32 rx_bss_cycle_count_low;
 	u32 rx_bss_cycle_count_high;
+	u32 pdev_id;
 } __packed;
 
 #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0

Signature · 7 lines

2.25.1


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

Kalle Valo

2021-09-16 09:25 UTC #3 lore raw

In reply to Jouni Malinen

Quoted 8 lines · Jouni Malinen

The flag's purpose is not only meant for ATF configs. Rename atf_config to flag1, so it can be used for future purposes.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1
Signed-off-by Seevalamuthu Mariappan <[email protected]>
Signed-off-by Jouni Malinen <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

3 patches applied to ath-next branch of ath.git, thanks.

7e9fb2418a4c ath11k: Rename atf_config to flag1 in target_resource_config 9b4dd38b46cf ath11k: add support in survey dump with bss_chan_info feab5bb8f1d4 ath11k: Align bss_chan_info structure with firmware

Signature · 3 lines

https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Kalle Valo

2021-09-16 09:25 UTC #4 lore raw

In reply to Jouni Malinen

Quoted 8 lines · Jouni Malinen

The flag's purpose is not only meant for ATF configs. Rename atf_config to flag1, so it can be used for future purposes.
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01228-QCAHKSWPL_SILICONZ-1
Signed-off-by Seevalamuthu Mariappan <[email protected]>
Signed-off-by Jouni Malinen <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

3 patches applied to ath-next branch of ath.git, thanks.

Signature · 9 lines

https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k