From: laurentiu.tudor@nxp.com
To: netdev@vger.kernel.org, madalin.bucur@nxp.com,
roy.pledge@nxp.com, camelia.groza@nxp.com, leoyang.li@nxp.com
Cc: davem@davemloft.net, iommu@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH 09/13] dpaa_eth: defer probing after qbman
Date: Fri, 29 Mar 2019 16:00:10 +0200 [thread overview]
Message-ID: <20190329140014.8126-10-laurentiu.tudor@nxp.com> (raw)
In-Reply-To: <20190329140014.8126-1-laurentiu.tudor@nxp.com>
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
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>
---
.../net/ethernet/freescale/dpaa/dpaa_eth.c | 31 +++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index dfebc30c4841..647e90e7434f 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -2774,6 +2774,37 @@ static int dpaa_eth_probe(struct platform_device *pdev)
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));
--
2.17.1
next prev parent reply other threads:[~2019-03-29 14:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 14:00 [PATCH 00/13] Prerequisites for NXP LS104xA SMMU enablement laurentiu.tudor
2019-03-29 14:00 ` [PATCH 01/13] soc/fsl/qman: fixup liodns only on ppc targets laurentiu.tudor
2019-03-29 21:50 ` Li Yang
2019-04-01 10:21 ` Laurentiu Tudor
2019-03-29 14:00 ` [PATCH 02/13] soc/fsl/bman: map FBPR area in the iommu laurentiu.tudor
2019-03-29 14:50 ` Robin Murphy
2019-04-01 11:04 ` Laurentiu Tudor
2019-04-19 13:41 ` Laurentiu Tudor
2019-03-29 21:16 ` Li Yang
2019-04-01 11:15 ` Laurentiu Tudor
2019-03-29 14:00 ` [PATCH 03/13] soc/fsl/qman: map FQD and PFDR areas " laurentiu.tudor
2019-03-29 14:00 ` [PATCH 04/13] soc/fsl/qman-portal: map CENA area " laurentiu.tudor
2019-03-29 14:00 ` [PATCH 05/13] soc/fsl/bqman: page align iommu mapping sizes laurentiu.tudor
2019-03-29 22:06 ` Li Yang
2019-04-01 10:18 ` Laurentiu Tudor
2019-03-29 14:00 ` [PATCH 06/13] soc/fsl/qbman_portals: add APIs to retrieve the probing status laurentiu.tudor
2019-04-01 22:12 ` Li Yang
2019-03-29 14:00 ` [PATCH 07/13] fsl/fman: backup and restore ICID registers laurentiu.tudor
2019-03-29 14:00 ` [PATCH 08/13] fsl/fman: add API to get the device behind a fman port laurentiu.tudor
2019-03-29 14:00 ` laurentiu.tudor [this message]
2019-03-29 14:00 ` [PATCH 10/13] dpaa_eth: base dma mappings on the fman rx port laurentiu.tudor
2019-03-29 14:00 ` [PATCH 11/13] dpaa_eth: fix iova handling for contiguous frames laurentiu.tudor
2019-03-29 14:00 ` [PATCH 12/13] dpaa_eth: fix iova handling for sg frames laurentiu.tudor
2019-03-29 14:00 ` [PATCH 13/13] dpaa_eth: fix SG frame cleanup laurentiu.tudor
2019-03-29 15:25 ` Joakim Tjernlund
2019-04-01 10:41 ` Laurentiu Tudor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190329140014.8126-10-laurentiu.tudor@nxp.com \
--to=laurentiu.tudor@nxp.com \
--cc=camelia.groza@nxp.com \
--cc=davem@davemloft.net \
--cc=iommu@lists.linux-foundation.org \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=madalin.bucur@nxp.com \
--cc=netdev@vger.kernel.org \
--cc=roy.pledge@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).