mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 v2 1/9] soc/fsl/qman: fixup liodns only on ppc targets
Date: Sat, 27 Apr 2019 10:10:23 +0300	[thread overview]
Message-ID: <20190427071031.6563-2-laurentiu.tudor@nxp.com> (raw)
In-Reply-To: <20190427071031.6563-1-laurentiu.tudor@nxp.com>

From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

ARM SoCs use SMMU so the liodn fixup done in the qman driver is no
longer making sense and it also breaks the ICID settings inherited
from u-boot. Do the fixups only for PPC targets.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/soc/fsl/qbman/qman_ccsr.c | 2 +-
 drivers/soc/fsl/qbman/qman_priv.h | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/fsl/qbman/qman_ccsr.c b/drivers/soc/fsl/qbman/qman_ccsr.c
index 109b38de3176..a6bb43007d03 100644
--- a/drivers/soc/fsl/qbman/qman_ccsr.c
+++ b/drivers/soc/fsl/qbman/qman_ccsr.c
@@ -596,7 +596,7 @@ static int qman_init_ccsr(struct device *dev)
 }
 
 #define LIO_CFG_LIODN_MASK 0x0fff0000
-void qman_liodn_fixup(u16 channel)
+void __qman_liodn_fixup(u16 channel)
 {
 	static int done;
 	static u32 liodn_offset;
diff --git a/drivers/soc/fsl/qbman/qman_priv.h b/drivers/soc/fsl/qbman/qman_priv.h
index 75a8f905f8f7..04515718cfd9 100644
--- a/drivers/soc/fsl/qbman/qman_priv.h
+++ b/drivers/soc/fsl/qbman/qman_priv.h
@@ -193,7 +193,14 @@ extern struct gen_pool *qm_cgralloc; /* CGR ID allocator */
 u32 qm_get_pools_sdqcr(void);
 
 int qman_wq_alloc(void);
-void qman_liodn_fixup(u16 channel);
+#ifdef CONFIG_FSL_PAMU
+#define qman_liodn_fixup __qman_liodn_fixup
+#else
+static inline void qman_liodn_fixup(u16 channel)
+{
+}
+#endif
+void __qman_liodn_fixup(u16 channel);
 void qman_set_sdest(u16 channel, unsigned int cpu_idx);
 
 struct qman_portal *qman_create_affine_portal(
-- 
2.17.1


  reply	other threads:[~2019-04-27  7:11 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-27  7:10 [PATCH v2 0/9] Prerequisites for NXP LS104xA SMMU enablement laurentiu.tudor
2019-04-27  7:10 ` laurentiu.tudor [this message]
2019-05-01 20:08   ` [PATCH v2 1/9] soc/fsl/qman: fixup liodns only on ppc targets Li Yang
2019-04-27  7:10 ` [PATCH v2 2/9] soc/fsl/qbman_portals: add APIs to retrieve the probing status laurentiu.tudor
2019-05-01 19:47   ` Li Yang
2019-04-27  7:10 ` [PATCH v2 3/9] fsl/fman: backup and restore ICID registers laurentiu.tudor
2019-04-27 16:18   ` David Miller
2019-04-27  7:10 ` [PATCH v2 4/9] fsl/fman: add API to get the device behind a fman port laurentiu.tudor
2019-04-27  7:10 ` [PATCH v2 5/9] dpaa_eth: defer probing after qbman laurentiu.tudor
2019-04-27  7:10 ` [PATCH v2 6/9] dpaa_eth: base dma mappings on the fman rx port laurentiu.tudor
2019-04-27  7:10 ` [PATCH v2 7/9] dpaa_eth: fix iova handling for contiguous frames laurentiu.tudor
2019-04-27 16:46   ` Christoph Hellwig
2019-05-02  9:10     ` Laurentiu Tudor
2019-04-27  7:10 ` [PATCH v2 8/9] dpaa_eth: fix iova handling for sg frames laurentiu.tudor
2019-04-27  7:10 ` [PATCH v2 9/9] dpaa_eth: fix SG frame cleanup laurentiu.tudor
2019-04-27 17:10   ` Joakim Tjernlund
2019-05-02  9:05     ` Laurentiu Tudor
2019-05-02 10:36       ` Joakim Tjernlund
2019-05-02 12:58         ` Laurentiu Tudor
2019-05-02 13:03           ` Joakim Tjernlund

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=20190427071031.6563-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

all inboxes | Powered by JetHome®