You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From 9e1f89c4c637087dc8dc1a3f9f6bda5bff66e4ac Mon Sep 17 00:00:00 2001
|
|
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Date: Tue, 6 Feb 2018 14:40:32 +0200
|
|
Subject: [PATCH] dpaa_eth: defer probing after qbman
|
|
|
|
Enabling SMMU altered the order of device probing causing the dpaa1
|
|
ethernet driver to get probed before qbman and causing a boot crash.
|
|
Add predictability in the probing order by deferring the ethernet
|
|
driver probe after qbman and portals by using the recently introduced
|
|
qbman APIs.
|
|
|
|
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
|
|
Acked-by: Madalin Bucur <madalin.bucur@nxp.com>
|
|
---
|
|
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 31 ++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
|
|
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
|
|
@@ -2947,6 +2947,37 @@ static int dpaa_eth_probe(struct platfor
|
|
int err = 0, i, channel;
|
|
struct device *dev;
|
|
|
|
+ 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;
|
|
+ }
|
|
+ err = qman_is_probed();
|
|
+ if (!err)
|
|
+ return -EPROBE_DEFER;
|
|
+ if (err < 0) {
|
|
+ dev_err(&pdev->dev, "failing probe due to qman probe error\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+ err = bman_portals_probed();
|
|
+ if (!err)
|
|
+ return -EPROBE_DEFER;
|
|
+ if (err < 0) {
|
|
+ dev_err(&pdev->dev,
|
|
+ "failing probe due to bman portals probe error\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+ err = qman_portals_probed();
|
|
+ if (!err)
|
|
+ return -EPROBE_DEFER;
|
|
+ if (err < 0) {
|
|
+ dev_err(&pdev->dev,
|
|
+ "failing probe due to qman portals probe error\n");
|
|
+ return -ENODEV;
|
|
+ }
|
|
+
|
|
/* device used for DMA mapping */
|
|
dev = pdev->dev.parent;
|
|
err = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(40));
|