Skip to content

Commit

Permalink
soc: fsl: qe: drop broken lazy call of cpm_muram_init()
Browse files Browse the repository at this point in the history
cpm_muram_alloc_common() tries to support a kind of lazy
initialization - if the muram_pool has not been created yet, it calls
cpm_muram_init(). Now, cpm_muram_alloc_common() is always called under

	spin_lock_irqsave(&cpm_muram_lock, flags);

and cpm_muram_init() does gen_pool_create() (which implies a
GFP_KERNEL allocation) and ioremap(), not to mention the fun that
ensues from cpm_muram_init() doing

	spin_lock_init(&cpm_muram_lock);

In other words, this has never worked, so nobody can have been relying
on it.

cpm_muram_init() is called from a subsys_initcall (either from
cpm_init() in arch/powerpc/sysdev/cpm_common.c or, via qe_reset(),
from qe_init() in drivers/soc/fsl/qe/qe.c).

Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
  • Loading branch information
Rasmus Villemoes authored and Li Yang committed Dec 9, 2019
1 parent 900470c commit b6231ea
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/soc/fsl/qe/qe_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ static s32 cpm_muram_alloc_common(unsigned long size,
struct muram_block *entry;
s32 start;

if (!muram_pool && cpm_muram_init())
goto out2;

start = gen_pool_alloc_algo(muram_pool, size, algo, data);
if (!start)
goto out2;
Expand Down

0 comments on commit b6231ea

Please sign in to comment.