LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Nipun Gupta <nipun.gupta@nxp.com>
To: robin.murphy@arm.com, will.deacon@arm.com, robh+dt@kernel.org,
robh@kernel.org, mark.rutland@arm.com, catalin.marinas@arm.com,
gregkh@linuxfoundation.org
Cc: hch@lst.de, joro@8bytes.org, m.szyprowski@samsung.com,
shawnguo@kernel.org, frowand.list@gmail.com, bhelgaas@google.com,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-pci@vger.kernel.org,
bharat.bhushan@nxp.com, stuyoder@gmail.com,
laurentiu.tudor@nxp.com, leoyang.li@nxp.com,
Nipun Gupta <nipun.gupta@nxp.com>
Subject: [PATCH v4 4/6] iommu: arm-smmu: Add support for the fsl-mc bus
Date: Mon, 30 Apr 2018 11:57:19 +0530 [thread overview]
Message-ID: <1525069641-8523-5-git-send-email-nipun.gupta@nxp.com> (raw)
In-Reply-To: <1525069641-8523-1-git-send-email-nipun.gupta@nxp.com>
Implement bus specific support for the fsl-mc bus including
registering arm_smmu_ops and bus specific device add operations.
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
---
drivers/iommu/arm-smmu.c | 7 +++++++
drivers/iommu/iommu.c | 21 +++++++++++++++++++++
include/linux/fsl/mc.h | 8 ++++++++
include/linux/iommu.h | 2 ++
4 files changed, 38 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 69e7c60..e1d5090 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -52,6 +52,7 @@
#include <linux/spinlock.h>
#include <linux/amba/bus.h>
+#include <linux/fsl/mc.h>
#include "io-pgtable.h"
#include "arm-smmu-regs.h"
@@ -1459,6 +1460,8 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev)
if (dev_is_pci(dev))
group = pci_device_group(dev);
+ else if (dev_is_fsl_mc(dev))
+ group = fsl_mc_device_group(dev);
else
group = generic_device_group(dev);
@@ -2037,6 +2040,10 @@ static void arm_smmu_bus_init(void)
bus_set_iommu(&pci_bus_type, &arm_smmu_ops);
}
#endif
+#ifdef CONFIG_FSL_MC_BUS
+ if (!iommu_present(&fsl_mc_bus_type))
+ bus_set_iommu(&fsl_mc_bus_type, &arm_smmu_ops);
+#endif
}
static int arm_smmu_device_probe(struct platform_device *pdev)
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index d2aa2320..6d4ce35 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -32,6 +32,7 @@
#include <linux/pci.h>
#include <linux/bitops.h>
#include <linux/property.h>
+#include <linux/fsl/mc.h>
#include <trace/events/iommu.h>
static struct kset *iommu_group_kset;
@@ -987,6 +988,26 @@ struct iommu_group *pci_device_group(struct device *dev)
return iommu_group_alloc();
}
+/* Get the IOMMU group for device on fsl-mc bus */
+struct iommu_group *fsl_mc_device_group(struct device *dev)
+{
+ struct device *cont_dev = fsl_mc_cont_dev(dev);
+ struct iommu_group *group;
+
+ /* Container device is responsible for creating the iommu group */
+ if (fsl_mc_is_cont_dev(dev)) {
+ group = iommu_group_alloc();
+ if (IS_ERR(group))
+ return NULL;
+ } else {
+ get_device(cont_dev);
+ group = iommu_group_get(cont_dev);
+ put_device(cont_dev);
+ }
+
+ return group;
+}
+
/**
* iommu_group_get_for_dev - Find or create the IOMMU group for a device
* @dev: target device
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index f27cb14..dddaca1 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -351,6 +351,14 @@ struct fsl_mc_io {
#define dev_is_fsl_mc(_dev) (0)
#endif
+/* Macro to check if a device is a container device */
+#define fsl_mc_is_cont_dev(_dev) (to_fsl_mc_device(_dev)->flags & \
+ FSL_MC_IS_DPRC)
+
+/* Macro to get the container device of a MC device */
+#define fsl_mc_cont_dev(_dev) (fsl_mc_is_cont_dev(_dev) ? \
+ (_dev) : (_dev)->parent)
+
/*
* module_fsl_mc_driver() - Helper macro for drivers that don't do
* anything special in module init/exit. This eliminates a lot of
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 19938ee..2981200 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -389,6 +389,8 @@ static inline size_t iommu_map_sg(struct iommu_domain *domain,
extern struct iommu_group *pci_device_group(struct device *dev);
/* Generic device grouping function */
extern struct iommu_group *generic_device_group(struct device *dev);
+/* FSL-MC device grouping function */
+struct iommu_group *fsl_mc_device_group(struct device *dev);
/**
* struct iommu_fwspec - per-device IOMMU instance data
--
1.9.1
next prev parent reply other threads:[~2018-04-30 6:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-27 10:27 [PATCH 0/6 v3] Support for fsl-mc bus and its devices in SMMU Nipun Gupta
2018-04-27 10:27 ` [PATCH 1/6 v3] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-04-27 17:20 ` Rob Herring
2018-04-27 10:27 ` [PATCH 2/6 v3] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-04-27 17:15 ` Rob Herring
2018-04-30 3:27 ` Nipun Gupta
2018-04-28 8:17 ` kbuild test robot
2018-04-27 10:27 ` [PATCH 3/6 v3] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
2018-04-27 10:27 ` [PATCH 4/6 v3] iommu: arm-smmu: Add support for the fsl-mc bus Nipun Gupta
2018-04-27 10:27 ` [PATCH 5/6 v3] bus: fsl-mc: supoprt dma configure for devices on " Nipun Gupta
2018-05-14 13:39 ` Laurentiu Tudor
2018-05-16 8:48 ` Nipun Gupta
2018-04-27 10:27 ` [PATCH 6/6 v3] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
2018-04-27 15:52 ` [PATCH 0/6 v3] Support for fsl-mc bus and its devices in SMMU Christoph Hellwig
2018-04-30 6:27 ` [PATCH v4 0/6] " Nipun Gupta
2018-04-30 6:27 ` [PATCH v4 1/6] Docs: dt: add fsl-mc iommu-map device-tree binding Nipun Gupta
2018-04-30 6:27 ` [PATCH v4 2/6] iommu: of: make of_pci_map_rid() available for other devices too Nipun Gupta
2018-04-30 20:56 ` Bjorn Helgaas
2018-05-01 12:44 ` Rob Herring
2018-04-30 6:27 ` [PATCH v4 3/6] iommu: support iommu configuration for fsl-mc devices Nipun Gupta
2018-04-30 6:27 ` Nipun Gupta [this message]
2018-04-30 6:27 ` [PATCH v4 5/6] bus: fsl-mc: supoprt dma configure for devices on fsl-mc bus Nipun Gupta
2018-05-01 5:43 ` kbuild test robot
2018-05-02 9:35 ` Laurentiu Tudor
2018-05-14 11:24 ` Greg KH
2018-05-14 12:47 ` Bjorn Helgaas
2018-04-30 6:27 ` [PATCH v4 6/6] arm64: dts: ls208xa: comply with the iommu map binding for fsl_mc Nipun Gupta
2018-05-02 9:14 ` 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=1525069641-8523-5-git-send-email-nipun.gupta@nxp.com \
--to=nipun.gupta@nxp.com \
--cc=bharat.bhushan@nxp.com \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=m.szyprowski@samsung.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=robin.murphy@arm.com \
--cc=shawnguo@kernel.org \
--cc=stuyoder@gmail.com \
--cc=will.deacon@arm.com \
--subject='Re: [PATCH v4 4/6] iommu: arm-smmu: Add support for the fsl-mc bus' \
/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
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).