Re: [PATCH v2 08/11] dmaengine: bestcomm: Defer publishing bcom_eng until initialisation completes

From: Frank Li

Date: Tue Nov 17 2026 - 14:49:09 EST


On Tue, Nov 17, 2026 at 04:37:09PM +0000, Lee Jones wrote:
> mpc52xx_bcom_probe() assigns the newly allocated struct bcom_engine to
> the global bcom_eng pointer before calling bcom_engine_init(). A
> concurrent call to bcom_task_alloc() can observe a non-NULL bcom_eng
> pointer before its spinlock and task descriptor table are initialised.
>
> Initialise the engine via a local pointer and only publish bcom_eng
> once initialisation has succeeded.
>
> Fixes: 2f9ea1bde0d1 ("[POWERPC] bestcomm: core bestcomm support for Freescale MPC5200")
> Closes: https://sashiko.dev/#/bug/linux-0a202799-4946-44bf-b035-fbb2e329e666
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Lee Jones <lee@xxxxxxxxxx>
> ---

Reviewed-by: Frank Li <Frank.Li@xxxxxxx>

>
> v1 => v2: No changes
>
> drivers/dma/bestcomm/bestcomm.c | 69 +++++++++++++++++----------------
> 1 file changed, 36 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/dma/bestcomm/bestcomm.c b/drivers/dma/bestcomm/bestcomm.c
> index 241a91936fe8..dbc3ce5fc446 100644
> --- a/drivers/dma/bestcomm/bestcomm.c
> +++ b/drivers/dma/bestcomm/bestcomm.c
> @@ -270,7 +270,7 @@ static u32 fdt_ops[] = {
> };
>
>
> -static int bcom_engine_init(void)
> +static int bcom_engine_init(struct bcom_engine *eng)
> {
> int task;
> phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa;
> @@ -282,56 +282,59 @@ static int bcom_engine_init(void)
> var_size = BCOM_MAX_TASKS * (BCOM_VAR_SIZE + BCOM_INC_SIZE);
> fdt_size = BCOM_FDT_SIZE;
>
> - bcom_eng->tdt = bcom_sram_alloc(tdt_size, sizeof(u32), &tdt_pa);
> - bcom_eng->ctx = bcom_sram_alloc(ctx_size, BCOM_CTX_ALIGN, &ctx_pa);
> - bcom_eng->var = bcom_sram_alloc(var_size, BCOM_VAR_ALIGN, &var_pa);
> - bcom_eng->fdt = bcom_sram_alloc(fdt_size, BCOM_FDT_ALIGN, &fdt_pa);
> + eng->tdt = bcom_sram_alloc(tdt_size, sizeof(u32), &tdt_pa);
> + eng->ctx = bcom_sram_alloc(ctx_size, BCOM_CTX_ALIGN, &ctx_pa);
> + eng->var = bcom_sram_alloc(var_size, BCOM_VAR_ALIGN, &var_pa);
> + eng->fdt = bcom_sram_alloc(fdt_size, BCOM_FDT_ALIGN, &fdt_pa);
>
> - if (!bcom_eng->tdt || !bcom_eng->ctx || !bcom_eng->var || !bcom_eng->fdt) {
> + if (!eng->tdt || !eng->ctx || !eng->var || !eng->fdt) {
> printk(KERN_ERR "DMA: SRAM alloc failed in engine init !\n");
>
> - bcom_sram_free(bcom_eng->tdt);
> - bcom_sram_free(bcom_eng->ctx);
> - bcom_sram_free(bcom_eng->var);
> - bcom_sram_free(bcom_eng->fdt);
> + bcom_sram_free(eng->tdt);
> + bcom_sram_free(eng->ctx);
> + bcom_sram_free(eng->var);
> + bcom_sram_free(eng->fdt);
>
> return -ENOMEM;
> }
>
> - memset_io(bcom_eng->tdt, 0x00, tdt_size);
> - memset_io(bcom_eng->ctx, 0x00, ctx_size);
> - memset_io(bcom_eng->var, 0x00, var_size);
> - memset_io(bcom_eng->fdt, 0x00, fdt_size);
> + memset_io(eng->tdt, 0x00, tdt_size);
> + memset_io(eng->ctx, 0x00, ctx_size);
> + memset_io(eng->var, 0x00, var_size);
> + memset_io(eng->fdt, 0x00, fdt_size);
>
> /* Copy the FDT for the EU#3 */
> - memcpy_toio(&bcom_eng->fdt[48], fdt_ops, sizeof(fdt_ops));
> + memcpy_toio(&eng->fdt[48], fdt_ops, sizeof(fdt_ops));
>
> /* Initialize Task base structure */
> for (task=0; task<BCOM_MAX_TASKS; task++)
> {
> - out_be16(&bcom_eng->regs->tcr[task], 0);
> - out_8(&bcom_eng->regs->ipr[task], 0);
> + out_be16(&eng->regs->tcr[task], 0);
> + out_8(&eng->regs->ipr[task], 0);
>
> - bcom_eng->tdt[task].context = ctx_pa;
> - bcom_eng->tdt[task].var = var_pa;
> - bcom_eng->tdt[task].fdt = fdt_pa;
> + eng->tdt[task].context = ctx_pa;
> + eng->tdt[task].var = var_pa;
> + eng->tdt[task].fdt = fdt_pa;
>
> var_pa += BCOM_VAR_SIZE + BCOM_INC_SIZE;
> ctx_pa += BCOM_CTX_SIZE;
> }
>
> - out_be32(&bcom_eng->regs->taskBar, tdt_pa);
> + out_be32(&eng->regs->taskBar, tdt_pa);
>
> /* Init 'always' initiator */
> - out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS);
> + out_8(&eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS);
> +
> + /* Init lock */
> + spin_lock_init(&eng->lock);
> +
> + /* Ensure all engine fields are visible before publishing bcom_eng */
> + smp_store_release(&bcom_eng, eng);
>
> /* Disable COMM Bus Prefetch on the original 5200; it's broken */
> if ((mfspr(SPRN_SVR) & MPC5200_SVR_MASK) == MPC5200_SVR)
> bcom_disable_prefetch();
>
> - /* Init lock */
> - spin_lock_init(&bcom_eng->lock);
> -
> return 0;
> }
>
> @@ -363,6 +366,7 @@ bcom_engine_cleanup(void)
>
> static int mpc52xx_bcom_probe(struct platform_device *op)
> {
> + struct bcom_engine *eng;
> struct device_node *ofn_sram;
> struct resource *res_bcom;
> void __iomem *regs;
> @@ -398,20 +402,20 @@ static int mpc52xx_bcom_probe(struct platform_device *op)
> }
>
> /* Get a clean struct */
> - bcom_eng = kzalloc_obj(struct bcom_engine);
> - if (!bcom_eng) {
> + eng = kzalloc_obj(struct bcom_engine);
> + if (!eng) {
> rv = -ENOMEM;
> goto error_sramclean;
> }
>
> /* Save the node */
> - bcom_eng->ofnode = op->dev.of_node;
> + eng->ofnode = op->dev.of_node;
>
> - bcom_eng->regs = regs;
> - bcom_eng->regs_base = res_bcom->start;
> + eng->regs = regs;
> + eng->regs_base = res_bcom->start;
>
> /* Now, do the real init */
> - rv = bcom_engine_init();
> + rv = bcom_engine_init(eng);
> if (rv)
> goto error_sramclean;
>
> @@ -423,8 +427,7 @@ static int mpc52xx_bcom_probe(struct platform_device *op)
>
> /* Error path */
> error_sramclean:
> - kfree(bcom_eng);
> - bcom_eng = NULL;
> + kfree(eng);
> bcom_sram_cleanup();
> error_ofput:
> of_node_put(op->dev.of_node);
> --
> 2.56.0.679.gc527c65306-goog
>