Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bef7420 authored by Laurentiu Tudor's avatar Laurentiu Tudor Committed by Greg Kroah-Hartman
Browse files

soc: fsl: bman_portals: defer probe after bman's probe 



[ Upstream commit e0940b34c40e95d1879691d2474d182c57aae0de ]

A crash in bman portal probing could not be triggered (as is the case
with qman portals) but it does make calls [1] into the bman driver so
lets make sure the bman portal probing happens after bman's.

[1]  bman_p_irqsource_add() (in bman) called by:
       init_pcfg() called by:
         bman_portal_probe()

Signed-off-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 090122ba

drivers/soc/fsl/qbman/bman_portal.c

+9 −1
Original line number Diff line number Diff line
@@ -91,7 +91,15 @@ static int bman_portal_probe(struct platform_device *pdev) 
	struct device_node *node = dev->of_node;

	struct bm_portal_config *pcfg;

	struct resource *addr_phys[2];

	int irq, cpu;

	int irq, cpu, err;



	err = bman_is_probed();

	if (!err)

		return -EPROBE_DEFER;

	if (err < 0) {

		dev_err(&pdev->dev, "failing probe due to bman probe error\n");

		return -ENODEV;

	}



	pcfg = devm_kmalloc(dev, sizeof(*pcfg), GFP_KERNEL);

	if (!pcfg)