lkml.org 
[lkml]   [2019]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 122/209] soc: fsl: bman_portals: defer probe after bman's probe
    Date
    From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

    [ 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: Laurentiu Tudor <laurentiu.tudor@nxp.com>
    Signed-off-by: Li Yang <leoyang.li@nxp.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/soc/fsl/qbman/bman_portal.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/drivers/soc/fsl/qbman/bman_portal.c b/drivers/soc/fsl/qbman/bman_portal.c
    index 2f71f7df3465a..f9edd28894fda 100644
    --- a/drivers/soc/fsl/qbman/bman_portal.c
    +++ b/drivers/soc/fsl/qbman/bman_portal.c
    @@ -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)
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-13 02:54    [W:4.213 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site