ath10k: add missing values to wmi_service_name()
PATCH 1/6 ath10k: add missing values to wmi_service_name()
After implementing the next patch GCC reported:
drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BTCOEX' not handled in switch [-Wswitch] drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_MGMT_TX_WMI' not handled in switch [-Wswitch] drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_SPOOF_MAC_SUPPORT' not handled in switch [-Wswitch] drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT' not handled in switch [-Wswitch] drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT' not handled in switch [-Wswitch] drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_THERM_THROT' not handled in switch [-Wswitch]
--- drivers/net/wireless/ath/ath10k/wmi.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/ath/ath10k/wmi.h +6 -0
@@ -475,6 +475,7 @@ static inline char *wmi_service_name(int service_id)SVCSTR (WMI_SERVICE_TX_MODE_PUSH_PULL );SVCSTR (WMI_SERVICE_TX_MODE_DYNAMIC );SVCSTR (WMI_SERVICE_VDEV_RX_FILTER ); +SVCSTR (WMI_SERVICE_BTCOEX );SVCSTR (WMI_SERVICE_CHECK_CAL_VERSION );SVCSTR (WMI_SERVICE_DBGLOG_WARN2 );SVCSTR (WMI_SERVICE_BTCOEX_DUTY_CYCLE );
@@ -484,13 +485,18 @@ static inline char *wmi_service_name(int service_id)SVCSTR (WMI_SERVICE_SMART_LOGGING_SUPPORT );SVCSTR (WMI_SERVICE_TDLS_CONN_TRACKER_IN_HOST_MODE );SVCSTR (WMI_SERVICE_TDLS_EXPLICIT_MODE_ONLY ); +SVCSTR (WMI_SERVICE_MGMT_TX_WMI );SVCSTR (WMI_SERVICE_TDLS_WIDER_BANDWIDTH );SVCSTR (WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS );SVCSTR (WMI_SERVICE_HOST_DFS_CHECK_SUPPORT );SVCSTR (WMI_SERVICE_TPC_STATS_FINAL );SVCSTR (WMI_SERVICE_RESET_CHIP ); +SVCSTR (WMI_SERVICE_SPOOF_MAC_SUPPORT );SVCSTR (WMI_SERVICE_TX_DATA_ACK_RSSI );SVCSTR (WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT ); +SVCSTR (WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT ); +SVCSTR (WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT ); +SVCSTR (WMI_SERVICE_THERM_THROT );SVCSTR (WMI_SERVICE_RTT_RESPONDER_ROLE );SVCSTR (WMI_SERVICE_PER_PACKET_SW_ENCRYPT );SVCSTR (WMI_SERVICE_REPORT_AIRTIME );
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 2/6 ath10k: make wmi_service_name() warn about missing service ids
When adding a new value to enum wmi_service it's very easy to miss that the new value should be also added to wmi_service_name() mapping function. Modify the function so that GCC can now warn about this:
drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_FOO' not handled in switch [-Wswitch]
And also add a reminder to the enum.
Thanks to Jouni Malinen for the idea.
--- drivers/net/wireless/ath/ath10k/wmi.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.h +6 -2
@@ -212,6 +212,8 @@ enum wmi_service {WMI_SERVICE_PER_PACKET_SW_ENCRYPT ,WMI_SERVICE_REPORT_AIRTIME , +/* Remember to add the new value to wmi_service_name()! */ +/* keep last */ WMI_SERVICE_MAX, };
@@ -378,7 +380,7 @@ enum wmi_10_4_service { WMI_10_4_SERVICE_REPORT_AIRTIME, }; -static inline char *wmi_service_name (int service_id) +static inline char *wmi_service_name (enum wmi_service service_id) {#define SVCSTR (x) case x: return #x
@@ -501,11 +503,13 @@ static inline char *wmi_service_name(int service_id)SVCSTR (WMI_SERVICE_PER_PACKET_SW_ENCRYPT );SVCSTR (WMI_SERVICE_REPORT_AIRTIME ); -default : +case WMI_SERVICE_MAX :return NULL ; }#undef SVCSTR + +return NULL ; }#define WMI_SERVICE_IS_ENABLED (wmi_svc_bmap, svc_id, len) \
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 3/6 ath10k: change wmi.h to include only ieee80211.h
In reply to Kalle Valowmi.h does not use anything from mac80211.h so change it to include only ieee80211.h.
--- drivers/net/wireless/ath/ath10k/wmi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.h +1 -1
@@ -20,7 +20,7 @@#define _WMI_H_#include <linux/types.h> -#include <net/mac80211.h> +#include <linux/ieee80211.h> /* * This file specifies the WMI interface for the Unified Software
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 4/6 ath10k: align ath10k_htt_txbuf structures
In reply to Kalle ValoWith W=1 GCC warns:
drivers/net/wireless/ath/ath10k/htt.h:1746:1: warning: alignment 1 of 'struct ath10k_htt_txbuf_32' is less than 4 [-Wpacked-not-aligned] drivers/net/wireless/ath/ath10k/htt.h:1753:1: warning: alignment 1 of 'struct ath10k_htt_txbuf_64' is less than 4 [-Wpacked-not-aligned]
Fix that by using __align(4). Compile tested only.
--- drivers/net/wireless/ath/ath10k/htt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath10k/htt.h +2 -2
@@ -1743,14 +1743,14 @@ struct ath10k_htt_txbuf_32 {struct ath10k_htc_hdr htc_hdr;struct htt_cmd_hdr cmd_hdr;struct htt_data_tx_desc cmd_tx; -} __packed; +} __packed__aligned(4) ;struct ath10k_htt_txbuf_64 {struct htt_data_tx_desc_frag frags[2 ];struct ath10k_htc_hdr htc_hdr;struct htt_cmd_hdr cmd_hdr;struct htt_data_tx_desc_64 cmd_tx; -} __packed; +} __packed__aligned(4) ;struct ath10k_htt {struct ath10k *ar;
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
PATCH 5/6 ath10k: fix documentation in ath10k_wow_convert_8023_to_80211()
In reply to Kalle ValoWith W=1 there's a warning:
drivers/net/wireless/ath/ath10k/wow.c:93: warning: Function parameter or member 'new' not described in 'ath10k_wow_convert_8023_to_80211' drivers/net/wireless/ath/ath10k/wow.c:93: warning: Function parameter or member 'old' not described in 'ath10k_wow_convert_8023_to_80211'
Fix it by changing the documentation marker '/**' to a normal code comment. While at it, clean up the line wrapping.
--- drivers/net/wireless/ath/ath10k/wow.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/wow.c +3 -4
@@ -77,7 +77,7 @@ static int ath10k_wow_cleanup(struct ath10k *ar)return 0 ; } -/** +/* * Convert a 802.3 format to a 802.11 format. * +------------+-----------+--------+----------------+ * 802.3: |dest mac(6B)|src mac(6B)|type(2B)| body... |
@@ -88,9 +88,8 @@ static int ath10k_wow_cleanup(struct ath10k *ar)* 802.11: |4B|dest mac(6B)| 6B |src mac(6B)| 8B |type(2B)| body... | * +--+------------+----+-----------+---------------+-----------+ */ -static void ath10k_wow_convert_8023_to_80211 - (struct cfg80211_pkt_pattern *new, -const struct cfg80211_pkt_pattern *old) +static void ath10k_wow_convert_8023_to_80211 (struct cfg80211_pkt_pattern *new, +const struct cfg80211_pkt_pattern *old) {u8 hdr_8023_pattern[ETH_HLEN ] = {};u8 hdr_8023_bit_mask[ETH_HLEN ] = {};
Signature · 1 line
2.7.4
PATCH 6/6 ath10k: copy the whole struct ath10k_bus_params in ath10k_core_register()
In reply to Kalle ValoInstead of copying fields one by one copy the whole structure. This way there's no need to modify the function every time we add a new field to the struct.
Compile tested only.
--- drivers/net/wireless/ath/ath10k/core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +2 -3
@@ -2997,9 +2997,8 @@ static void ath10k_core_register_work(struct work_struct *work)int ath10k_core_register (struct ath10k *ar,const struct ath10k_bus_params *bus_params) { - ar->bus_param.chip_id = bus_params->chip_id; - ar->bus_param.dev_type = bus_params->dev_type; - ar->bus_param.link_can_suspend = bus_params->link_can_suspend; + ar->bus_param = *bus_params; +queue_work (ar->workqueue, &ar->register_work);return 0 ;
Signature · 7 lines
2.7.4 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 10 lines · Kalle Valo
After implementing the next patch GCC reported:
drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BTCOEX' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_MGMT_TX_WMI' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_SPOOF_MAC_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_THERM_THROT' not handled in switch [-Wswitch]Signed-off-by Kalle Valo <[email protected]>
6 patches applied to ath-next branch of ath.git, thanks.
2321dd5d78fb ath10k: add missing values to wmi_service_name() 95cccf4d79fe ath10k: make wmi_service_name() warn about missing service ids db3b6280f5f1 ath10k: change wmi.h to include only ieee80211.h 385bd8816cb5 ath10k: align ath10k_htt_txbuf structuresbdf2bd9aa684 ath10k: fix documentation in ath10k_wow_convert_8023_to_80211() 01dc76dfdc91 ath10k: copy the whole struct ath10k_bus_params in ath10k_core_register()
Signature · 9 lines
https://patchwork.kernel.org/patch/10806063/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 10 lines · Kalle Valo
After implementing the next patch GCC reported:
drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BTCOEX' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_MGMT_TX_WMI' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_SPOOF_MAC_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT' not handled in switch [-Wswitch]drivers/net/wireless/ath/ath10k/wmi.h:385:2: warning: enumeration value 'WMI_SERVICE_THERM_THROT' not handled in switch [-Wswitch]Signed-off-by Kalle Valo <[email protected]>
6 patches applied to ath-next branch of ath.git, thanks.
2321dd5d78fb ath10k: add missing values to wmi_service_name() 95cccf4d79fe ath10k: make wmi_service_name() warn about missing service ids db3b6280f5f1 ath10k: change wmi.h to include only ieee80211.h 385bd8816cb5 ath10k: align ath10k_htt_txbuf structuresbdf2bd9aa684 ath10k: fix documentation in ath10k_wow_convert_8023_to_80211() 01dc76dfdc91 ath10k: copy the whole struct ath10k_bus_params in ath10k_core_register()
Signature · 3 lines
https://patchwork.kernel.org/patch/10806063/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches