samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

qcacmn: Remove WCSS_VERSION macros used inside hal

Przeglądaj źródła 
Remove WCSS_VERSION macros which were used for emulation inside
HAL

Change-Id: Ia774b41c01ee2e2e3bbc2902b776e03eb4109057
This commit is contained in:
Pranita Solanke
2019-04-05 11:14:28 +05:30
zatwierdzone przez nshrivas
rodzic 6b276f6a8f
commit 5cac6f52ae
2 zmienionych plików z 0 dodań i 67 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
hal/wifi3.0/hal_generic_api.h
Wyświetl plik

@@ -59,9 +59,6 @@ static void *hal_rx_link_desc_msdu0_ptr_generic(void *link_desc)
* *
* Return: none * Return: none
*/ */
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
static inline void hal_tx_comp_get_status_generic(void *desc, static inline void hal_tx_comp_get_status_generic(void *desc,
void *ts1, void *hal) void *ts1, void *hal)
{ {
@@ -117,25 +114,6 @@ static inline void hal_tx_comp_get_status_generic(void *desc,
ts->tsf = HAL_TX_DESC_GET(desc, UNIFIED_WBM_RELEASE_RING_6, ts->tsf = HAL_TX_DESC_GET(desc, UNIFIED_WBM_RELEASE_RING_6,
TX_RATE_STATS_INFO_TX_RATE_STATS); TX_RATE_STATS_INFO_TX_RATE_STATS);
} }
#else
static inline void hal_tx_comp_get_status_generic(void *desc,
struct hal_tx_completion_status *ts, void *hal)
{
ts->ppdu_id = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_3,
TQM_STATUS_NUMBER);
ts->ack_frame_rssi = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_4,
ACK_FRAME_RSSI);
ts->first_msdu = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_4, FIRST_MSDU);
ts->last_msdu = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_4, LAST_MSDU);
ts->msdu_part_of_amsdu = HAL_TX_DESC_GET(desc, WBM_RELEASE_RING_4,
MSDU_PART_OF_AMSDU);
ts->release_src = hal_tx_comp_get_buffer_source(desc);
ts->status = hal_tx_comp_get_release_reason(desc, hal);
}
#endif
/** /**
* hal_tx_desc_set_buf_addr - Fill Buffer Address information in Tx Descriptor * hal_tx_desc_set_buf_addr - Fill Buffer Address information in Tx Descriptor
@@ -1541,14 +1519,7 @@ static inline void hal_srng_src_hw_init_generic(void *halsoc,
srng->entry_size * srng->num_entries); srng->entry_size * srng->num_entries);
SRNG_SRC_REG_WRITE(srng, BASE_MSB, reg_val); SRNG_SRC_REG_WRITE(srng, BASE_MSB, reg_val);
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
reg_val = SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size); reg_val = SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size);
#else
reg_val = SRNG_SM(SRNG_SRC_FLD(ID, RING_ID), srng->ring_id) |
SRNG_SM(SRNG_SRC_FLD(ID, ENTRY_SIZE), srng->entry_size);
#endif
SRNG_SRC_REG_WRITE(srng, ID, reg_val); SRNG_SRC_REG_WRITE(srng, ID, reg_val);
/** /**

38
hal/wifi3.0/hal_rx.h
Wyświetl plik

@@ -619,21 +619,13 @@ struct rx_pkt_hdr_tlv {
* 2) TLV's don't span across 128 byte lines * 2) TLV's don't span across 128 byte lines
* 3) Rx Buffer is nicely aligned on the 128 byte boundary * 3) Rx Buffer is nicely aligned on the 128 byte boundary
*/ */
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION >= 96)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
#define RX_PADDING0_BYTES 4 #define RX_PADDING0_BYTES 4
#endif
#define RX_PADDING1_BYTES 16 #define RX_PADDING1_BYTES 16
struct rx_pkt_tlvs { struct rx_pkt_tlvs {
struct rx_msdu_end_tlv msdu_end_tlv; /* 72 bytes */ struct rx_msdu_end_tlv msdu_end_tlv; /* 72 bytes */
struct rx_attention_tlv attn_tlv; /* 16 bytes */ struct rx_attention_tlv attn_tlv; /* 16 bytes */
struct rx_msdu_start_tlv msdu_start_tlv;/* 40 bytes */ struct rx_msdu_start_tlv msdu_start_tlv;/* 40 bytes */
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION >= 96)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
uint8_t rx_padding0[RX_PADDING0_BYTES]; /* 4 bytes */ uint8_t rx_padding0[RX_PADDING0_BYTES]; /* 4 bytes */
#endif
struct rx_mpdu_start_tlv mpdu_start_tlv;/* 96 bytes */ struct rx_mpdu_start_tlv mpdu_start_tlv;/* 96 bytes */
struct rx_mpdu_end_tlv mpdu_end_tlv; /* 12 bytes */ struct rx_mpdu_end_tlv mpdu_end_tlv; /* 12 bytes */
uint8_t rx_padding1[RX_PADDING1_BYTES]; /* 16 bytes */ uint8_t rx_padding1[RX_PADDING1_BYTES]; /* 16 bytes */
@@ -951,21 +943,11 @@ hal_rx_mpdu_peer_meta_data_set(uint8_t *buf, uint32_t peer_mdata)
HAL_RX_MPDU_PEER_META_DATA_SET(mpdu_info, peer_mdata); HAL_RX_MPDU_PEER_META_DATA_SET(mpdu_info, peer_mdata);
} }
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
#define HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(_rx_msdu_end) \ #define HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \ (_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_5_L3_HEADER_PADDING_OFFSET)), \ RX_MSDU_END_5_L3_HEADER_PADDING_OFFSET)), \
RX_MSDU_END_5_L3_HEADER_PADDING_MASK, \ RX_MSDU_END_5_L3_HEADER_PADDING_MASK, \
RX_MSDU_END_5_L3_HEADER_PADDING_LSB)) RX_MSDU_END_5_L3_HEADER_PADDING_LSB))
#else
#define HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_9_L3_HEADER_PADDING_OFFSET)), \
RX_MSDU_END_9_L3_HEADER_PADDING_MASK, \
RX_MSDU_END_9_L3_HEADER_PADDING_LSB))
#endif
/** /**
* LRO information needed from the TLVs * LRO information needed from the TLVs
@@ -1297,21 +1279,11 @@ hal_rx_mpdu_start_sw_peer_id_get(uint8_t *buf)
return sw_peer_id; return sw_peer_id;
} }
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
#define HAL_RX_MSDU_START_SGI_GET(_rx_msdu_start) \ #define HAL_RX_MSDU_START_SGI_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
RX_MSDU_START_5_SGI_OFFSET)), \ RX_MSDU_START_5_SGI_OFFSET)), \
RX_MSDU_START_5_SGI_MASK, \ RX_MSDU_START_5_SGI_MASK, \
RX_MSDU_START_5_SGI_LSB)) RX_MSDU_START_5_SGI_LSB))
#else
#define HAL_RX_MSDU_START_SGI_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
RX_MSDU_START_6_SGI_OFFSET)), \
RX_MSDU_START_6_SGI_MASK, \
RX_MSDU_START_6_SGI_LSB))
#endif
/** /**
* hal_rx_msdu_start_msdu_sgi_get(): API to get the Short Gaurd * hal_rx_msdu_start_msdu_sgi_get(): API to get the Short Gaurd
* Interval from rx_msdu_start TLV * Interval from rx_msdu_start TLV
@@ -1332,21 +1304,11 @@ hal_rx_msdu_start_sgi_get(uint8_t *buf)
return sgi; return sgi;
} }
#if defined(WCSS_VERSION) && \
((defined(CONFIG_WIN) && (WCSS_VERSION > 81)) || \
(defined(CONFIG_MCL) && (WCSS_VERSION >= 72)))
#define HAL_RX_MSDU_START_RATE_MCS_GET(_rx_msdu_start) \ #define HAL_RX_MSDU_START_RATE_MCS_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\ (_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
RX_MSDU_START_5_RATE_MCS_OFFSET)), \ RX_MSDU_START_5_RATE_MCS_OFFSET)), \
RX_MSDU_START_5_RATE_MCS_MASK, \ RX_MSDU_START_5_RATE_MCS_MASK, \
RX_MSDU_START_5_RATE_MCS_LSB)) RX_MSDU_START_5_RATE_MCS_LSB))
#else
#define HAL_RX_MSDU_START_RATE_MCS_GET(_rx_msdu_start) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR((_rx_msdu_start),\
RX_MSDU_START_6_RATE_MCS_OFFSET)), \
RX_MSDU_START_6_RATE_MCS_MASK, \
RX_MSDU_START_6_RATE_MCS_LSB))
#endif
/** /**
* hal_rx_msdu_start_msdu_rate_mcs_get(): API to get the MCS rate * hal_rx_msdu_start_msdu_rate_mcs_get(): API to get the MCS rate
* from rx_msdu_start TLV * from rx_msdu_start TLV