ath10k: delete struct ce_sendlist
PATCH 1/1 ath10k: delete struct ce_sendlist
struct ce_sendlist is useless as we always add just one buffer onto it. And most importantly, it's ugly as it doesn't use skb properly.
Signed-off-by Kalle Valo <[email protected]>
--- drivers/net/wireless/ath/ath10k/ce.c | 48 ++++++--------------------------- drivers/net/wireless/ath/ath10k/ce.h | 44 +++--------------------------- drivers/net/wireless/ath/ath10k/pci.c | 40 +++++++++------------------- 3 files changed, 25 insertions(+), 107 deletions(-)
drivers/net/wireless/ath/ath10k/ce.c +8 -40
@@ -338,33 +338,19 @@ int ath10k_ce_send(struct ath10k_ce_pipe *ce_state,return ret; } -void ath10k_ce_sendlist_buf_add (struct ce_sendlist *sendlist,u32 buffer, -unsigned int nbytes,u32 flags) -{ -unsigned int num_items = sendlist->num_items; -struct ce_sendlist_item *item; - - item = &sendlist->item[num_items]; - item->data = buffer; - item->u.nbytes = nbytes; - item->flags = flags; - sendlist->num_items++; -} -int ath10k_ce_sendlist_send (struct ath10k_ce_pipe *ce_state,void *per_transfer_context, -struct ce_sendlist *sendlist, -unsigned int transfer_id) +unsigned int transfer_id, +u32 paddr,unsigned int nbytes, +u32 flags) {struct ath10k_ce_ring *src_ring = ce_state->src_ring; -struct ce_sendlist_item *item;struct ath10k *ar = ce_state->ar;struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);unsigned int nentries_mask = src_ring->nentries_mask; -unsigned int num_items = sendlist->num_items;unsigned int sw_index;unsigned int write_index; -int i, delta, ret = -ENOMEM ; +int delta, ret = -ENOMEM ;spin_lock_bh (&ar_pci->ce_lock);
@@ -373,30 +359,12 @@ int ath10k_ce_sendlist_send(struct ath10k_ce_pipe *ce_state, delta =CE_RING_DELTA (nentries_mask, write_index, sw_index -1 ); -if (delta >= num_items) { -/* -* Handle all but the last item uniformly. -*/ -for (i =0 ; i < num_items -1 ; i++) { - item = &sendlist->item[i]; - ret =ath10k_ce_send_nolock (ce_state, -CE_SENDLIST_ITEM_CTXT , - (u32 ) item->data, - item->u.nbytes, transfer_id, - item->flags | -CE_SEND_FLAG_GATHER ); -if (ret) -ath10k_warn ("CE send failed for item: %d\n" , i); - } -/* -* Provide valid context pointer for final item. -*/ - item = &sendlist->item[i]; +if (delta >=1 ) { ret =ath10k_ce_send_nolock (ce_state, per_transfer_context, - (u32 ) item->data, item->u.nbytes, - transfer_id, item->flags); + paddr, nbytes, + transfer_id, flags);if (ret) -ath10k_warn ("CE send failed for last item: %d\n" , i); +ath10k_warn ("CE send failed: %d\n" , ret); }spin_unlock_bh (&ar_pci->ce_lock);
drivers/net/wireless/ath/ath10k/ce.h +4 -40
74 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/pci.c +13 -27
@@ -626,17 +626,9 @@ static void ath10k_pci_ce_send_done(struct ath10k_ce_pipe *ce_state)while (ath10k_ce_completed_send_next (ce_state, &transfer_context, &ce_data, &nbytes, &transfer_id) ==0 ) { -/* -* For the send completion of an item in sendlist, just -* increment num_sends_allowed. The upper layer callback will -* be triggered when last fragment is done with send. -*/ -if (transfer_context ==CE_SENDLIST_ITEM_CTXT ) { -spin_lock_bh (&pipe_info->pipe_lock); - pipe_info->num_sends_allowed++; -spin_unlock_bh (&pipe_info->pipe_lock); -continue ; - } +spin_lock_bh (&pipe_info->pipe_lock); + pipe_info->num_sends_allowed++; +spin_unlock_bh (&pipe_info->pipe_lock); compl =get_free_compl (pipe_info);if (!compl)
@@ -714,13 +706,10 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id,struct ath10k_pci *ar_pci =ath10k_pci_priv (ar);struct ath10k_pci_pipe *pipe_info = &(ar_pci->pipe_info[pipe_id]);struct ath10k_ce_pipe *ce_hdl = pipe_info->ce_hdl; -struct ce_sendlist sendlist;unsigned int len;u32 flags =0 ;int ret; -memset (&sendlist,0 ,sizeof (struct ce_sendlist )); - len =min (bytes, nbuf->len); bytes -= len;
@@ -735,8 +724,6 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id,"ath10k tx: data: " , nbuf->data, nbuf->len); -ath10k_ce_sendlist_buf_add (&sendlist, skb_cb->paddr, len, flags); -/* Make sure we have resources to handle this request */ spin_lock_bh (&pipe_info->pipe_lock);if (!pipe_info->num_sends_allowed) {
@@ -747,7 +734,8 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id, pipe_info->num_sends_allowed--;spin_unlock_bh (&pipe_info->pipe_lock); - ret =ath10k_ce_sendlist_send (ce_hdl, nbuf, &sendlist, transfer_id); + ret =ath10k_ce_sendlist_send (ce_hdl, nbuf, transfer_id, + skb_cb->paddr, len, flags);if (ret)ath10k_warn ("CE send failed: %p\n" , nbuf);
@@ -1302,16 +1290,14 @@ static void ath10k_pci_tx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info)while (ath10k_ce_cancel_send_next (ce_hdl, (void **)&netbuf, &ce_data, &nbytes, &id) ==0 ) { -if (netbuf !=CE_SENDLIST_ITEM_CTXT ) { -/* -* Indicate the completion to higer layer to free -* the buffer -*/ -ATH10K_SKB_CB (netbuf)->is_aborted = true; - ar_pci->msg_callbacks_current.tx_completion (ar, - netbuf, - id); - } +/* +* Indicate the completion to higer layer to free +* the buffer +*/ +ATH10K_SKB_CB (netbuf)->is_aborted = true; + ar_pci->msg_callbacks_current.tx_completion (ar, + netbuf, + id); } }
Kalle Valo
AppliedQuoted 4 lines · Kalle Valo
struct
ce_sendlistis useless as we always add just one buffer onto it. And most importantly, it's ugly as it doesn't use skb properly.Signed-off-by Kalle Valo <[email protected]>
Applied.
Signature · 1 line
Kalle Valo