Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40c5edb5 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 08105d29 on remote branch 

Change-Id: I18fe684cb7d1bdeb53c97db517b2638c0d2f9a43
parents be117bea 08105d29

fw/htc.h

+6 −2
Original line number Diff line number Diff line
@@ -166,12 +166,16 @@ typedef PREPACK struct _HTC_FRAME_HDR{ 
/* base message ID header */

typedef PREPACK struct {

    A_UINT32 MessageID: 16,

             reserved : 16;

             MetaData:   8,

             reserved:   8;

} POSTPACK HTC_UNKNOWN_MSG;



#define HTC_UNKNOWN_MSG_MESSAGEID_LSB                 0

#define HTC_UNKNOWN_MSG_MESSAGEID_MASK                0x0000ffff

#define HTC_UNKNOWN_MSG_MESSAGEID_OFFSET              0x00000000

#define HTC_UNKNOWN_MSG_METADATA_LSB                  16

#define HTC_UNKNOWN_MSG_METADATA_MASK                 0X00ff0000

#define HTC_UNKNOWN_MSG_METADATA_OFFSET               0x00000000



/* HTC ready message

 * direction : target-to-host  */

fw/htt.h

+2034 −256

File changed.

Preview size limit exceeded, changes collapsed.

fw/htt_ppdu_stats.h

+17 −1
Original line number Diff line number Diff line
@@ -876,6 +876,16 @@ typedef struct { 
                     reserved3:     31;

        };

    };

    /* is_manual_ulofdma_trigger:

     * Flag to indicate if a given UL OFDMA trigger is manually triggered

     * from the Host

     */

    A_UINT32 is_manual_ulofdma_trigger;

    /* is_combined_ul_bsrp_trigger:

     * Flag to indicate if a given UL BSRP trigger is sent combined as

     * part of existing DL/UL data sequence

     */

    A_UINT32 is_combined_ul_bsrp_trigger;

} htt_ppdu_stats_common_tlv;



#define HTT_PPDU_STATS_USER_COMMON_TLV_TID_NUM_M     0x000000ff
@@ -2442,7 +2452,7 @@ typedef struct { 


    /*

     * Max rates configured per BW:

     * for BW supported by Smart Antenna - 20MHZ, 40MHZ and 80MHZ and 160MHZ

     * for BW supported by Smart Antenna - 20MHZ, 40MHZ, 80MHZ and 160MHZ

     * (Note: 160 MHz is currently not supported by Smart Antenna)

     */

    A_UINT32 max_rates[HTT_STATS_NUM_SUPPORTED_BW_SMART_ANTENNA];
@@ -2463,6 +2473,12 @@ typedef struct { 
             sw_rts_failure:    1,

             cts_rcvd_diff_bw:  1,

             reserved2:        28;



    /*

     * Max rates configured per BW:

     * for BW supported by Smart Antenna - 320 MHZ

     */

    A_UINT32 max_rates_ext;

} htt_ppdu_stats_user_cmpltn_common_tlv;



#define HTT_PPDU_STATS_USER_CMPLTN_BA_BITMAP_TLV_TID_NUM_M     0x000000ff

fw/htt_stats.h

+674 −1

File changed.

Preview size limit exceeded, changes collapsed.

fw/wlan_defs.h

+24 −7
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ typedef enum { 
    MODE_11AX_HE80_2G = 23,

#endif



#if defined(SUPPORT_11BE) && SUPPORT_11BE

#if (defined(SUPPORT_11BE) && SUPPORT_11BE) || defined(SUPPORT_11BE_ROM)

    MODE_11BE_EHT20 = 24,

    MODE_11BE_EHT40 = 25,

    MODE_11BE_EHT80 = 26,
@@ -248,7 +248,7 @@ typedef enum { 
        ((mode) == MODE_11AX_HE80_2G))

#endif /* SUPPORT_11AX */



#if defined(SUPPORT_11BE) && SUPPORT_11BE

#if (defined(SUPPORT_11BE) && SUPPORT_11BE) || defined(SUPPORT_11BE_ROM)

#define IS_MODE_EHT(mode) (((mode) == MODE_11BE_EHT20) || \

        ((mode) == MODE_11BE_EHT40)     || \

        ((mode) == MODE_11BE_EHT80)     || \
@@ -1763,11 +1763,17 @@ A_COMPILE_TIME_ASSERT(check_mlo_glb_per_chip_crash_info, 
        (((sizeof(mlo_glb_per_chip_crash_info) % sizeof(A_UINT64) == 0x0))));



/** Helper macro for params GET/SET of mlo_glb_chip_crash_info */

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_GET(chip_info) MLO_SHMEM_GET_BITS(chip_info, 0, 2)

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_SET(chip_info, value) MLO_SHMEM_SET_BITS(chip_info, 0, 2, value)

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_GET(chip_info) \

    (MLO_SHMEM_GET_BITS(chip_info, 0, 2) + \

     (MLO_SHMEM_GET_BITS(chip_info, 12, 4) << 2))

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_SET(chip_info, value) \

    do { \

       MLO_SHMEM_SET_BITS(chip_info, 0, 2, ((value) & 0x03)); \

       MLO_SHMEM_SET_BITS(chip_info, 12, 4, ((value) >> 2)); \

} while (0)



#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_GET(chip_info) MLO_SHMEM_GET_BITS(chip_info, 2, 3)

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_SET(chip_info, value) MLO_SHMEM_SET_BITS(chip_info, 2, 3, value)

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_GET(chip_info) MLO_SHMEM_GET_BITS(chip_info, 2, 8)

#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_SET(chip_info, value) MLO_SHMEM_SET_BITS(chip_info, 2, 8, value)



typedef struct {

    /* TLV tag and len; tag equals MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO */
@@ -1778,7 +1784,18 @@ typedef struct { 
     *

     * [1:0]:  no_of_chips

     * [4:2]:  valid_chip_bmap

     * [31:6]: reserved

     * For number of chips beyond 3, extension fields are added.

     * To maintain backward compatibility, with 3 chip board and

     * old host driver, valid chip bmap is extended in continuation from

     * existing bit 4 onwards, while extending no_of_chips information

     * would overlap with old valid_chip_bmap, hence extended from

     * bit 12:15. Now no_of_chip will have two parts, lower 2 bits from 0-1 and

     * upper 4 bits from 12-15. SET-GET macros are modified accordingly.

     * This helps in no change in respective processing files and don't need

     * to maintain two copy of information for backward compatibility.

     * [9:5]:  valid_chip_bmap_ext

     * [15:12]: no_of_chips_ext

     * [31:16]: reserved

     */

    A_UINT32 chip_info;

    /*  This TLV is followed by array of mlo_glb_per_chip_crash_info: