From 5b16ca891c9550b3d61311749ca9e906309e6c33 Mon Sep 17 00:00:00 2001 From: Deeksha Gupta Date: Thu, 1 Oct 2020 15:59:14 +0530 Subject: [PATCH] qcacmn: Change the vendor attributes name in wake lock stats Wake lock stats vendor command attribute names in the driver are different from the attribute names in upstream qca-vendor.h. Change the wake lock stats attributes name in driver. Change-Id: I761aa07dacd6a7424759ae1e501053428275b113 CRs-Fixed: 2789538 --- os_if/linux/qca_vendor.h | 116 +++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 66 deletions(-) diff --git a/os_if/linux/qca_vendor.h b/os_if/linux/qca_vendor.h index 4d6e00a3a219..45c83359888e 100644 --- a/os_if/linux/qca_vendor.h +++ b/os_if/linux/qca_vendor.h @@ -4979,74 +4979,58 @@ enum qca_wlan_vendor_attr_packet_filter { }; /** - * enum qca_wlan_vendor_attr_wake_stats - wake lock stats - * @QCA_WLAN_VENDOR_ATTR_GET_WAKE_STATS_INVALID: invalid - * @QCA_WLAN_VENDOR_ATTR_TOTAL_CMD_EVENT_WAKE: - * @QCA_WLAN_VENDOR_ATTR_CMD_EVENT_WAKE_CNT_PTR: - * @QCA_WLAN_VENDOR_ATTR_CMD_EVENT_WAKE_CNT_SZ: - * @QCA_WLAN_VENDOR_ATTR_TOTAL_DRIVER_FW_LOCAL_WAKE: - * @QCA_WLAN_VENDOR_ATTR_DRIVER_FW_LOCAL_WAKE_CNT_PTR: - * @QCA_WLAN_VENDOR_ATTR_DRIVER_FW_LOCAL_WAKE_CNT_SZ: - * @QCA_WLAN_VENDOR_ATTR_TOTAL_RX_DATA_WAKE: - * total rx wakeup count - * @QCA_WLAN_VENDOR_ATTR_RX_UNICAST_CNT: - * Total rx unicast packet which woke up host - * @QCA_WLAN_VENDOR_ATTR_RX_MULTICAST_CNT: - * Total rx multicast packet which woke up host - * @QCA_WLAN_VENDOR_ATTR_RX_BROADCAST_CNT: - * Total rx broadcast packet which woke up host - * @QCA_WLAN_VENDOR_ATTR_ICMP_PKT: - * wake icmp packet count - * @QCA_WLAN_VENDOR_ATTR_ICMP6_PKT: - * wake icmp6 packet count - * @QCA_WLAN_VENDOR_ATTR_ICMP6_RA: - * wake icmp6 RA packet count - * @QCA_WLAN_VENDOR_ATTR_ICMP6_NA: - * wake icmp6 NA packet count - * @QCA_WLAN_VENDOR_ATTR_ICMP6_NS: - * wake icmp6 NS packet count - * @QCA_WLAN_VENDOR_ATTR_ICMP4_RX_MULTICAST_CNT: - * Rx wake packet count due to ipv4 multicast - * @QCA_WLAN_VENDOR_ATTR_ICMP6_RX_MULTICAST_CNT: - * Rx wake packet count due to ipv6 multicast - * @QCA_WLAN_VENDOR_ATTR_OTHER_RX_MULTICAST_CNT: - * Rx wake packet count due to non-ipv4 and non-ipv6 packets - * @QCA_WLAN_VENDOR_ATTR_RSSI_BREACH_CNT: - * wake rssi breach packet count - * @QCA_WLAN_VENDOR_ATTR_LOW_RSSI_CNT: - * wake low rssi packet count - * @QCA_WLAN_VENDOR_ATTR_GSCAN_CNT: - * wake gscan packet count - * @QCA_WLAN_VENDOR_ATTR_PNO_COMPLETE_CNT: - * wake pno complete packet count - * @QCA_WLAN_VENDOR_ATTR_PNO_MATCH_CNT: - * wake pno match packet count + * enum qca_wlan_vendor_attr_wake_stats - Wake lock stats used by vendor + * command QCA_NL80211_VENDOR_SUBCMD_GET_WAKE_REASON_STATS. */ enum qca_wlan_vendor_attr_wake_stats { - QCA_WLAN_VENDOR_ATTR_GET_WAKE_STATS_INVALID = 0, - QCA_WLAN_VENDOR_ATTR_TOTAL_CMD_EVENT_WAKE, - QCA_WLAN_VENDOR_ATTR_CMD_EVENT_WAKE_CNT_PTR, - QCA_WLAN_VENDOR_ATTR_CMD_EVENT_WAKE_CNT_SZ, - QCA_WLAN_VENDOR_ATTR_TOTAL_DRIVER_FW_LOCAL_WAKE, - QCA_WLAN_VENDOR_ATTR_DRIVER_FW_LOCAL_WAKE_CNT_PTR, - QCA_WLAN_VENDOR_ATTR_DRIVER_FW_LOCAL_WAKE_CNT_SZ, - QCA_WLAN_VENDOR_ATTR_TOTAL_RX_DATA_WAKE, - QCA_WLAN_VENDOR_ATTR_RX_UNICAST_CNT, - QCA_WLAN_VENDOR_ATTR_RX_MULTICAST_CNT, - QCA_WLAN_VENDOR_ATTR_RX_BROADCAST_CNT, - QCA_WLAN_VENDOR_ATTR_ICMP_PKT, - QCA_WLAN_VENDOR_ATTR_ICMP6_PKT, - QCA_WLAN_VENDOR_ATTR_ICMP6_RA, - QCA_WLAN_VENDOR_ATTR_ICMP6_NA, - QCA_WLAN_VENDOR_ATTR_ICMP6_NS, - QCA_WLAN_VENDOR_ATTR_ICMP4_RX_MULTICAST_CNT, - QCA_WLAN_VENDOR_ATTR_ICMP6_RX_MULTICAST_CNT, - QCA_WLAN_VENDOR_ATTR_OTHER_RX_MULTICAST_CNT, - QCA_WLAN_VENDOR_ATTR_RSSI_BREACH_CNT, - QCA_WLAN_VENDOR_ATTR_LOW_RSSI_CNT, - QCA_WLAN_VENDOR_ATTR_GSCAN_CNT, - QCA_WLAN_VENDOR_ATTR_PNO_COMPLETE_CNT, - QCA_WLAN_VENDOR_ATTR_PNO_MATCH_CNT, + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_INVALID = 0, + /* Unsigned 32-bit value indicating the total count of wake event */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_TOTAL_CMD_EVENT_WAKE, + /* Array of individual wake count, each index representing wake reason + */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_CMD_EVENT_WAKE_CNT_PTR, + /* Unsigned 32-bit value representing wake count array */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_CMD_EVENT_WAKE_CNT_SZ, + /* Unsigned 32-bit total wake count value of driver/fw */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_TOTAL_DRIVER_FW_LOCAL_WAKE, + /* Array of wake stats of driver/fw */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_DRIVER_FW_LOCAL_WAKE_CNT_PTR, + /* Unsigned 32-bit total wake count value of driver/fw */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_DRIVER_FW_LOCAL_WAKE_CNT_SZ, + /* Unsigned 32-bit total wake count value of packets received */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_TOTAL_RX_DATA_WAKE, + /* Unsigned 32-bit wake count value unicast packets received */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_RX_UNICAST_CNT, + /* Unsigned 32-bit wake count value multicast packets received */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_RX_MULTICAST_CNT, + /* Unsigned 32-bit wake count value broadcast packets received */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_RX_BROADCAST_CNT, + /* Unsigned 32-bit wake count value of ICMP packets */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP_PKT, + /* Unsigned 32-bit wake count value of ICMP6 packets */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP6_PKT, + /* Unsigned 32-bit value ICMP6 router advertisement */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP6_RA, + /* Unsigned 32-bit value ICMP6 neighbor advertisement */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP6_NA, + /* Unsigned 32-bit value ICMP6 neighbor solicitation */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP6_NS, + /* Unsigned 32-bit wake count value of receive side ICMP4 multicast */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP4_RX_MULTICAST_CNT, + /* Unsigned 32-bit wake count value of receive side ICMP6 multicast */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_ICMP6_RX_MULTICAST_CNT, + /* Unsigned 32-bit wake count value of receive side multicast */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_OTHER_RX_MULTICAST_CNT, + /* Unsigned 32-bit wake count value of a given RSSI breach */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_RSSI_BREACH_CNT, + /* Unsigned 32-bit wake count value of low RSSI */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_LOW_RSSI_CNT, + /* Unsigned 32-bit value GSCAN count */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_GSCAN_CNT, + /* Unsigned 32-bit value PNO complete count */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_PNO_COMPLETE_CNT, + /* Unsigned 32-bit value PNO match count */ + QCA_WLAN_VENDOR_ATTR_WAKE_STATS_PNO_MATCH_CNT, /* keep last */ QCA_WLAN_VENDOR_GET_WAKE_STATS_AFTER_LAST, QCA_WLAN_VENDOR_GET_WAKE_STATS_MAX =