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

qcacmn: Change macro IPA_WDI3_RX_TWO_PIPES to IPA_WDI3_VLAN_SUPPORT

Browse Source 
Change macro IPA_WDI3_RX_TWO_PIPES to IPA_WDI3_VLAN_SUPPORT to represent
the feature supported under this macro

Change-Id: Ie1e387d641052cd5690c63f0c1216f4852544605
CRs-Fixed: 3250264
This commit is contained in:
Himanshu Batra
2022-07-14 12:12:04 +05:30
committed by Madan Koyyalamudi
parent 81603fe08c
commit a2f709fa4f
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dp/wifi3.0/dp_htt.c
View File

@@ -549,7 +549,7 @@ int htt_srng_setup(struct htt_soc *soc, int mac_id,
(lmac_id * HAL_MAX_RINGS_PER_LMAC))) { (lmac_id * HAL_MAX_RINGS_PER_LMAC))) {
htt_ring_id = HTT_HOST2_TO_FW_RXBUF_RING; htt_ring_id = HTT_HOST2_TO_FW_RXBUF_RING;
htt_ring_type = HTT_SW_TO_SW_RING; htt_ring_type = HTT_SW_TO_SW_RING;
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
} else if (srng_params.ring_id == } else if (srng_params.ring_id ==
(HAL_SRNG_WMAC1_SW2RXDMA0_BUF3 + (HAL_SRNG_WMAC1_SW2RXDMA0_BUF3 +
(lmac_id * HAL_MAX_RINGS_PER_LMAC))) { (lmac_id * HAL_MAX_RINGS_PER_LMAC))) {

12
dp/wifi3.0/dp_ipa.c
View File

@@ -1175,7 +1175,7 @@ static void dp_rx_ipa_uc_detach(struct dp_soc *soc, struct dp_pdev *pdev)
* *
* Return: none * Return: none
*/ */
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
static void dp_rx_alt_ipa_uc_detach(struct dp_soc *soc, struct dp_pdev *pdev) static void dp_rx_alt_ipa_uc_detach(struct dp_soc *soc, struct dp_pdev *pdev)
{ {
struct dp_ipa_resources *ipa_res = &pdev->ipa_resource; struct dp_ipa_resources *ipa_res = &pdev->ipa_resource;
@@ -1386,7 +1386,7 @@ int dp_ipa_uc_attach(struct dp_soc *soc, struct dp_pdev *pdev)
return QDF_STATUS_SUCCESS; /* success */ return QDF_STATUS_SUCCESS; /* success */
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_ipa_rx_alt_ring_resource_setup() - setup IPA 2nd RX ring resources * dp_ipa_rx_alt_ring_resource_setup() - setup IPA 2nd RX ring resources
* @soc: data path SoC handle * @soc: data path SoC handle
@@ -1623,7 +1623,7 @@ int dp_ipa_ring_resource_setup(struct dp_soc *soc,
return 0; return 0;
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_ipa_rx_alt_ring_get_resource() - get IPA 2nd RX ring resources * dp_ipa_rx_alt_ring_get_resource() - get IPA 2nd RX ring resources
* @pdev: data path pdev handle * @pdev: data path pdev handle
@@ -1728,7 +1728,7 @@ QDF_STATUS dp_ipa_get_resource(struct cdp_soc_t *soc_hdl, uint8_t pdev_id)
dp_ipa_set_tx_doorbell_paddr(soc, ipa_res) dp_ipa_set_tx_doorbell_paddr(soc, ipa_res)
#endif #endif
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_ipa_map_rx_alt_ring_doorbell_paddr() - Map 2nd rx ring doorbell paddr * dp_ipa_map_rx_alt_ring_doorbell_paddr() - Map 2nd rx ring doorbell paddr
* @pdev: data path pdev handle * @pdev: data path pdev handle
@@ -2286,7 +2286,7 @@ dp_ipa_wdi_rx_smmu_params(struct dp_soc *soc,
soc->rx_pkt_tlv_size + L3_HEADER_PADDING; soc->rx_pkt_tlv_size + L3_HEADER_PADDING;
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_ipa_wdi_rx_alt_pipe_smmu_params() - Setup 2nd rx pipe smmu params * dp_ipa_wdi_rx_alt_pipe_smmu_params() - Setup 2nd rx pipe smmu params
* @soc: data path soc handle * @soc: data path soc handle
@@ -2637,7 +2637,7 @@ QDF_STATUS dp_ipa_setup(struct cdp_soc_t *soc_hdl, uint8_t pdev_id,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_ipa_set_rx1_used() - Set rx1 used flag for 2nd rx offload ring * dp_ipa_set_rx1_used() - Set rx1 used flag for 2nd rx offload ring
* @in: pipe in handle * @in: pipe in handle

8
dp/wifi3.0/dp_main.c
View File

@@ -4095,7 +4095,7 @@ static void dp_soc_disable_unused_mac_intr_mask(struct dp_soc *soc,
} }
#ifdef IPA_OFFLOAD #ifdef IPA_OFFLOAD
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* /*
* dp_soc_reset_ipa_vlan_intr_mask() - reset interrupt mask for IPA offloaded * dp_soc_reset_ipa_vlan_intr_mask() - reset interrupt mask for IPA offloaded
* ring for vlan tagged traffic * ring for vlan tagged traffic
@@ -4134,7 +4134,7 @@ static void dp_soc_reset_ipa_vlan_intr_mask(struct dp_soc *soc)
static inline static inline
void dp_soc_reset_ipa_vlan_intr_mask(struct dp_soc *soc) void dp_soc_reset_ipa_vlan_intr_mask(struct dp_soc *soc)
{ } { }
#endif /* IPA_WDI3_RX_TWO_PIPES */ #endif /* IPA_WDI3_VLAN_SUPPORT */
#else #else
static inline static inline
void dp_soc_reset_ipa_vlan_intr_mask(struct dp_soc *soc) void dp_soc_reset_ipa_vlan_intr_mask(struct dp_soc *soc)
@@ -5102,7 +5102,7 @@ static int dp_setup_ipa_rx_refill_buf_ring(struct dp_soc *soc,
return QDF_STATUS_SUCCESS; return QDF_STATUS_SUCCESS;
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
static int dp_setup_ipa_rx_alt_refill_buf_ring(struct dp_soc *soc, static int dp_setup_ipa_rx_alt_refill_buf_ring(struct dp_soc *soc,
struct dp_pdev *pdev) struct dp_pdev *pdev)
{ {
@@ -6191,7 +6191,7 @@ dp_htt_setup_rxdma_err_dst_ring(struct dp_soc *soc, int mac_id,
RXDMA_DST); RXDMA_DST);
} }
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
static inline static inline
void dp_rxdma_setup_refill_ring3(struct dp_soc *soc, void dp_rxdma_setup_refill_ring3(struct dp_soc *soc,
struct dp_pdev *pdev, struct dp_pdev *pdev,

6
dp/wifi3.0/dp_types.h
View File

@@ -2268,7 +2268,7 @@ struct dp_soc {
#endif #endif
struct ipa_dp_rx_rsc ipa_uc_rx_rsc; struct ipa_dp_rx_rsc ipa_uc_rx_rsc;
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
struct ipa_dp_rx_rsc ipa_uc_rx_rsc_alt; struct ipa_dp_rx_rsc ipa_uc_rx_rsc_alt;
#endif #endif
qdf_atomic_t ipa_pipes_enabled; qdf_atomic_t ipa_pipes_enabled;
@@ -2497,7 +2497,7 @@ struct dp_ipa_resources {
qdf_dma_addr_t tx_alt_comp_doorbell_paddr; qdf_dma_addr_t tx_alt_comp_doorbell_paddr;
uint32_t *tx_alt_comp_doorbell_vaddr; uint32_t *tx_alt_comp_doorbell_vaddr;
#endif #endif
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
qdf_shared_mem_t rx_alt_rdy_ring; qdf_shared_mem_t rx_alt_rdy_ring;
qdf_shared_mem_t rx_alt_refill_ring; qdf_shared_mem_t rx_alt_refill_ring;
qdf_dma_addr_t rx_alt_ready_doorbell_paddr; qdf_dma_addr_t rx_alt_ready_doorbell_paddr;
@@ -2804,7 +2804,7 @@ struct dp_pdev {
/* Second ring used to replenish rx buffers */ /* Second ring used to replenish rx buffers */
struct dp_srng rx_refill_buf_ring2; struct dp_srng rx_refill_buf_ring2;
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
/* Third ring used to replenish rx buffers */ /* Third ring used to replenish rx buffers */
struct dp_srng rx_refill_buf_ring3; struct dp_srng rx_refill_buf_ring3;
#endif #endif

2
hal/wifi3.0/hal_internal.h
View File

@@ -280,7 +280,7 @@ enum hal_srng_ring_id {
#ifdef IPA_OFFLOAD #ifdef IPA_OFFLOAD
HAL_SRNG_WMAC1_SW2RXDMA0_BUF1, HAL_SRNG_WMAC1_SW2RXDMA0_BUF1,
HAL_SRNG_WMAC1_SW2RXDMA0_BUF2, HAL_SRNG_WMAC1_SW2RXDMA0_BUF2,
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
HAL_SRNG_WMAC1_SW2RXDMA0_BUF3, HAL_SRNG_WMAC1_SW2RXDMA0_BUF3,
#endif #endif
HAL_SRNG_WMAC1_SW2RXDMA1_BUF, HAL_SRNG_WMAC1_SW2RXDMA1_BUF,

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

@@ -2273,7 +2273,7 @@ struct hal_hw_srng_config hw_srng_table_9000[] = {
{ /* RXDMA_BUF */ { /* RXDMA_BUF */
.start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA0_BUF0, .start_ring_id = HAL_SRNG_WMAC1_SW2RXDMA0_BUF0,
#ifdef IPA_OFFLOAD #ifdef IPA_OFFLOAD
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
.max_rings = 4, .max_rings = 4,
#else #else
.max_rings = 3, .max_rings = 3,

6
qdf/inc/qdf_ipa_wdi3.h
View File

@@ -209,7 +209,7 @@ typedef __qdf_ipa_wdi_reg_intf_in_params_t qdf_ipa_wdi_reg_intf_in_params_t;
#define QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in) \ #define QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in) \
__QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in) __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in)
#endif #endif
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in) \ #define QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in) \
__QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in) __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in)
#endif #endif
@@ -309,7 +309,7 @@ typedef __qdf_ipa_wdi_conn_in_params_t qdf_ipa_wdi_conn_in_params_t;
#define QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_ALT_DB_PA(pipe_out) \ #define QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_ALT_DB_PA(pipe_out) \
__QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_ALT_DB_PA(pipe_out) __QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_ALT_DB_PA(pipe_out)
#endif #endif
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in) \ #define QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in) \
__QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in) __QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in)
#define QDF_IPA_WDI_CONN_IN_PARAMS_RX_ALT(pipe_in) \ #define QDF_IPA_WDI_CONN_IN_PARAMS_RX_ALT(pipe_in) \
@@ -329,7 +329,7 @@ typedef __qdf_ipa_wdi_conn_out_params_t qdf_ipa_wdi_conn_out_params_t;
__QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_DB_VA(pipe_out) __QDF_IPA_WDI_CONN_OUT_PARAMS_TX_UC_DB_VA(pipe_out)
#define QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out) \ #define QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out) \
__QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out) __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out)
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out) \ #define QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out) \
__QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out) __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out)
#endif #endif

6
qdf/linux/src/i_qdf_ipa_wdi3.h
View File

@@ -191,7 +191,7 @@ typedef struct ipa_wdi_reg_intf_in_params __qdf_ipa_wdi_reg_intf_in_params_t;
#define __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in) \ #define __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_TX1_USED(in) \
(((struct ipa_wdi_reg_intf_in_params *)(in))->is_tx1_used) (((struct ipa_wdi_reg_intf_in_params *)(in))->is_tx1_used)
#endif #endif
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in) \ #define __QDF_IPA_WDI_REG_INTF_IN_PARAMS_IS_RX1_USED(in) \
(((struct ipa_wdi_reg_intf_in_params *)(in))->is_rx1_used) (((struct ipa_wdi_reg_intf_in_params *)(in))->is_rx1_used)
#endif #endif
@@ -317,7 +317,7 @@ typedef struct ipa_wdi_conn_in_params __qdf_ipa_wdi_conn_in_params_t;
(((struct ipa_wdi_conn_in_params *)(pipe_in))->u_rx.rx) (((struct ipa_wdi_conn_in_params *)(pipe_in))->u_rx.rx)
#define __QDF_IPA_WDI_CONN_IN_PARAMS_RX_SMMU(pipe_in) \ #define __QDF_IPA_WDI_CONN_IN_PARAMS_RX_SMMU(pipe_in) \
(((struct ipa_wdi_conn_in_params *)(pipe_in))->u_rx.rx_smmu) (((struct ipa_wdi_conn_in_params *)(pipe_in))->u_rx.rx_smmu)
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define __QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in) \ #define __QDF_IPA_WDI_CONN_IN_PARAMS_IS_RX1_USED(pipe_in) \
(((struct ipa_wdi_conn_in_params *)(pipe_in))->is_rx1_used) (((struct ipa_wdi_conn_in_params *)(pipe_in))->is_rx1_used)
#define __QDF_IPA_WDI_CONN_IN_PARAMS_RX_ALT(pipe_in) \ #define __QDF_IPA_WDI_CONN_IN_PARAMS_RX_ALT(pipe_in) \
@@ -347,7 +347,7 @@ typedef struct ipa_wdi_conn_out_params __qdf_ipa_wdi_conn_out_params_t;
#endif #endif
#define __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out) \ #define __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_UC_DB_PA(pipe_out) \
(((struct ipa_wdi_conn_out_params *)(pipe_out))->rx_uc_db_pa) (((struct ipa_wdi_conn_out_params *)(pipe_out))->rx_uc_db_pa)
#ifdef IPA_WDI3_RX_TWO_PIPES #ifdef IPA_WDI3_VLAN_SUPPORT
#define __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out) \ #define __QDF_IPA_WDI_CONN_OUT_PARAMS_RX_ALT_UC_DB_PA(pipe_out) \
(((struct ipa_wdi_conn_out_params *)(pipe_out))->rx1_uc_db_pa) (((struct ipa_wdi_conn_out_params *)(pipe_out))->rx1_uc_db_pa)
#endif #endif