samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Fix HAL_RX_MSDU_END_DA_IDX_GET macro compilation failure

Browse Source 
Move HAL_RX_MSDU_END_DA_IDX_GET macros to chip specific header file.
Fixing compilation failure for 6490 and 6750.
hal_rx_msdu_packet_metadata_get_generic need not be chip specific,
macros defining the function are already chip specific.

Change-Id: I940a289662bdeddfbf99fae2a80d7796334832e7
CRs-Fixed: 2595314
This commit is contained in:
Manjunathappa Prakash
2020-02-05 15:32:48 -08:00
parent 6997a37a1e
commit 5fb8965b74
5 changed files with 16 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hal/wifi3.0/qca6490/hal_6490.c
View File

@@ -461,12 +461,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6490(uint8_t *buf)
return reception_type; return reception_type;
} }
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)), \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
/** /**
* hal_rx_msdu_end_da_idx_get_6490: API to get da_idx * hal_rx_msdu_end_da_idx_get_6490: API to get da_idx
* from rx_msdu_end TLV * from rx_msdu_end TLV
@@ -1291,30 +1285,6 @@ uint16_t hal_rx_get_rx_sequence_6490(uint8_t *buf)
return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info); return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info);
} }
/**
* hal_rx_msdu_packet_metadata_get_6490(): API to get the
* msdu information from rx_msdu_end TLV
*
* @ buf: pointer to the start of RX PKT TLV headers
* @ hal_rx_msdu_metadata: pointer to the msdu info structure
*/
static void
hal_rx_msdu_packet_metadata_get_6490(uint8_t *buf,
void *msdu_pkt_metadata)
{
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
struct hal_rx_msdu_metadata *msdu_metadata =
(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
msdu_metadata->l3_hdr_pad =
HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
msdu_metadata->sa_sw_peer_id =
HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
}
/** /**
* hal_get_window_address_6490(): Function to get hp/tp address * hal_get_window_address_6490(): Function to get hp/tp address
* @hal_soc: Pointer to hal_soc * @hal_soc: Pointer to hal_soc
@@ -1419,7 +1389,7 @@ struct hal_hw_txrx_ops qca6490_hal_hw_txrx_ops = {
NULL, NULL,
NULL, NULL,
/* rx - msdu end fast path info fields */ /* rx - msdu end fast path info fields */
hal_rx_msdu_packet_metadata_get_6490, hal_rx_msdu_packet_metadata_get_generic,
}; };
struct hal_hw_srng_config hw_srng_table_6490[] = { struct hal_hw_srng_config hw_srng_table_6490[] = {

7
hal/wifi3.0/qca6490/hal_6490_rx.h
View File

@@ -356,4 +356,11 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \ RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \
RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \ RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \
RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB)) RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB))
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)), \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
#endif #endif

32
hal/wifi3.0/qca6750/hal_6750.c
View File

@@ -453,12 +453,6 @@ uint32_t hal_rx_msdu_start_reception_type_get_6750(uint8_t *buf)
return reception_type; return reception_type;
} }
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)), \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
/** /**
* hal_rx_msdu_end_da_idx_get_6750: API to get da_idx * hal_rx_msdu_end_da_idx_get_6750: API to get da_idx
* from rx_msdu_end TLV * from rx_msdu_end TLV
@@ -1284,30 +1278,6 @@ uint16_t hal_rx_get_rx_sequence_6750(uint8_t *buf)
return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info); return HAL_RX_MPDU_GET_SEQUENCE_NUMBER(rx_mpdu_info);
} }
/**
* hal_rx_msdu_packet_metadata_get_6750(): API to get the
* msdu information from rx_msdu_end TLV
*
* @ buf: pointer to the start of RX PKT TLV headers
* @ hal_rx_msdu_metadata: pointer to the msdu info structure
*/
static void
hal_rx_msdu_packet_metadata_get_6750(uint8_t *buf,
void *msdu_pkt_metadata)
{
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
struct hal_rx_msdu_metadata *msdu_metadata =
(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
msdu_metadata->l3_hdr_pad =
HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
msdu_metadata->sa_sw_peer_id =
HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
}
/** /**
* hal_get_window_address_6750(): Function to get hp/tp address * hal_get_window_address_6750(): Function to get hp/tp address
* @hal_soc: Pointer to hal_soc * @hal_soc: Pointer to hal_soc
@@ -1412,7 +1382,7 @@ struct hal_hw_txrx_ops qca6750_hal_hw_txrx_ops = {
NULL, NULL,
NULL, NULL,
/* rx - msdu end fast path info fields */ /* rx - msdu end fast path info fields */
hal_rx_msdu_packet_metadata_get_6750, hal_rx_msdu_packet_metadata_get_generic,
}; };
struct hal_hw_srng_config hw_srng_table_6750[] = { struct hal_hw_srng_config hw_srng_table_6750[] = {

6
hal/wifi3.0/qca6750/hal_6750_rx.h
View File

@@ -356,4 +356,10 @@ RX_MSDU_DETAILS_2_RX_MSDU_DESC_INFO_DETAILS_RESERVED_0A_OFFSET))
RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \ RX_MSDU_END_10_TCP_UDP_CHKSUM_OFFSET)), \
RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \ RX_MSDU_END_10_TCP_UDP_CHKSUM_MASK, \
RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB)) RX_MSDU_END_10_TCP_UDP_CHKSUM_LSB))
#define HAL_RX_MSDU_END_DA_IDX_GET(_rx_msdu_end) \
(_HAL_MS((*_OFFSET_TO_WORD_PTR(_rx_msdu_end, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_OFFSET)), \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_MASK, \
RX_MSDU_END_11_DA_IDX_OR_SW_PEER_ID_LSB))
#endif #endif

26
hal/wifi3.0/qcn9000/hal_9000.c
View File

@@ -1343,30 +1343,6 @@ static inline void hal_write_window_register(struct hal_soc *hal_soc)
WINDOW_CONFIGURATION_VALUE_9000); WINDOW_CONFIGURATION_VALUE_9000);
} }
/**
* hal_rx_msdu_packet_metadata_get_9000(): API to get the
* msdu information from rx_msdu_end TLV
*
* @ buf: pointer to the start of RX PKT TLV headers
* @ hal_rx_msdu_metadata: pointer to the msdu info structure
*/
static void
hal_rx_msdu_packet_metadata_get_9000(uint8_t *buf,
void *msdu_pkt_metadata)
{
struct rx_pkt_tlvs *pkt_tlvs = (struct rx_pkt_tlvs *)buf;
struct rx_msdu_end *msdu_end = &pkt_tlvs->msdu_end_tlv.rx_msdu_end;
struct hal_rx_msdu_metadata *msdu_metadata =
(struct hal_rx_msdu_metadata *)msdu_pkt_metadata;
msdu_metadata->l3_hdr_pad =
HAL_RX_MSDU_END_L3_HEADER_PADDING_GET(msdu_end);
msdu_metadata->sa_idx = HAL_RX_MSDU_END_SA_IDX_GET(msdu_end);
msdu_metadata->da_idx = HAL_RX_MSDU_END_DA_IDX_GET(msdu_end);
msdu_metadata->sa_sw_peer_id =
HAL_RX_MSDU_END_SA_SW_PEER_ID_GET(msdu_end);
}
struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = { struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
/* init and setup */ /* init and setup */
@@ -1459,7 +1435,7 @@ struct hal_hw_txrx_ops qcn9000_hal_hw_txrx_ops = {
NULL, NULL,
NULL, NULL,
/* rx - msdu fast path info fields */ /* rx - msdu fast path info fields */
hal_rx_msdu_packet_metadata_get_9000, hal_rx_msdu_packet_metadata_get_generic,
}; };
struct hal_hw_srng_config hw_srng_table_9000[] = { struct hal_hw_srng_config hw_srng_table_9000[] = {