target/linux/layerscape/patches-5.4/701-net-0091-dpaa_eth-defer-probing-after-qbman.patch

   1 From 9e1f89c4c637087dc8dc1a3f9f6bda5bff66e4ac Mon Sep 17 00:00:00 2001
   2 From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
   3 Date: Tue, 6 Feb 2018 14:40:32 +0200
   4 Subject: [PATCH] dpaa_eth: defer probing after qbman
   5
   6 Enabling SMMU altered the order of device probing causing the dpaa1
   7 ethernet driver to get probed before qbman and causing a boot crash.
   8 Add predictability in the probing order by deferring the ethernet
   9 driver probe after qbman and portals by using the recently introduced
  10 qbman APIs.
  11
  12 Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
  13 Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
  14 ---
  15  drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 31 ++++++++++++++++++++++++++
  16  1 file changed, 31 insertions(+)
  17
  18 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
  19 +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
  20 @@ -2947,6 +2947,37 @@ static int dpaa_eth_probe(struct platfor
  21         int err = 0, i, channel;
  22         struct device *dev;
  23
  24 +       err = bman_is_probed();
  25 +       if (!err)
  26 +               return -EPROBE_DEFER;
  27 +       if (err < 0) {
  28 +               dev_err(&pdev->dev, "failing probe due to bman probe error\n");
  29 +               return -ENODEV;
  30 +       }
  31 +       err = qman_is_probed();
  32 +       if (!err)
  33 +               return -EPROBE_DEFER;
  34 +       if (err < 0) {
  35 +               dev_err(&pdev->dev, "failing probe due to qman probe error\n");
  36 +               return -ENODEV;
  37 +       }
  38 +       err = bman_portals_probed();
  39 +       if (!err)
  40 +               return -EPROBE_DEFER;
  41 +       if (err < 0) {
  42 +               dev_err(&pdev->dev,
  43 +                       "failing probe due to bman portals probe error\n");
  44 +               return -ENODEV;
  45 +       }
  46 +       err = qman_portals_probed();
  47 +       if (!err)
  48 +               return -EPROBE_DEFER;
  49 +       if (err < 0) {
  50 +               dev_err(&pdev->dev,
  51 +                       "failing probe due to qman portals probe error\n");
  52 +               return -ENODEV;
  53 +       }
  54 +
  55         /* device used for DMA mapping */
  56         dev = pdev->dev.parent;
  57         err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));