summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortinlin <tinlin@codeaurora.org>2017-11-22 14:03:32 +0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-11-28 05:50:02 -0800
commit696b1c91bd4500fa3b0c07022f0c59bc75e27b30 (patch)
treec66e3d4efc64f1a8a866653f758a2faa54629ebc
parentfb4711443568fc62fac5416b5dc1da1f0bae8d35 (diff)
qcacld-2.0: CL 3590756 - Update fw common interface files
Define WMI_VDEV_HE bitmap Change-Id: I3655f13407cb335adf0a39ebcf261e9294c5fdec CRs-fixed: 865207
-rw-r--r--CORE/SERVICES/COMMON/wmi_unified.h50
-rw-r--r--CORE/SERVICES/COMMON/wmi_version.h2
2 files changed, 41 insertions, 11 deletions
diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
index 01280984f602..4d1a6bc0a52d 100644
--- a/CORE/SERVICES/COMMON/wmi_unified.h
+++ b/CORE/SERVICES/COMMON/wmi_unified.h
@@ -7948,20 +7948,22 @@ typedef enum {
/* 11AX SPECIFIC defines */
/* USE this for BSS color change */
WMI_VDEV_PARAM_BSS_COLOR, /* 0x8001 */
+
/*
* Enable / disable trigger access for a AP vdev's peers.
* For a STA mode vdev this will enable/disable triggered access
* and enable/disable Multi User mode of operation.
- * 0 Disable MU OFDMA and MU MIMO
- * 1 Disable DL OFDMA
- * 2 Disable DL MUMIMO
- * 3 Disable UL OFDMA
- * 4 Disable UL MUMIMO
- * 5 Enable MU OFDMA and MU MIMO
- * 6 Enable DL OFDMA
- * 7 Enable DL MUMIMO
- * 8 Enable UL OFDMA
- * 9 Enable UL MUMIMO
+ * A value of 0 in a given bit disables corresponding mode.
+ * bit | hemu mode
+ * ---------------
+ * 0 | HE SUBFEE
+ * 1 | HE SUBFER
+ * 2 | HE MUBFEE
+ * 3 | HE MUBFER
+ * 4 | DL OFDMA, for AP its DL Tx OFDMA for Sta its Rx OFDMA
+ * 5 | UL OFDMA, for AP its Tx OFDMA trigger for Sta its Rx OFDMA
+ * | trigger receive & UL response
+ * 6 | UL MUMIMO
*/
WMI_VDEV_PARAM_SET_HEMU_MODE, /* 0x8002 */
WMI_VDEV_PARAM_HEOPS_0_31, /* 0x8003 */
@@ -7969,6 +7971,34 @@ typedef enum {
/*=== END VDEV_PARAM_PROTOTYPE SECTION ===*/
} WMI_VDEV_PARAM;
+#define WMI_VDEV_HE_SUBFEE_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 0, 1)
+#define WMI_VDEV_HE_SUBFEE_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 0, 1, 1)
+#define WMI_VDEV_HE_SUBFEE_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 0, 1, 0)
+
+#define WMI_VDEV_HE_SUBFER_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 1, 1)
+#define WMI_VDEV_HE_SUBFER_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 1, 1, 1)
+#define WMI_VDEV_HE_SUBFER_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 1, 1, 0)
+
+#define WMI_VDEV_HE_MUBFEE_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 2, 1)
+#define WMI_VDEV_HE_MUBFEE_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 2, 1, 1)
+#define WMI_VDEV_HE_MUBFEE_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 2, 1, 0)
+
+#define WMI_VDEV_HE_MUBFER_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 3, 1)
+#define WMI_VDEV_HE_MUBFER_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 3, 1, 1)
+#define WMI_VDEV_HE_MUBFER_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 3, 1, 0)
+
+#define WMI_VDEV_HE_DLOFDMA_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 4, 1)
+#define WMI_VDEV_HE_DLOFDMA_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 4, 1, 1)
+#define WMI_VDEV_HE_DLOFDMA_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 4, 1, 0)
+
+#define WMI_VDEV_HE_ULOFDMA_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 5, 1)
+#define WMI_VDEV_HE_ULOFDMA_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 5, 1, 1)
+#define WMI_VDEV_HE_ULOFDMA_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 5, 1, 0)
+
+#define WMI_VDEV_HE_ULMUMIMO_IS_ENABLED(hemu_mode) WMI_GET_BITS(hemu_mode, 6, 1)
+#define WMI_VDEV_HE_ULMUMIMO_ENABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 6, 1, 1)
+#define WMI_VDEV_HE_ULMUMIMO_DISABLE(hemu_mode) WMI_SET_BITS(hemu_mode, 6, 1, 0)
+
/* vdev capabilities bit mask */
#define WMI_VDEV_BEACON_SUPPORT 0x1
#define WMI_VDEV_WDS_LRN_ENABLED 0x2
diff --git a/CORE/SERVICES/COMMON/wmi_version.h b/CORE/SERVICES/COMMON/wmi_version.h
index db5e1e244506..62945c8e25b1 100644
--- a/CORE/SERVICES/COMMON/wmi_version.h
+++ b/CORE/SERVICES/COMMON/wmi_version.h
@@ -36,7 +36,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_ 452
+#define __WMI_REVISION_ 453
/** The Version Namespace should not be normally changed. Only
* host and firmware of the same WMI namespace will work