mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

staging: octeon-ethernet: eliminate DONT_WRITEBACK

Browse source 
This feature is not used so eliminate it.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2015-04-04 22:51:19 +03:00 committed by Greg Kroah-Hartman
parent cccdb27755
commit c93b0e75a8
5 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/octeon/ethernet-defines.h
View file

@ -54,14 +54,6 @@
#define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0) #define USE_ASYNC_IOBDMA (CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE > 0)
/*
* Use this to have all FPA frees also tell the L2 not to write data
* to memory.
*/
#define DONT_WRITEBACK(x) (x)
/* Use this to not have FPA frees control L2 */
/*#define DONT_WRITEBACK(x) 0 */
/* Maximum number of SKBs to try to free per xmit packet. */ /* Maximum number of SKBs to try to free per xmit packet. */
#define MAX_OUT_QUEUE_DEPTH 1000 #define MAX_OUT_QUEUE_DEPTH 1000

2
drivers/staging/octeon/ethernet-mem.c
View file

@ -54,7 +54,7 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements)
break; break;
skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f)); skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));
*(struct sk_buff **)(skb->data - sizeof(void *)) = skb; *(struct sk_buff **)(skb->data - sizeof(void *)) = skb;
cvmx_fpa_free(skb->data, pool, DONT_WRITEBACK(size / 128)); cvmx_fpa_free(skb->data, pool, size / 128);
freed--; freed--;
} }
return elements - freed; return elements - freed;

3
drivers/staging/octeon/ethernet-rx.c
View file

@ -400,8 +400,7 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
cvmx_fau_atomic_add32(FAU_NUM_PACKET_BUFFERS_TO_FREE, cvmx_fau_atomic_add32(FAU_NUM_PACKET_BUFFERS_TO_FREE,
1); 1);
cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, 1);
DONT_WRITEBACK(1));
} else { } else {
cvm_oct_free_work(work); cvm_oct_free_work(work);
} }

2
drivers/staging/octeon/ethernet-tx.c
View file

@ -576,7 +576,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
if (unlikely(packet_buffer == NULL)) { if (unlikely(packet_buffer == NULL)) {
printk_ratelimited("%s: Failed to allocate a packet buffer\n", printk_ratelimited("%s: Failed to allocate a packet buffer\n",
dev->name); dev->name);
cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, DONT_WRITEBACK(1)); cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, 1);
priv->stats.tx_dropped++; priv->stats.tx_dropped++;
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
return 0; return 0;

5
drivers/staging/octeon/ethernet.c
View file

@ -203,11 +203,10 @@ int cvm_oct_free_work(void *work_queue_entry)
if (unlikely(!segment_ptr.s.i)) if (unlikely(!segment_ptr.s.i))
cvmx_fpa_free(cvm_oct_get_buffer_ptr(segment_ptr), cvmx_fpa_free(cvm_oct_get_buffer_ptr(segment_ptr),
segment_ptr.s.pool, segment_ptr.s.pool,
DONT_WRITEBACK(CVMX_FPA_PACKET_POOL_SIZE / CVMX_FPA_PACKET_POOL_SIZE / 128);
128));
segment_ptr = next_ptr; segment_ptr = next_ptr;
} }
cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, DONT_WRITEBACK(1)); cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, 1);
return 0; return 0;
} }