Commit c93b0e75 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-ethernet: eliminate DONT_WRITEBACK 



This feature is not used so eliminate it.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cccdb277

drivers/staging/octeon/ethernet-defines.h

+0 −8
Original line number Diff line number Diff line
@@ -54,14 +54,6 @@ 


#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. */

#define MAX_OUT_QUEUE_DEPTH 1000

drivers/staging/octeon/ethernet-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int cvm_oct_fill_hw_skbuff(int pool, int size, int elements) 
			break;

		skb_reserve(skb, 256 - (((unsigned long)skb->data) & 0x7f));

		*(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--;

	}

	return elements - freed;

drivers/staging/octeon/ethernet-rx.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

					      1);



			cvmx_fpa_free(work, CVMX_FPA_WQE_POOL,

				      DONT_WRITEBACK(1));

			cvmx_fpa_free(work, CVMX_FPA_WQE_POOL, 1);

		} else {

			cvm_oct_free_work(work);

		}

drivers/staging/octeon/ethernet-tx.c

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) 
	if (unlikely(packet_buffer == NULL)) {

		printk_ratelimited("%s: Failed to allocate a packet buffer\n",

				   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++;

		dev_kfree_skb_any(skb);

		return 0;

drivers/staging/octeon/ethernet.c

+2 −3
Original line number Diff line number Diff line
@@ -203,11 +203,10 @@ int cvm_oct_free_work(void *work_queue_entry) 
		if (unlikely(!segment_ptr.s.i))

			cvmx_fpa_free(cvm_oct_get_buffer_ptr(segment_ptr),

				      segment_ptr.s.pool,

				      DONT_WRITEBACK(CVMX_FPA_PACKET_POOL_SIZE /

						     128));

				      CVMX_FPA_PACKET_POOL_SIZE / 128);

		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;

}