mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
net: mvpp2: clear BM pool before initialization
[ Upstream commit9f538b415d
] Register value persist after booting the kernel using kexec which results in kernel panic. Thus clear the BM pool registers before initialisation to fix the issue. Fixes:3f518509de
("ethernet: Add new driver for Marvell Armada 375 network unit") Signed-off-by: Jenishkumar Maheshbhai Patel <jpatel2@marvell.com> Reviewed-by: Maxime Chevallier <maxime.chevallier@bootlin.com> Link: https://lore.kernel.org/r/20240119035914.2595665-1-jpatel2@marvell.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
6264994be8
commit
938729484c
1 changed files with 26 additions and 1 deletions
|
@ -614,12 +614,38 @@ static void mvpp23_bm_set_8pool_mode(struct mvpp2 *priv)
|
|||
mvpp2_write(priv, MVPP22_BM_POOL_BASE_ADDR_HIGH_REG, val);
|
||||
}
|
||||
|
||||
/* 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];
|
||||
|
@ -629,7 +655,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);
|
||||
|
|
Loading…
Reference in a new issue