Commit 56b8aae9 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by David S. Miller
Browse files

net: mvpp2: remove mvpp2_bm_cookie_{build,pool_get} 



This commit removes the useless remove
mvpp2_bm_cookie_{build,pool_get} functions. All what
mvpp2_bm_cookie_build() was doing is compute a 32-bit value by
concatenating the pool number and the CPU number... only to get the pool
number re-extracted by mvpp2_bm_cookie_pool_get() later on.

Instead, just get the pool number directly from RX descriptor status,
and pass it to mvpp2_pool_refill() and mvpp2_rx_refill().

This has the added benefit of dropping a smp_processor_id() call in a
migration-enabled context, which is wrong, and is the original
motivation for making this change.

Fixes: 3f518509 ("ethernet: Add new driver for Marvell Armada 375 network unit")
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 343eba69

drivers/net/ethernet/marvell/mvpp2.c

+14 −33
Original line number Diff line number Diff line
@@ -3920,12 +3920,6 @@ static inline u32 mvpp2_bm_cookie_pool_set(u32 cookie, int pool) 
	return bm;

}



/* Get pool number from a BM cookie */

static inline int mvpp2_bm_cookie_pool_get(unsigned long cookie)

{

	return (cookie >> MVPP2_BM_COOKIE_POOL_OFFS) & 0xFF;

}



/* Release buffer to BM */

static inline void mvpp2_bm_pool_put(struct mvpp2_port *port, int pool,

				     dma_addr_t buf_dma_addr,
@@ -3961,12 +3955,10 @@ static inline void mvpp2_bm_pool_put(struct mvpp2_port *port, int pool, 
}



/* Refill BM pool */

static void mvpp2_pool_refill(struct mvpp2_port *port, u32 bm,

static void mvpp2_pool_refill(struct mvpp2_port *port, int pool,

			      dma_addr_t dma_addr,

			      phys_addr_t phys_addr)

{

	int pool = mvpp2_bm_cookie_pool_get(bm);



	mvpp2_bm_pool_put(port, pool, dma_addr, phys_addr);

}
@@ -4513,21 +4505,6 @@ static void mvpp2_rxq_offset_set(struct mvpp2_port *port, 
	mvpp2_write(port->priv, MVPP2_RXQ_CONFIG_REG(prxq), val);

}



/* Obtain BM cookie information from descriptor */

static u32 mvpp2_bm_cookie_build(struct mvpp2_port *port,

				 struct mvpp2_rx_desc *rx_desc)

{

	int cpu = smp_processor_id();

	int pool;



	pool = (mvpp2_rxdesc_status_get(port, rx_desc) &

		MVPP2_RXD_BM_POOL_ID_MASK) >>

		MVPP2_RXD_BM_POOL_ID_OFFS;



	return ((pool & 0xFF) << MVPP2_BM_COOKIE_POOL_OFFS) |

	       ((cpu & 0xFF) << MVPP2_BM_COOKIE_CPU_OFFS);

}



/* Tx descriptors helper methods */



/* Get pointer to next Tx descriptor to be processed (send) by HW */
@@ -4978,9 +4955,13 @@ static void mvpp2_rxq_drop_pkts(struct mvpp2_port *port, 


	for (i = 0; i < rx_received; i++) {

		struct mvpp2_rx_desc *rx_desc = mvpp2_rxq_next_desc_get(rxq);

		u32 bm = mvpp2_bm_cookie_build(port, rx_desc);

		u32 status = mvpp2_rxdesc_status_get(port, rx_desc);

		int pool;



		pool = (status & MVPP2_RXD_BM_POOL_ID_MASK) >>

			MVPP2_RXD_BM_POOL_ID_OFFS;



		mvpp2_pool_refill(port, bm,

		mvpp2_pool_refill(port, pool,

				  mvpp2_rxdesc_dma_addr_get(port, rx_desc),

				  mvpp2_rxdesc_cookie_get(port, rx_desc));

	}
@@ -5418,7 +5399,7 @@ static void mvpp2_rx_csum(struct mvpp2_port *port, u32 status, 


/* Reuse skb if possible, or allocate a new skb and add it to BM pool */

static int mvpp2_rx_refill(struct mvpp2_port *port,

			   struct mvpp2_bm_pool *bm_pool, u32 bm)

			   struct mvpp2_bm_pool *bm_pool, int pool)

{

	dma_addr_t dma_addr;

	phys_addr_t phys_addr;
@@ -5430,7 +5411,7 @@ static int mvpp2_rx_refill(struct mvpp2_port *port, 
	if (!buf)

		return -ENOMEM;



	mvpp2_pool_refill(port, bm, dma_addr, phys_addr);

	mvpp2_pool_refill(port, pool, dma_addr, phys_addr);



	return 0;

}
@@ -5488,7 +5469,7 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, 
		unsigned int frag_size;

		dma_addr_t dma_addr;

		phys_addr_t phys_addr;

		u32 bm, rx_status;

		u32 rx_status;

		int pool, rx_bytes, err;

		void *data;
@@ -5500,8 +5481,8 @@ static int mvpp2_rx(struct mvpp2_port *port, int rx_todo, 
		phys_addr = mvpp2_rxdesc_cookie_get(port, rx_desc);

		data = (void *)phys_to_virt(phys_addr);



		bm = mvpp2_bm_cookie_build(port, rx_desc);

		pool = mvpp2_bm_cookie_pool_get(bm);

		pool = (rx_status & MVPP2_RXD_BM_POOL_ID_MASK) >>

			MVPP2_RXD_BM_POOL_ID_OFFS;

		bm_pool = &port->priv->bm_pools[pool];



		/* In case of an error, release the requested buffer pointer
@@ -5514,7 +5495,7 @@ err_drop_frame: 
			dev->stats.rx_errors++;

			mvpp2_rx_error(port, rx_desc);

			/* Return the buffer to the pool */

			mvpp2_pool_refill(port, bm, dma_addr, phys_addr);

			mvpp2_pool_refill(port, pool, dma_addr, phys_addr);

			continue;

		}
@@ -5529,7 +5510,7 @@ err_drop_frame: 
			goto err_drop_frame;

		}



		err = mvpp2_rx_refill(port, bm_pool, bm);

		err = mvpp2_rx_refill(port, bm_pool, pool);

		if (err) {

			netdev_err(port->dev, "failed to refill BM pools\n");

			goto err_drop_frame;

CRA Git | Maintained and supported by SUSTech CRA and CCSE