From: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
will.deacon-5wv7dgnIgG8@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
mitchelh-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Cc: sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org
Subject: [RFC PATCH 2/4] iommu/arm-smmu: Add xlate callback for initializing master devices from dt
Date: Fri, 17 Jul 2015 22:23:23 +0530 [thread overview]
Message-ID: <1437152005-25092-3-git-send-email-sricharan@codeaurora.org> (raw)
In-Reply-To: <1437152005-25092-1-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
This adds of_xlate callback to arm-smmu driver. xlate callback
is called during device registration from DT for those master
devices attached to iommus using generic iommu bindings.
Signed-off-by: Sricharan R <sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
---
drivers/iommu/arm-smmu.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 8c4eb43..2cf65ab 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -321,6 +321,7 @@ struct arm_smmu_device {
unsigned int *irqs;
struct list_head list;
+ struct device_node *node;
struct rb_root masters;
};
@@ -1434,6 +1435,38 @@ out_unlock:
return ret;
}
+static int arm_smmu_of_xlate(struct device *dev,
+ struct of_phandle_args *spec)
+{
+ struct arm_smmu_device *smmu;
+ struct arm_smmu_master *master;
+ int streamid;
+
+ spin_lock(&arm_smmu_devices_lock);
+ list_for_each_entry(smmu, &arm_smmu_devices, list) {
+ if (smmu->node == spec->np)
+ break;
+ }
+ spin_unlock(&arm_smmu_devices_lock);
+
+ if (!smmu || (smmu->node != spec->np))
+ return -ENODEV;
+
+ spec->np = dev->of_node;
+
+ master = find_smmu_master(smmu, spec->np);
+ if (!master) {
+ if (register_smmu_master(smmu, smmu->dev, spec))
+ return -ENODEV;
+ } else {
+ streamid = master->cfg.num_streamids;
+ master->cfg.streamids[streamid] = spec->args[0];
+ master->cfg.num_streamids++;
+ }
+
+ return 0;
+}
+
static struct iommu_ops arm_smmu_ops = {
.capable = arm_smmu_capable,
.domain_init = arm_smmu_domain_init,
@@ -1449,6 +1482,7 @@ static struct iommu_ops arm_smmu_ops = {
.domain_get_attr = arm_smmu_domain_get_attr,
.domain_set_attr = arm_smmu_domain_set_attr,
.pgsize_bitmap = -1UL, /* Restricted during device attach */
+ .of_xlate = arm_smmu_of_xlate,
};
static void arm_smmu_device_reset(struct arm_smmu_device *smmu)
@@ -1782,6 +1816,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
}
}
+ smmu->node = dev->of_node;
+
INIT_LIST_HEAD(&smmu->list);
spin_lock(&arm_smmu_devices_lock);
list_add(&smmu->list, &arm_smmu_devices);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: sricharan@codeaurora.org (Sricharan R)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 2/4] iommu/arm-smmu: Add xlate callback for initializing master devices from dt
Date: Fri, 17 Jul 2015 22:23:23 +0530 [thread overview]
Message-ID: <1437152005-25092-3-git-send-email-sricharan@codeaurora.org> (raw)
In-Reply-To: <1437152005-25092-1-git-send-email-sricharan@codeaurora.org>
This adds of_xlate callback to arm-smmu driver. xlate callback
is called during device registration from DT for those master
devices attached to iommus using generic iommu bindings.
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
---
drivers/iommu/arm-smmu.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 8c4eb43..2cf65ab 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -321,6 +321,7 @@ struct arm_smmu_device {
unsigned int *irqs;
struct list_head list;
+ struct device_node *node;
struct rb_root masters;
};
@@ -1434,6 +1435,38 @@ out_unlock:
return ret;
}
+static int arm_smmu_of_xlate(struct device *dev,
+ struct of_phandle_args *spec)
+{
+ struct arm_smmu_device *smmu;
+ struct arm_smmu_master *master;
+ int streamid;
+
+ spin_lock(&arm_smmu_devices_lock);
+ list_for_each_entry(smmu, &arm_smmu_devices, list) {
+ if (smmu->node == spec->np)
+ break;
+ }
+ spin_unlock(&arm_smmu_devices_lock);
+
+ if (!smmu || (smmu->node != spec->np))
+ return -ENODEV;
+
+ spec->np = dev->of_node;
+
+ master = find_smmu_master(smmu, spec->np);
+ if (!master) {
+ if (register_smmu_master(smmu, smmu->dev, spec))
+ return -ENODEV;
+ } else {
+ streamid = master->cfg.num_streamids;
+ master->cfg.streamids[streamid] = spec->args[0];
+ master->cfg.num_streamids++;
+ }
+
+ return 0;
+}
+
static struct iommu_ops arm_smmu_ops = {
.capable = arm_smmu_capable,
.domain_init = arm_smmu_domain_init,
@@ -1449,6 +1482,7 @@ static struct iommu_ops arm_smmu_ops = {
.domain_get_attr = arm_smmu_domain_get_attr,
.domain_set_attr = arm_smmu_domain_set_attr,
.pgsize_bitmap = -1UL, /* Restricted during device attach */
+ .of_xlate = arm_smmu_of_xlate,
};
static void arm_smmu_device_reset(struct arm_smmu_device *smmu)
@@ -1782,6 +1816,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
}
}
+ smmu->node = dev->of_node;
+
INIT_LIST_HEAD(&smmu->list);
spin_lock(&arm_smmu_devices_lock);
list_add(&smmu->list, &arm_smmu_devices);
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2015-07-17 16:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-17 16:53 [RFC PATCH 0/4] iommu/arm-smmu: Add support for adding masters/clocks using generic bindings Sricharan R
2015-07-17 16:53 ` Sricharan R
2015-07-17 16:53 ` [RFC PATCH 1/4] iommu/arm-smmu: Init driver using IOMMU_OF_DECLARE Sricharan R
2015-07-17 16:53 ` Sricharan R
[not found] ` <1437152005-25092-2-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-07-21 15:03 ` Will Deacon
2015-07-21 15:03 ` Will Deacon
2015-07-22 11:08 ` Sricharan
2015-07-22 11:08 ` Sricharan
[not found] ` <1437152005-25092-1-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-07-17 16:53 ` Sricharan R [this message]
2015-07-17 16:53 ` [RFC PATCH 2/4] iommu/arm-smmu: Add xlate callback for initializing master devices from dt Sricharan R
2015-07-17 16:53 ` [RFC PATCH 3/4] iommu/arm-smmu: Add support for specifying clocks Sricharan R
2015-07-17 16:53 ` Sricharan R
[not found] ` <1437152005-25092-4-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-07-21 15:01 ` Will Deacon
2015-07-21 15:01 ` Will Deacon
[not found] ` <20150721150122.GH31095-5wv7dgnIgG8@public.gmane.org>
2015-07-24 12:26 ` Sricharan
2015-07-24 12:26 ` Sricharan
2015-07-17 16:53 ` [RFC PATCH 4/4] iommu/arm-smmu: Add support for specifying regulators Sricharan R
2015-07-17 16:53 ` Sricharan R
[not found] ` <1437152005-25092-5-git-send-email-sricharan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2015-07-21 18:17 ` Stephen Boyd
2015-07-21 18:17 ` Stephen Boyd
2015-07-24 12:28 ` Sricharan
2015-07-24 12:28 ` Sricharan
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=1437152005-25092-3-git-send-email-sricharan@codeaurora.org \
--to=sricharan-sgv2jx0feol9jmxxk+q4oq@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mitchelh-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=will.deacon-5wv7dgnIgG8@public.gmane.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.