From 87b3e2425eafb3fe69efb4049387d172cfde0fcc Mon Sep 17 00:00:00 2001 From: spuligil Date: Sun, 7 Jun 2026 18:01:41 -0700 Subject: [PATCH] fw-api: CL 32798720 - update fw common interface files Change-Id: If7511eee9deb2e3b966ebb156163e2b565f1a395 CRs-Fixed: 3830439 --- fw/wmi_unified.h | 30 +++++++++++++++++++++++++++++- fw/wmi_version.h | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 6c014a0cef49..b36235063ebc 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -28017,6 +28017,22 @@ typedef struct { A_UINT32 req_type; } wmi_aggr_state_trig_event_fixed_param; +/* + * WMI_KEY_FIPS_STATUS + * + * Reported to the host in WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID via + * bits[4:5] of key_flags. Use WMI_KEY_FLAGS_FIPS_COMPLIANT_GET/SET macros. + */ +typedef enum { + WMI_KEY_FIPS_NOT_APPROVED = 1, + WMI_KEY_FIPS_APPROVED = 2, +} WMI_KEY_FIPS_STATUS; + +#define WMI_KEY_FLAGS_FIPS_COMPLIANT_GET(key_flags) \ + WMI_GET_BITS(key_flags, 4, 2) +#define WMI_KEY_FLAGS_FIPS_COMPLIANT_SET(key_flags, val) \ + WMI_SET_BITS(key_flags, 4, 2, val) + typedef struct { A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_vdev_install_key_complete_event_fixed_param */ /** unique id identifying the VDEV, generated by the caller */ @@ -28025,7 +28041,19 @@ typedef struct { wmi_mac_addr peer_macaddr; /** key index */ A_UINT32 key_ix; - /** key flags */ + /** key flags — bit definitions (see KEY_USAGE enum in wmi.h): + * bit[0]: key usage type + * 0 = PAIRWISE_USAGE — unicast/pairwise key + * 1 = GROUP_USAGE — broadcast/multicast group key + * bit[1]: TX_USAGE (0x02) — default Tx key (static WEP only) + * bit[2]: PMK_USAGE (0x04) — PMK cache entry + * bit[3]: LTF_USAGE (0x08) — LTF key seed + * bits[4:5]: FIPS compliance status (WMI_KEY_FIPS_STATUS enum) + * 1 = WMI_KEY_FIPS_NOT_APPROVED (WEP, TKIP, WAPI) + * 2 = WMI_KEY_FIPS_APPROVED (AES-CCM/GCM/CMAC/GMAC) + * Use WMI_KEY_FLAGS_FIPS_COMPLIANT_GET/SET to access. + * bits[6:31]: reserved + */ A_UINT32 key_flags; /** Event status */ A_UINT32 status; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 0b7e383b709e..61e845021657 100644 --- a/fw/wmi_version.h +++ b/fw/wmi_version.h @@ -37,7 +37,7 @@ #define __WMI_VER_MINOR_ 0 /** WMI revision number has to be incremented when there is a * change that may or may not break compatibility. */ -#define __WMI_REVISION_ 1777 +#define __WMI_REVISION_ 1778 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work