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

qcacmn: Datapath changes for WiSA specification

Browse Source 
Datapath changes for WiSA specification.
 - Multicast packets with 50000 as destination
   port should go at 6Mbps.
 - Multicast packets with 50001 as destination
   port should go at 24Mbps.

Change-Id: I582b13fd85e2bdc0e49739a1c6f8d8a3b295902f
CRs-Fixed: 1010412
This commit is contained in:
Nirav Shah
2016-05-16 10:45:16 +05:30
committed by Vishwajith Upendra
parent 31d694b25a
commit da0881a68f
15 changed files with 39 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hif/inc/hif.h
View File

@@ -575,8 +575,6 @@ void hif_process_runtime_resume_success(struct hif_opaque_softc *);
int hif_dump_registers(struct hif_opaque_softc *scn);
int ol_copy_ramdump(struct hif_opaque_softc *scn);
void hif_crash_shutdown(struct hif_opaque_softc *hif_ctx);
void hif_bus_pkt_dl_len_set(struct hif_opaque_softc *hif_sc,
unsigned int pkt_download_len);
void hif_get_hw_info(struct hif_opaque_softc *scn, u32 *version, u32 *revision,
const char **target_name);
void hif_lro_flush_cb_register(struct hif_opaque_softc *scn,
@@ -598,8 +596,8 @@ qdf_nbuf_t hif_batch_send(struct hif_opaque_softc *osc, qdf_nbuf_t msdu,
uint32_t transfer_id, u_int32_t len, uint32_t sendhead);
int hif_send_single(struct hif_opaque_softc *osc, qdf_nbuf_t msdu, uint32_t
transfer_id, u_int32_t len);
int hif_send_fast(struct hif_opaque_softc *osc, qdf_nbuf_t *nbuf_arr, uint32_t
num_msdus, uint32_t transfer_id);
int hif_send_fast(struct hif_opaque_softc *osc, qdf_nbuf_t nbuf,
uint32_t transfer_id, uint32_t download_len);
void hif_pkt_dl_len_set(void *hif_sc, unsigned int pkt_download_len);
void hif_ce_war_disable(void);
void hif_ce_war_enable(void);

5
hif/src/ce/ce_api.h
View File

@@ -150,11 +150,10 @@ int ce_send(struct CE_handle *copyeng,
unsigned int user_flags);
#ifdef WLAN_FEATURE_FASTPATH
int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
unsigned int num_msdus, unsigned int transfer_id);
int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t msdu,
unsigned int transfer_id, uint32_t download_len);
#endif
void ce_pkt_dl_len_set(void *hif_sc, unsigned int pkt_download_len);
void ce_update_tx_ring(struct CE_handle *ce_tx_hdl, uint32_t num_htt_cmpls);
extern qdf_nbuf_t ce_batch_send(struct CE_handle *ce_tx_hdl,

1
hif/src/ce/ce_internal.h
View File

@@ -107,7 +107,6 @@ struct CE_state {
enum CE_op_state state;
#ifdef WLAN_FEATURE_FASTPATH
u_int32_t download_len; /* pkt download length for source ring */
fastpath_msg_handler fastpath_handler;
void *context;
#endif /* WLAN_FEATURE_FASTPATH */

66
hif/src/ce/ce_service.c
View File

@@ -539,9 +539,9 @@ ce_buffer_addr_hi_set(struct CE_src_desc *shadow_src_desc,
/**
* ce_send_fast() CE layer Tx buffer posting function
* @copyeng: copy engine handle
* @msdus: iarray of msdu to be sent
* @num_msdus: number of msdus in an array
* @msdu: msdu to be sent
* @transfer_id: transfer_id
* @download_len: packet download length
*
* Assumption : Called with an array of MSDU's
* Function:
@@ -552,8 +552,8 @@ ce_buffer_addr_hi_set(struct CE_src_desc *shadow_src_desc,
*
* Return: No. of packets that could be sent
*/
int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
unsigned int num_msdus, unsigned int transfer_id)
int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t msdu,
unsigned int transfer_id, uint32_t download_len)
{
struct CE_state *ce_state = (struct CE_state *)copyeng;
struct hif_softc *scn = ce_state->scn;
@@ -564,8 +564,6 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
unsigned int write_index;
unsigned int sw_index;
unsigned int frag_len;
qdf_nbuf_t msdu;
int i;
uint64_t dma_addr;
uint32_t user_flags;
@@ -581,9 +579,9 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
NULL, NULL, write_index);
if (qdf_unlikely(CE_RING_DELTA(nentries_mask, write_index, sw_index - 1)
< (SLOTS_PER_DATAPATH_TX * num_msdus))) {
< SLOTS_PER_DATAPATH_TX)) {
HIF_ERROR("Source ring full, required %d, available %d",
(SLOTS_PER_DATAPATH_TX * num_msdus),
SLOTS_PER_DATAPATH_TX,
CE_RING_DELTA(nentries_mask, write_index, sw_index - 1));
OL_ATH_CE_PKT_ERROR_COUNT_INCR(scn, CE_RING_DELTA_FAIL);
Q_TARGET_ACCESS_END(scn);
@@ -591,8 +589,7 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
return 0;
}
/* 2 msdus per packet */
for (i = 0; i < num_msdus; i++) {
{
struct CE_src_desc *src_ring_base =
(struct CE_src_desc *)src_ring->base_addr_owner_space;
struct CE_src_desc *shadow_base =
@@ -603,7 +600,6 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
CE_SRC_RING_TO_DESC(shadow_base, write_index);
hif_pm_runtime_get_noresume(hif_hdl);
msdu = msdus[i];
/*
* First fill out the ring descriptor for the HTC HTT frame
@@ -616,10 +612,9 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
0xFFFFFFFF);
user_flags = qdf_nbuf_data_attr_get(msdu) & DESC_DATA_FLAG_MASK;
ce_buffer_addr_hi_set(shadow_src_desc, dma_addr, user_flags);
shadow_src_desc->meta_data = transfer_id;
shadow_src_desc->nbytes = qdf_nbuf_get_frag_len(msdu, 0);
download_len -= shadow_src_desc->nbytes;
/*
* HTC HTT header is a word stream, so byte swap if CE byte
* swap enabled
@@ -629,13 +624,11 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
/* For the first one, it still does not need to write */
shadow_src_desc->gather = 1;
*src_desc = *shadow_src_desc;
/* By default we could initialize the transfer context to this
* value
*/
src_ring->per_transfer_context[write_index] =
CE_SENDLIST_ITEM_CTXT;
write_index = CE_RING_IDX_INCR(nentries_mask, write_index);
src_desc = CE_SRC_RING_TO_DESC(src_ring_base, write_index);
@@ -657,8 +650,8 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
/* get actual packet length */
frag_len = qdf_nbuf_get_frag_len(msdu, 1);
/* only read download_len once */
shadow_src_desc->nbytes = ce_state->download_len;
/* download remaining bytes of payload */
shadow_src_desc->nbytes = download_len;
if (shadow_src_desc->nbytes > frag_len)
shadow_src_desc->nbytes = frag_len;
@@ -676,8 +669,6 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
sizeof(qdf_nbuf_data(msdu)), QDF_TX));
}
/* Write the final index to h/w one-shot */
if (i) {
src_ring->write_index = write_index;
if (hif_pm_runtime_get(hif_hdl) == 0) {
@@ -692,18 +683,13 @@ int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
write_index);
hif_pm_runtime_put(hif_hdl);
}
}
Q_TARGET_ACCESS_END(scn);
qdf_spin_unlock_bh(&ce_state->ce_index_lock);
/*
* If all packets in the array are transmitted,
* i = num_msdus
* Temporarily add an ASSERT
*/
ASSERT(i == num_msdus);
return i;
/* sent 1 packet */
return 1;
}
/**
@@ -2216,32 +2202,6 @@ ce_watermark_cb_register(struct CE_handle *copyeng,
}
}
#ifdef WLAN_FEATURE_FASTPATH
/**
* ce_pkt_dl_len_set() set the HTT packet download length
* @hif_sc: HIF context
* @pkt_download_len: download length
*
* Return: None
*/
void ce_pkt_dl_len_set(void *hif_sc, u_int32_t pkt_download_len)
{
struct hif_softc *sc = (struct hif_softc *)(hif_sc);
struct CE_state *ce_state = sc->ce_id_to_state[CE_HTT_H2T_MSG];
qdf_assert_always(ce_state);
ce_state->download_len = pkt_download_len;
qdf_print("%s CE %d Pkt download length %d", __func__,
ce_state->id, ce_state->download_len);
}
#else
void ce_pkt_dl_len_set(void *hif_sc, u_int32_t pkt_download_len)
{
}
#endif /* WLAN_FEATURE_FASTPATH */
bool ce_get_rx_pending(struct hif_softc *scn)
{
int CE_id;

14
hif/src/dispatcher/dummy.c
View File

@@ -182,20 +182,6 @@ hif_dummy_claim_device(struct hif_softc *hif_sc)
return;
}
/**
* hif_dummy_bus_pkt_dl_len_set()- dummy call
* @sc: context
* @pkt_download_len: download length
*
* Return: None
*/
void hif_dummy_bus_pkt_dl_len_set(void *sc,
u_int32_t pkt_download_len)
{
return;
}
/**
* hif_dummy_cancel_deferred_target_sleep - dummy call
* @hif_sc: hif context

2
hif/src/dispatcher/dummy.h
View File

@@ -42,8 +42,6 @@ QDF_STATUS hif_dummy_get_config_item(struct hif_softc *hif_sc,
int opcode, void *config, uint32_t config_len);
void hif_dummy_set_mailbox_swap(struct hif_softc *hif_sc);
void hif_dummy_claim_device(struct hif_softc *hif_sc);
void hif_dummy_bus_pkt_dl_len_set(void *sc,
u_int32_t pkt_download_len);
void hif_dummy_cancel_deferred_target_sleep(struct hif_softc *hif_sc);
void hif_dummy_irq_enable(struct hif_softc *hif_sc, int irq_id);
void hif_dummy_irq_disable(struct hif_softc *hif_sc, int irq_id);

7
hif/src/dispatcher/multibus.c
View File

@@ -250,13 +250,6 @@ void hif_stop(struct hif_opaque_softc *hif_ctx)
hif_sc->bus_ops.hif_stop(hif_sc);
}
void hif_bus_pkt_dl_len_set(struct hif_opaque_softc *hif_ctx,
u_int32_t pkt_download_len)
{
struct hif_softc *hif_sc = HIF_GET_SOFTC(hif_ctx);
hif_sc->bus_ops.hif_bus_pkt_dl_len_set(hif_sc, pkt_download_len);
}
void hif_cancel_deferred_target_sleep(struct hif_softc *hif_sc)
{
return hif_sc->bus_ops.hif_cancel_deferred_target_sleep(hif_sc);

2
hif/src/dispatcher/multibus.h
View File

@@ -57,8 +57,6 @@ struct hif_bus_ops {
void (*hif_claim_device)(struct hif_softc *hif_sc);
void (*hif_shutdown_device)(struct hif_softc *hif_sc);
void (*hif_stop)(struct hif_softc *hif_sc);
void (*hif_bus_pkt_dl_len_set)(void *hif_sc,
u_int32_t pkt_download_len);
void (*hif_cancel_deferred_target_sleep)(struct hif_softc *hif_sc);
void (*hif_irq_disable)(struct hif_softc *hif_sc, int ce_id);
void (*hif_irq_enable)(struct hif_softc *hif_sc, int ce_id);

1
hif/src/dispatcher/multibus_ahb.c
View File

@@ -53,7 +53,6 @@ QDF_STATUS hif_initialize_ahb_ops(struct hif_bus_ops *bus_ops)
bus_ops->hif_claim_device = &hif_dummy_claim_device;
bus_ops->hif_shutdown_device = &hif_ce_stop;
bus_ops->hif_stop = &hif_ce_stop;
bus_ops->hif_bus_pkt_dl_len_set = &ce_pkt_dl_len_set;
bus_ops->hif_cancel_deferred_target_sleep =
&hif_dummy_cancel_deferred_target_sleep;
bus_ops->hif_irq_disable = &hif_ahb_irq_disable;

1
hif/src/dispatcher/multibus_pci.c
View File

@@ -69,7 +69,6 @@ QDF_STATUS hif_initialize_pci_ops(struct hif_softc *hif_sc)
bus_ops->hif_claim_device = &hif_dummy_claim_device;
bus_ops->hif_shutdown_device = &hif_ce_stop;
bus_ops->hif_stop = &hif_ce_stop;
bus_ops->hif_bus_pkt_dl_len_set = &ce_pkt_dl_len_set;
bus_ops->hif_cancel_deferred_target_sleep =
&hif_pci_cancel_deferred_target_sleep;
bus_ops->hif_irq_disable = &hif_pci_irq_disable;

1
hif/src/dispatcher/multibus_sdio.c
View File

@@ -52,7 +52,6 @@ QDF_STATUS hif_initialize_sdio_ops(struct hif_softc *hif_sc)
bus_ops->hif_claim_device = &hif_sdio_claim_device;
bus_ops->hif_shutdown_device = &hif_sdio_shutdown;
bus_ops->hif_stop = &hif_sdio_stop;
bus_ops->hif_bus_pkt_dl_len_set = &hif_dummy_bus_pkt_dl_len_set;
bus_ops->hif_cancel_deferred_target_sleep =
&hif_dummy_cancel_deferred_target_sleep;
bus_ops->hif_irq_disable = &hif_dummy_irq_disable;

1
hif/src/dispatcher/multibus_snoc.c
View File

@@ -60,7 +60,6 @@ QDF_STATUS hif_initialize_snoc_ops(struct hif_bus_ops *bus_ops)
bus_ops->hif_claim_device = &hif_dummy_claim_device;
bus_ops->hif_shutdown_device = &hif_ce_stop;
bus_ops->hif_stop = &hif_ce_stop;
bus_ops->hif_bus_pkt_dl_len_set = &ce_pkt_dl_len_set;
bus_ops->hif_cancel_deferred_target_sleep =
&hif_dummy_cancel_deferred_target_sleep;
bus_ops->hif_irq_disable = &hif_snoc_irq_disable;

22
hif/src/hif_main.c
View File

@@ -942,28 +942,16 @@ int hif_send_single(struct hif_opaque_softc *osc, qdf_nbuf_t msdu, uint32_t
* @msdu : array of msdus to be sent
* @num_msdus : number of msdus in an array
* @transfer_id: transfer id
* @download_len: download length
*
* Return: No. of packets that could be sent
*/
int hif_send_fast(struct hif_opaque_softc *osc, qdf_nbuf_t *nbuf_arr,
uint32_t num_msdus, uint32_t transfer_id)
int hif_send_fast(struct hif_opaque_softc *osc, qdf_nbuf_t nbuf,
uint32_t transfer_id, uint32_t download_len)
{
void *ce_tx_hdl = hif_get_ce_handle(osc, CE_HTT_TX_CE);
return ce_send_fast((struct CE_handle *)ce_tx_hdl, nbuf_arr, num_msdus,
transfer_id);
}
/**
* hif_pkt_dl_len_set() - API to access hif specific function
* ce_pkt_dl_len_set.
* @osc: HIF Context
* @pkt_download_len: download length
*
* Return: None
*/
void hif_pkt_dl_len_set(void *hif_sc, unsigned int pkt_download_len)
{
ce_pkt_dl_len_set(hif_sc, pkt_download_len);
return ce_send_fast((struct CE_handle *)ce_tx_hdl, nbuf,
transfer_id, download_len);
}
/**

13
hif/src/pcie/if_pci.c
View File

@@ -3996,16 +3996,3 @@ void hif_runtime_lock_deinit(struct hif_opaque_softc *hif_ctx,
}
#endif /* FEATURE_RUNTIME_PM */
/**
* hif_pci_bus_pkt_dl_len_set() set the HTT packet download length
* @sc: context
* @pkt_download_len: download length
*
* Return: void
*/
void hif_pci_bus_pkt_dl_len_set(struct hif_softc *sc,
u_int32_t pkt_download_len)
{
ce_pkt_dl_len_set(sc, pkt_download_len);
}

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

@@ -156,7 +156,8 @@ struct qdf_nbuf_cb {
num:1,
flag_chfrag_start:1,
flag_chfrag_end:1,
reserved:3;
flag_ext_header:1,
reserved:2;
} bits;
uint8_t u8;
} flags;
@@ -252,6 +253,9 @@ struct qdf_nbuf_cb {
#define QDF_NBUF_CB_TX_EXTRA_FRAG_FLAGS_CHFRAG_END(skb) \
(((struct qdf_nbuf_cb *) \
((skb)->cb))->u.tx.extra_frag.flags.bits.flag_chfrag_end)
#define QDF_NBUF_CB_TX_EXTRA_FRAG_FLAGS_EXT_HEADER(skb) \
(((struct qdf_nbuf_cb *) \
((skb)->cb))->u.tx.extra_frag.flags.bits.flag_ext_header)
#define QDF_NBUF_CB_TX_EXTRA_FRAG_WORDSTR_EFRAG(skb) \
(((struct qdf_nbuf_cb *) \
((skb)->cb))->u.tx.extra_frag.flags.bits.flag_efrag)