fw-api: CL 26851667 - update fw common interface files

Change-Id: I8b9521d7a8bcffbec9a8f05feab5522459998bc6
CRs-Fixed: 3830439

fw/htt_stats.h

@@ -9142,6 +9142,200 @@ typedef struct {
 /* preserve old name alias for new name consistent with the tag name */
 typedef htt_stats_phy_stats_tlv htt_phy_stats_tlv;
 
+
+#define HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_M 0x00000001
+#define HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_S 0
+#define HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_M) >> \
+     HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_S)
+#define HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_CAL_DATA_COMPRESSED, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_CAL_DATA_COMPRESSED_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_M 0x00000006
+#define HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_S 1
+#define HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_M) >> \
+     HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_S)
+#define HTT_STATS_PHY_RESET_CAL_DATA_SOURCE_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_CAL_DATA_SOURCE, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_CAL_DATA_SOURCE_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_XTALCAL_M 0x00000008
+#define HTT_STATS_PHY_RESET_XTALCAL_S 3
+#define HTT_STATS_PHY_RESET_XTALCAL_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_XTALCAL_M) >> \
+     HTT_STATS_PHY_RESET_XTALCAL_S)
+#define HTT_STATS_PHY_RESET_XTALCAL_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_XTALCAL, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_XTALCAL_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL2GOPC_M 0x00000010
+#define HTT_STATS_PHY_RESET_TPCCAL2GOPC_S 4
+#define HTT_STATS_PHY_RESET_TPCCAL2GOPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL2GOPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL2GOPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL2GOPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL2GOPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL2GOPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL2GFPC_M 0x00000020
+#define HTT_STATS_PHY_RESET_TPCCAL2GFPC_S 5
+#define HTT_STATS_PHY_RESET_TPCCAL2GFPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL2GFPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL2GFPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL2GFPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL2GFPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL2GFPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL5GOPC_M 0x00000040
+#define HTT_STATS_PHY_RESET_TPCCAL5GOPC_S 6
+#define HTT_STATS_PHY_RESET_TPCCAL5GOPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL5GOPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL5GOPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL5GOPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL5GOPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL5GOPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL5GFPC_M 0x00000080
+#define HTT_STATS_PHY_RESET_TPCCAL5GFPC_S 7
+#define HTT_STATS_PHY_RESET_TPCCAL5GFPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL5GFPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL5GFPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL5GFPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL5GFPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL5GFPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL6GOPC_M 0x00000100
+#define HTT_STATS_PHY_RESET_TPCCAL6GOPC_S 8
+#define HTT_STATS_PHY_RESET_TPCCAL6GOPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL6GOPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL6GOPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL6GOPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL6GOPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL6GOPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_TPCCAL6GFPC_M 0x00000200
+#define HTT_STATS_PHY_RESET_TPCCAL6GFPC_S 9
+#define HTT_STATS_PHY_RESET_TPCCAL6GFPC_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_TPCCAL6GFPC_M) >> \
+     HTT_STATS_PHY_RESET_TPCCAL6GFPC_S)
+#define HTT_STATS_PHY_RESET_TPCCAL6GFPC_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_TPCCAL6GFPC, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_TPCCAL6GFPC_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_RXGAINCAL2G_M 0x00000400
+#define HTT_STATS_PHY_RESET_RXGAINCAL2G_S 10
+#define HTT_STATS_PHY_RESET_RXGAINCAL2G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_RXGAINCAL2G_M) >> \
+     HTT_STATS_PHY_RESET_RXGAINCAL2G_S)
+#define HTT_STATS_PHY_RESET_RXGAINCAL2G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_RXGAINCAL2G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_RXGAINCAL2G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_RXGAINCAL5G_M 0x00000800
+#define HTT_STATS_PHY_RESET_RXGAINCAL5G_S 11
+#define HTT_STATS_PHY_RESET_RXGAINCAL5G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_RXGAINCAL5G_M) >> \
+     HTT_STATS_PHY_RESET_RXGAINCAL5G_S)
+#define HTT_STATS_PHY_RESET_RXGAINCAL5G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_RXGAINCAL5G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_RXGAINCAL5G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_RXGAINCAL6G_M 0x00001000
+#define HTT_STATS_PHY_RESET_RXGAINCAL6G_S 12
+#define HTT_STATS_PHY_RESET_RXGAINCAL6G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_RXGAINCAL6G_M) >> \
+     HTT_STATS_PHY_RESET_RXGAINCAL6G_S)
+#define HTT_STATS_PHY_RESET_RXGAINCAL6G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_RXGAINCAL6G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_RXGAINCAL6G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_AOACAL2G_M 0x00002000
+#define HTT_STATS_PHY_RESET_AOACAL2G_S 13
+#define HTT_STATS_PHY_RESET_AOACAL2G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_AOACAL2G_M) >> \
+     HTT_STATS_PHY_RESET_AOACAL2G_S)
+#define HTT_STATS_PHY_RESET_AOACAL2G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_AOACAL2G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_AOACAL2G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_AOACAL5G_M 0x00004000
+#define HTT_STATS_PHY_RESET_AOACAL5G_S 14
+#define HTT_STATS_PHY_RESET_AOACAL5G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_AOACAL5G_M) >> \
+     HTT_STATS_PHY_RESET_AOACAL5G_S)
+#define HTT_STATS_PHY_RESET_AOACAL5G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_AOACAL5G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_AOACAL5G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_AOACAL6G_M 0x00008000
+#define HTT_STATS_PHY_RESET_AOACAL6G_S 15
+#define HTT_STATS_PHY_RESET_AOACAL6G_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_AOACAL6G_M) >> \
+     HTT_STATS_PHY_RESET_AOACAL6G_S)
+#define HTT_STATS_PHY_RESET_AOACAL6G_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_AOACAL6G, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_AOACAL6G_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_XTAL_FROM_OTP_M 0x00010000
+#define HTT_STATS_PHY_RESET_XTAL_FROM_OTP_S 16
+#define HTT_STATS_PHY_RESET_XTAL_FROM_OTP_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_XTAL_FROM_OTP_M) >> \
+     HTT_STATS_PHY_RESET_XTAL_FROM_OTP_S)
+#define HTT_STATS_PHY_RESET_XTAL_FROM_OTP_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_XTAL_FROM_OTP, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_XTAL_FROM_OTP_S)); \
+    } while (0)
+
+#define HTT_STATS_PHY_RESET_GLUT_LINEARITY_M 0x000000FF
+#define HTT_STATS_PHY_RESET_GLUT_LINEARITY_S 0
+#define HTT_STATS_PHY_RESET_GLUT_LINEARITY_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_GLUT_LINEARITY_M) >> \
+     HTT_STATS_PHY_RESET_GLUT_LINEARITY_S)
+#define HTT_STATS_PHY_RESET_GLUT_LINEARITY_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_GLUT_LINEARITY, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_GLUT_LINEARITY_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_PLUT_LINEARITY_M 0x0000FF00
+#define HTT_STATS_PHY_RESET_PLUT_LINEARITY_S 8
+#define HTT_STATS_PHY_RESET_PLUT_LINEARITY_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_PLUT_LINEARITY_M) >> \
+     HTT_STATS_PHY_RESET_PLUT_LINEARITY_S)
+#define HTT_STATS_PHY_RESET_PLUT_LINEARITY_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_PLUT_LINEARITY, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_PLUT_LINEARITY_S)); \
+    } while (0)
+#define HTT_STATS_PHY_RESET_WLANDRIVERMODE_M 0x00FF0000
+#define HTT_STATS_PHY_RESET_WLANDRIVERMODE_S 16
+#define HTT_STATS_PHY_RESET_WLANDRIVERMODE_GET(_var) \
+    (((_var) & HTT_STATS_PHY_RESET_WLANDRIVERMODE_M) >> \
+     HTT_STATS_PHY_RESET_WLANDRIVERMODE_S)
+#define HTT_STATS_PHY_RESET_WLANDRIVERMODE_SET(_var, _val) \
+    do { \
+        HTT_CHECK_SET_VAL(HTT_STATS_PHY_RESET_WLANDRIVERMODE, _val); \
+        ((_var) |= ((_val) << STATS_PHY_RESET_WLANDRIVERMODE_S)); \
+    } while (0)
+
+
 typedef struct {
     htt_tlv_hdr_t tlv_hdr;
     /** current pdev_id */
@@ -9260,6 +9454,44 @@ typedef struct {
      * when explicitly requested by the host.
      */
     A_UINT32 nfcal_iteration_counts[3];
+
+    /** Below union indicates the merge status for different cal */
+    union {
+        A_UINT32 calmerge_stats;
+        struct {
+            A_UINT32 CalData_Compressed:1,
+                     CalDataSource:2,
+                     xtalcal:1,
+                     tpccal2GFPC:1,
+                     tpccal2GOPC:1,
+                     tpccal5GFPC:1,
+                     tpccal5GOPC:1,
+                     tpccal6GFPC:1,
+                     tpccal6GOPC:1,
+                     rxgaincal2G:1,
+                     rxgaincal5G:1,
+                     rxgaincal6G:1,
+                     aoacal2G:1,
+                     aoacal5G:1,
+                     aoacal6G:1,
+                     XTAL_from_OTP:1,
+                     rsvd1:15;
+        };
+    };
+    /** Below union lets us know of any non-linearity in plut/glut
+     * and the mode we are in
+     */
+    union {
+        A_UINT32 misc_stats;
+        struct {
+            A_UINT32 GLUT_linearity:8,
+                     PLUT_linearity:8,
+                     WlanDriverMode:8,
+                     rsvd2:8;
+        };
+    };
+    /** BoardId fetched from OTP */
+    A_UINT32 BoardIDfromOTP;
 } htt_stats_phy_reset_stats_tlv;
 /* preserve old name alias for new name consistent with the tag name */
 typedef htt_stats_phy_reset_stats_tlv htt_phy_reset_stats_tlv;