Unverified Commit 433a779d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10213 net: mvpp2: clear BM pool before initialization 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Hai <wanghai38@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DFMR3FQUWVS2WQY5LJJB7QHXJFUSBYYO/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9Q9DC 
 
Link:https://gitee.com/openeuler/kernel/pulls/10213
parents 0fe40941 066b6bf6

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+26 −1
Original line number Diff line number Diff line
@@ -581,12 +581,38 @@ static int mvpp2_bm_pools_init(struct device *dev, struct mvpp2 *priv) 
	return err;

}



/* Cleanup pool before actual initialization in the OS */

static void mvpp2_bm_pool_cleanup(struct mvpp2 *priv, int pool_id)

{

	unsigned int thread = mvpp2_cpu_to_thread(priv, get_cpu());

	u32 val;

	int i;



	/* Drain the BM from all possible residues left by firmware */

	for (i = 0; i < MVPP2_BM_POOL_SIZE_MAX; i++)

		mvpp2_thread_read(priv, thread, MVPP2_BM_PHY_ALLOC_REG(pool_id));



	put_cpu();



	/* Stop the BM pool */

	val = mvpp2_read(priv, MVPP2_BM_POOL_CTRL_REG(pool_id));

	val |= MVPP2_BM_STOP_MASK;

	mvpp2_write(priv, MVPP2_BM_POOL_CTRL_REG(pool_id), val);

}



static int mvpp2_bm_init(struct device *dev, struct mvpp2 *priv)

{

	enum dma_data_direction dma_dir = DMA_FROM_DEVICE;

	int i, err, poolnum = MVPP2_BM_POOLS_NUM;

	struct mvpp2_port *port;



	if (priv->percpu_pools)

		poolnum = mvpp2_get_nrxqs(priv) * 2;



	/* Clean up the pool state in case it contains stale state */

	for (i = 0; i < poolnum; i++)

		mvpp2_bm_pool_cleanup(priv, i);



	if (priv->percpu_pools) {

		for (i = 0; i < priv->port_count; i++) {

			port = priv->port_list[i];
@@ -596,7 +622,6 @@ static int mvpp2_bm_init(struct device *dev, struct mvpp2 *priv) 
			}

		}



		poolnum = mvpp2_get_nrxqs(priv) * 2;

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

			/* the pool in use */

			int pn = i / (poolnum / 2);