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: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
linuxppc-dev@lists.ozlabs.org, davem@davemloft.net,
linux-arm-kernel@lists.infradead.org,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH v3 1/6] fsl/fman: don't touch liodn base regs reserved on non-PAMU SoCs
Date: Thu, 30 May 2019 17:19:46 +0300 [thread overview]
Message-ID: <20190530141951.6704-2-laurentiu.tudor@nxp.com> (raw)
In-Reply-To: <20190530141951.6704-1-laurentiu.tudor@nxp.com>
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
liodn base registers are specific to PAMU based NXP systems and on SMMU
based ones are reserved. Don't access them if PAMU is compiled in.
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
drivers/net/ethernet/freescale/fman/fman.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c
index e80fedb27cee..cce6636b1763 100644
--- a/drivers/net/ethernet/freescale/fman/fman.c
+++ b/drivers/net/ethernet/freescale/fman/fman.c
@@ -634,6 +634,9 @@ static void set_port_liodn(struct fman *fman, u8 port_id,
{
u32 tmp;
+ iowrite32be(liodn_ofst, &fman->bmi_regs->fmbm_spliodn[port_id - 1]);
+ if (!IS_ENABLED(CONFIG_FSL_PAMU))
+ return;
/* set LIODN base for this port */
tmp = ioread32be(&fman->dma_regs->fmdmplr[port_id / 2]);
if (port_id % 2) {
@@ -644,7 +647,6 @@ static void set_port_liodn(struct fman *fman, u8 port_id,
tmp |= liodn_base << DMA_LIODN_SHIFT;
}
iowrite32be(tmp, &fman->dma_regs->fmdmplr[port_id / 2]);
- iowrite32be(liodn_ofst, &fman->bmi_regs->fmbm_spliodn[port_id - 1]);
}
static void enable_rams_ecc(struct fman_fpm_regs __iomem *fpm_rg)
@@ -1942,6 +1944,8 @@ static int fman_init(struct fman *fman)
fman->liodn_offset[i] =
ioread32be(&fman->bmi_regs->fmbm_spliodn[i - 1]);
+ if (!IS_ENABLED(CONFIG_FSL_PAMU))
+ continue;
liodn_base = ioread32be(&fman->dma_regs->fmdmplr[i / 2]);
if (i % 2) {
/* FMDM_PLR LSB holds LIODN base for odd ports */
--
2.17.1
next prev parent reply other threads:[~2019-05-30 14:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-30 14:19 [PATCH v3 0/6] Prerequisites for NXP LS104xA SMMU enablement laurentiu.tudor
2019-05-30 14:19 ` laurentiu.tudor [this message]
2019-05-30 14:19 ` [PATCH v3 2/6] fsl/fman: add API to get the device behind a fman port laurentiu.tudor
2019-05-30 14:19 ` [PATCH v3 3/6] dpaa_eth: defer probing after qbman laurentiu.tudor
2019-05-30 14:19 ` [PATCH v3 4/6] dpaa_eth: base dma mappings on the fman rx port laurentiu.tudor
2019-05-30 14:19 ` [PATCH v3 5/6] dpaa_eth: fix iova handling for contiguous frames laurentiu.tudor
2019-05-31 16:32 ` Christoph Hellwig
2019-05-31 16:53 ` Laurentiu Tudor
2019-05-31 16:55 ` Christoph Hellwig
2019-05-31 17:01 ` Laurentiu Tudor
2019-05-30 14:19 ` [PATCH v3 6/6] dpaa_eth: fix iova handling for sg frames laurentiu.tudor
2019-05-30 22:08 ` [PATCH v3 0/6] Prerequisites for NXP LS104xA SMMU enablement David Miller
2019-05-30 22:14 ` Li Yang
2019-05-31 13:09 ` Laurentiu Tudor
2019-05-31 16:33 ` Christoph Hellwig
2019-05-31 17:03 ` Robin Murphy
2019-05-31 17:08 ` Christoph Hellwig
2019-05-31 17:45 ` Robin Murphy
2019-05-31 17:46 ` Christoph Hellwig
2019-05-31 16:15 ` Andreas Färber
2019-05-31 16:46 ` Laurentiu Tudor
2019-05-31 17:03 ` Andreas Färber
2019-05-31 17:32 ` Laurentiu Tudor
2019-06-03 16:42 ` Andreas Färber
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=20190530141951.6704-2-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).