* [PATCH 0/4] wifi: ath: Cleanup WMI peer flags
@ 2023-11-06 18:26 Jeff Johnson
2023-11-06 18:26 ` [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags Jeff Johnson
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jeff Johnson @ 2023-11-06 18:26 UTC (permalink / raw
To: Kalle Valo; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Both ath11k and ath12k inherited from ath10k some WMI peer flag
definitions that are unused, so remove them.
This series is compile tested only.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
Jeff Johnson (4):
wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags
wifi: ath12k: Remove obsolete struct wmi_peer_flags_map *peer_flags
wifi: ath11k: Consolidate WMI peer flags
wifi: ath12k: Consolidate WMI peer flags
drivers/net/wireless/ath/ath11k/wmi.h | 61 ++++++++++-----------------------
drivers/net/wireless/ath/ath12k/wmi.h | 63 +++++++++++------------------------
2 files changed, 37 insertions(+), 87 deletions(-)
---
base-commit: ac2f43d3d34e52b0d388b4c573ff6bbac90235b9
change-id: 20231102-ath-peer-flags-824af380270b
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags
2023-11-06 18:26 [PATCH 0/4] wifi: ath: Cleanup WMI peer flags Jeff Johnson
@ 2023-11-06 18:26 ` Jeff Johnson
2023-11-22 18:25 ` Kalle Valo
2023-11-06 18:26 ` [PATCH 2/4] wifi: ath12k: " Jeff Johnson
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Jeff Johnson @ 2023-11-06 18:26 UTC (permalink / raw
To: Kalle Valo; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Currently both struct ath11k_pdev_wmi and struct ath11k_wmi_base
define:
const struct wmi_peer_flags_map *peer_flags;
But that member is not used, and in fact, struct wmi_peer_flags_map
is not defined within ath11k; these are obsolete remnants inherited
from ath10k. So remove them.
Compile tested only.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 100bb816b592..42e4234be69b 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -2580,7 +2580,6 @@ struct wmi_service_available_event {
struct ath11k_pdev_wmi {
struct ath11k_wmi_base *wmi_ab;
enum ath11k_htc_ep_id eid;
- const struct wmi_peer_flags_map *peer_flags;
u32 rx_decap_mode;
wait_queue_head_t tx_ce_desc_wq;
};
@@ -5754,7 +5753,6 @@ struct ath11k_wmi_base {
struct completion unified_ready;
DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE);
wait_queue_head_t tx_credits_wq;
- const struct wmi_peer_flags_map *peer_flags;
u32 num_mem_chunks;
u32 rx_decap_mode;
struct wmi_host_mem_chunk mem_chunks[WMI_MAX_MEM_REQS];
--
2.42.0
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] wifi: ath12k: Remove obsolete struct wmi_peer_flags_map *peer_flags
2023-11-06 18:26 [PATCH 0/4] wifi: ath: Cleanup WMI peer flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags Jeff Johnson
@ 2023-11-06 18:26 ` Jeff Johnson
2023-11-06 18:26 ` [PATCH 3/4] wifi: ath11k: Consolidate WMI peer flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 4/4] wifi: ath12k: " Jeff Johnson
3 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2023-11-06 18:26 UTC (permalink / raw
To: Kalle Valo; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Currently both struct ath12k_wmi_pdev and struct ath12k_wmi_base
define:
const struct wmi_peer_flags_map *peer_flags;
But that member is not used, and in fact, struct wmi_peer_flags_map
is not defined within ath12k; these are obsolete remnants inherited
from ath11k. So remove them.
Compile tested only.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/net/wireless/ath/ath12k/wmi.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 629373d67421..7d295330e6f1 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -4770,7 +4770,6 @@ struct wmi_probe_tmpl_cmd {
struct ath12k_wmi_pdev {
struct ath12k_wmi_base *wmi_ab;
enum ath12k_htc_ep_id eid;
- const struct wmi_peer_flags_map *peer_flags;
u32 rx_decap_mode;
};
@@ -4784,7 +4783,6 @@ struct ath12k_wmi_base {
struct completion unified_ready;
DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE);
wait_queue_head_t tx_credits_wq;
- const struct wmi_peer_flags_map *peer_flags;
u32 num_mem_chunks;
u32 rx_decap_mode;
struct ath12k_wmi_host_mem_chunk_arg mem_chunks[WMI_MAX_MEM_REQS];
--
2.42.0
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] wifi: ath11k: Consolidate WMI peer flags
2023-11-06 18:26 [PATCH 0/4] wifi: ath: Cleanup WMI peer flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 2/4] wifi: ath12k: " Jeff Johnson
@ 2023-11-06 18:26 ` Jeff Johnson
2023-11-06 18:26 ` [PATCH 4/4] wifi: ath12k: " Jeff Johnson
3 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2023-11-06 18:26 UTC (permalink / raw
To: Kalle Valo; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Currently wmi.h has two separate set of definitions for peer
flags. One set of flags is defined in enum wmi_tlv_peer_flags, and,
except for the last three, are named WMI_TLV_PEER_*. The other set of
flags are defined as macros, and are named WMI_PEER_*. The last three
macros have the same name as the last three wmi_tlv_peer_flags
enumerators.
The code only uses the WMI_PEER_* names; the WMI_TLV_PEER_* names are
unused. So as a first step in consolidation, remove all the
WMI_TLV_PEER_* names.
But since having an enum to define all the flags is actually a good
thing since that provides a handle by which to refer to the entire set
of flags, recast the WMI_PEER_* macros into enumerators.
Compile tested only.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/net/wireless/ath/ath11k/wmi.h | 59 +++++++++++------------------------
1 file changed, 18 insertions(+), 41 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 42e4234be69b..3ad29d5d0999 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -1096,25 +1096,27 @@ enum wmi_tlv_vdev_param {
};
enum wmi_tlv_peer_flags {
- WMI_TLV_PEER_AUTH = 0x00000001,
- WMI_TLV_PEER_QOS = 0x00000002,
- WMI_TLV_PEER_NEED_PTK_4_WAY = 0x00000004,
- WMI_TLV_PEER_NEED_GTK_2_WAY = 0x00000010,
- WMI_TLV_PEER_APSD = 0x00000800,
- WMI_TLV_PEER_HT = 0x00001000,
- WMI_TLV_PEER_40MHZ = 0x00002000,
- WMI_TLV_PEER_STBC = 0x00008000,
- WMI_TLV_PEER_LDPC = 0x00010000,
- WMI_TLV_PEER_DYN_MIMOPS = 0x00020000,
- WMI_TLV_PEER_STATIC_MIMOPS = 0x00040000,
- WMI_TLV_PEER_SPATIAL_MUX = 0x00200000,
- WMI_TLV_PEER_VHT = 0x02000000,
- WMI_TLV_PEER_80MHZ = 0x04000000,
- WMI_TLV_PEER_PMF = 0x08000000,
+ WMI_PEER_AUTH = 0x00000001,
+ WMI_PEER_QOS = 0x00000002,
+ WMI_PEER_NEED_PTK_4_WAY = 0x00000004,
+ WMI_PEER_NEED_GTK_2_WAY = 0x00000010,
+ WMI_PEER_HE = 0x00000400,
+ WMI_PEER_APSD = 0x00000800,
+ WMI_PEER_HT = 0x00001000,
+ WMI_PEER_40MHZ = 0x00002000,
+ WMI_PEER_STBC = 0x00008000,
+ WMI_PEER_LDPC = 0x00010000,
+ WMI_PEER_DYN_MIMOPS = 0x00020000,
+ WMI_PEER_STATIC_MIMOPS = 0x00040000,
+ WMI_PEER_SPATIAL_MUX = 0x00200000,
+ WMI_PEER_TWT_REQ = 0x00400000,
+ WMI_PEER_TWT_RESP = 0x00800000,
+ WMI_PEER_VHT = 0x02000000,
+ WMI_PEER_80MHZ = 0x04000000,
+ WMI_PEER_PMF = 0x08000000,
WMI_PEER_IS_P2P_CAPABLE = 0x20000000,
WMI_PEER_160MHZ = 0x40000000,
WMI_PEER_SAFEMODE_EN = 0x80000000,
-
};
/** Enum list of TLV Tags for each parameter structure type. */
@@ -4061,31 +4063,6 @@ struct wmi_unit_test_cmd {
#define MAX_SUPPORTED_RATES 128
-#define WMI_PEER_AUTH 0x00000001
-#define WMI_PEER_QOS 0x00000002
-#define WMI_PEER_NEED_PTK_4_WAY 0x00000004
-#define WMI_PEER_NEED_GTK_2_WAY 0x00000010
-#define WMI_PEER_HE 0x00000400
-#define WMI_PEER_APSD 0x00000800
-#define WMI_PEER_HT 0x00001000
-#define WMI_PEER_40MHZ 0x00002000
-#define WMI_PEER_STBC 0x00008000
-#define WMI_PEER_LDPC 0x00010000
-#define WMI_PEER_DYN_MIMOPS 0x00020000
-#define WMI_PEER_STATIC_MIMOPS 0x00040000
-#define WMI_PEER_SPATIAL_MUX 0x00200000
-#define WMI_PEER_TWT_REQ 0x00400000
-#define WMI_PEER_TWT_RESP 0x00800000
-#define WMI_PEER_VHT 0x02000000
-#define WMI_PEER_80MHZ 0x04000000
-#define WMI_PEER_PMF 0x08000000
-/* TODO: Place holder for WLAN_PEER_F_PS_PRESEND_REQUIRED = 0x10000000.
- * Need to be cleaned up
- */
-#define WMI_PEER_IS_P2P_CAPABLE 0x20000000
-#define WMI_PEER_160MHZ 0x40000000
-#define WMI_PEER_SAFEMODE_EN 0x80000000
-
struct beacon_tmpl_params {
u8 vdev_id;
u32 tim_ie_offset;
--
2.42.0
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] wifi: ath12k: Consolidate WMI peer flags
2023-11-06 18:26 [PATCH 0/4] wifi: ath: Cleanup WMI peer flags Jeff Johnson
` (2 preceding siblings ...)
2023-11-06 18:26 ` [PATCH 3/4] wifi: ath11k: Consolidate WMI peer flags Jeff Johnson
@ 2023-11-06 18:26 ` Jeff Johnson
3 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2023-11-06 18:26 UTC (permalink / raw
To: Kalle Valo; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Currently wmi.h has two separate set of definitions for peer
flags. One set of flags is defined in enum wmi_tlv_peer_flags, and,
except for the last three, are named WMI_TLV_PEER_*. The other set of
flags are defined as macros, and are named WMI_PEER_*. The last three
macros have the same name as the last three wmi_tlv_peer_flags
enumerators.
The code only uses the WMI_PEER_* names; the WMI_TLV_PEER_* names are
unused. So as a first step in consolidation, remove all the
WMI_TLV_PEER_* names.
But since having an enum to define all the flags is actually a good
thing since that provides a handle by which to refer to the entire set
of flags, recast the WMI_PEER_* macros into enumerators.
Compile tested only.
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
drivers/net/wireless/ath/ath12k/wmi.h | 61 +++++++++++------------------------
1 file changed, 19 insertions(+), 42 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index 7d295330e6f1..811aeea34e34 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause-Clear */
/*
* Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef ATH12K_WMI_H
@@ -1146,25 +1146,27 @@ enum wmi_tlv_vdev_param {
};
enum wmi_tlv_peer_flags {
- WMI_TLV_PEER_AUTH = 0x00000001,
- WMI_TLV_PEER_QOS = 0x00000002,
- WMI_TLV_PEER_NEED_PTK_4_WAY = 0x00000004,
- WMI_TLV_PEER_NEED_GTK_2_WAY = 0x00000010,
- WMI_TLV_PEER_APSD = 0x00000800,
- WMI_TLV_PEER_HT = 0x00001000,
- WMI_TLV_PEER_40MHZ = 0x00002000,
- WMI_TLV_PEER_STBC = 0x00008000,
- WMI_TLV_PEER_LDPC = 0x00010000,
- WMI_TLV_PEER_DYN_MIMOPS = 0x00020000,
- WMI_TLV_PEER_STATIC_MIMOPS = 0x00040000,
- WMI_TLV_PEER_SPATIAL_MUX = 0x00200000,
- WMI_TLV_PEER_VHT = 0x02000000,
- WMI_TLV_PEER_80MHZ = 0x04000000,
- WMI_TLV_PEER_PMF = 0x08000000,
+ WMI_PEER_AUTH = 0x00000001,
+ WMI_PEER_QOS = 0x00000002,
+ WMI_PEER_NEED_PTK_4_WAY = 0x00000004,
+ WMI_PEER_NEED_GTK_2_WAY = 0x00000010,
+ WMI_PEER_HE = 0x00000400,
+ WMI_PEER_APSD = 0x00000800,
+ WMI_PEER_HT = 0x00001000,
+ WMI_PEER_40MHZ = 0x00002000,
+ WMI_PEER_STBC = 0x00008000,
+ WMI_PEER_LDPC = 0x00010000,
+ WMI_PEER_DYN_MIMOPS = 0x00020000,
+ WMI_PEER_STATIC_MIMOPS = 0x00040000,
+ WMI_PEER_SPATIAL_MUX = 0x00200000,
+ WMI_PEER_TWT_REQ = 0x00400000,
+ WMI_PEER_TWT_RESP = 0x00800000,
+ WMI_PEER_VHT = 0x02000000,
+ WMI_PEER_80MHZ = 0x04000000,
+ WMI_PEER_PMF = 0x08000000,
WMI_PEER_IS_P2P_CAPABLE = 0x20000000,
WMI_PEER_160MHZ = 0x40000000,
WMI_PEER_SAFEMODE_EN = 0x80000000,
-
};
enum wmi_tlv_peer_flags_ext {
@@ -3844,31 +3846,6 @@ struct wmi_unit_test_cmd {
#define MAX_SUPPORTED_RATES 128
-#define WMI_PEER_AUTH 0x00000001
-#define WMI_PEER_QOS 0x00000002
-#define WMI_PEER_NEED_PTK_4_WAY 0x00000004
-#define WMI_PEER_NEED_GTK_2_WAY 0x00000010
-#define WMI_PEER_HE 0x00000400
-#define WMI_PEER_APSD 0x00000800
-#define WMI_PEER_HT 0x00001000
-#define WMI_PEER_40MHZ 0x00002000
-#define WMI_PEER_STBC 0x00008000
-#define WMI_PEER_LDPC 0x00010000
-#define WMI_PEER_DYN_MIMOPS 0x00020000
-#define WMI_PEER_STATIC_MIMOPS 0x00040000
-#define WMI_PEER_SPATIAL_MUX 0x00200000
-#define WMI_PEER_TWT_REQ 0x00400000
-#define WMI_PEER_TWT_RESP 0x00800000
-#define WMI_PEER_VHT 0x02000000
-#define WMI_PEER_80MHZ 0x04000000
-#define WMI_PEER_PMF 0x08000000
-/* TODO: Place holder for WLAN_PEER_F_PS_PRESEND_REQUIRED = 0x10000000.
- * Need to be cleaned up
- */
-#define WMI_PEER_IS_P2P_CAPABLE 0x20000000
-#define WMI_PEER_160MHZ 0x40000000
-#define WMI_PEER_SAFEMODE_EN 0x80000000
-
struct ath12k_wmi_vht_rate_set_params {
__le32 tlv_header;
__le32 rx_max_rate;
--
2.42.0
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags
2023-11-06 18:26 ` [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags Jeff Johnson
@ 2023-11-22 18:25 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2023-11-22 18:25 UTC (permalink / raw
To: Jeff Johnson; +Cc: ath11k, linux-wireless, linux-kernel, ath12k, Jeff Johnson
Jeff Johnson <quic_jjohnson@quicinc.com> wrote:
> Currently both struct ath11k_pdev_wmi and struct ath11k_wmi_base
> define:
> const struct wmi_peer_flags_map *peer_flags;
>
> But that member is not used, and in fact, struct wmi_peer_flags_map
> is not defined within ath11k; these are obsolete remnants inherited
> from ath10k. So remove them.
>
> Compile tested only.
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
4 patches applied to ath-next branch of ath.git, thanks.
53bcb41d9eda wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags
69bc79faa616 wifi: ath12k: Remove obsolete struct wmi_peer_flags_map *peer_flags
7d4a70201204 wifi: ath11k: Consolidate WMI peer flags
51516d9842a3 wifi: ath12k: Consolidate WMI peer flags
--
https://patchwork.kernel.org/project/linux-wireless/patch/20231106-ath-peer-flags-v1-1-781e83b7e8e8@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
--
ath12k mailing list
ath12k@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/ath12k
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-11-22 18:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-06 18:26 [PATCH 0/4] wifi: ath: Cleanup WMI peer flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 1/4] wifi: ath11k: Remove obsolete struct wmi_peer_flags_map *peer_flags Jeff Johnson
2023-11-22 18:25 ` Kalle Valo
2023-11-06 18:26 ` [PATCH 2/4] wifi: ath12k: " Jeff Johnson
2023-11-06 18:26 ` [PATCH 3/4] wifi: ath11k: Consolidate WMI peer flags Jeff Johnson
2023-11-06 18:26 ` [PATCH 4/4] wifi: ath12k: " Jeff Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).