From: andreas.herrmann@calxeda.com (Andreas Herrmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] iommu/arm-smmu: Introduce driver option handling
Date: Thu, 16 Jan 2014 13:44:13 +0100 [thread overview]
Message-ID: <1389876263-25759-2-git-send-email-andreas.herrmann@calxeda.com> (raw)
In-Reply-To: <1389876263-25759-1-git-send-email-andreas.herrmann@calxeda.com>
Introduce handling of driver options. Options are set based on DT
information when probing an SMMU device. The first option introduced
is "arm,smmu-isolate-devices". (It will be used in the bus notifier
block.)
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>
---
drivers/iommu/arm-smmu.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index e46a887..0b97d03 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -47,6 +47,9 @@
#include <asm/pgalloc.h>
+/* Driver options */
+#define ARM_SMMU_OPT_ISOLATE_DEVICES (1 << 0)
+
/* Maximum number of stream IDs assigned to a single device */
#define MAX_MASTER_STREAMIDS 8
@@ -348,6 +351,7 @@ struct arm_smmu_device {
#define ARM_SMMU_FEAT_TRANS_S2 (1 << 3)
#define ARM_SMMU_FEAT_TRANS_NESTED (1 << 4)
u32 features;
+ u32 options;
int version;
u32 num_context_banks;
@@ -398,6 +402,29 @@ struct arm_smmu_domain {
static DEFINE_SPINLOCK(arm_smmu_devices_lock);
static LIST_HEAD(arm_smmu_devices);
+struct arm_smmu_option_prop {
+ u32 opt;
+ const char *prop;
+};
+
+static struct arm_smmu_option_prop arm_smmu_options [] = {
+ { ARM_SMMU_OPT_ISOLATE_DEVICES, "arm,smmu-isolate-devices" },
+ { 0, NULL},
+};
+
+static void check_driver_options(struct arm_smmu_device *smmu)
+{
+ int i = 0;
+ do {
+ if (of_property_read_bool(smmu->dev->of_node,
+ arm_smmu_options[i].prop)) {
+ smmu->options |= arm_smmu_options[i].opt;
+ dev_dbg(smmu->dev, "option %s\n",
+ arm_smmu_options[i].prop);
+ }
+ } while (arm_smmu_options[++i].opt);
+}
+
static struct arm_smmu_master *find_smmu_master(struct arm_smmu_device *smmu,
struct device_node *dev_node)
{
@@ -1783,6 +1810,8 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev)
}
smmu->dev = dev;
+ check_driver_options(smmu);
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
smmu->base = devm_ioremap_resource(dev, res);
if (IS_ERR(smmu->base))
--
1.7.9.5
next prev parent reply other threads:[~2014-01-16 12:44 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-16 12:44 [PATCH v4 0/11] iommu/arm-smmu: Misc modifications to support SMMUs on Calxeda ECX-2000 Andreas Herrmann
2014-01-16 12:44 ` Andreas Herrmann [this message]
2014-01-22 11:51 ` [PATCH 01/11] iommu/arm-smmu: Introduce driver option handling Will Deacon
2014-01-23 20:16 ` Andreas Herrmann
2014-01-16 12:44 ` [PATCH 02/11] iommu/arm-smmu: Introduce bus notifier block Andreas Herrmann
2014-01-18 20:59 ` Varun Sethi
2014-01-20 21:29 ` Andreas Herrmann
2014-01-20 21:53 ` [PATCH v2 02/11] iommu/arm-smmu: Introduce iommu_group " Andreas Herrmann
2014-01-20 21:56 ` Andreas Herrmann
2014-01-20 22:28 ` [PATCH v3 " Andreas Herrmann
2014-01-21 17:48 ` Varun Sethi
2014-01-22 12:25 ` Will Deacon
2014-01-22 13:14 ` Varun Sethi
2014-01-22 13:40 ` Will Deacon
2014-01-22 13:54 ` Varun Sethi
2014-01-22 15:33 ` Will Deacon
2014-01-22 19:07 ` Varun Sethi
2014-01-23 19:57 ` Andreas Herrmann
2014-01-28 11:00 ` Varun Sethi
2014-01-29 14:14 ` Andreas Herrmann
2014-01-29 19:19 ` Varun Sethi
2014-01-23 19:24 ` Andreas Herrmann
2014-01-24 9:48 ` Andreas Herrmann
2014-01-16 12:44 ` [PATCH 03/11] iommu/arm-smmu: Support buggy implementation where all config accesses are secure Andreas Herrmann
2014-01-16 12:44 ` [PATCH 04/11] iommu/arm-smmu: Introduce automatic stream-id-masking Andreas Herrmann
2014-01-22 15:26 ` Will Deacon
2014-01-22 20:15 ` Andreas Herrmann
2014-01-16 12:44 ` [PATCH 05/11] iommu/arm-smmu: Check for duplicate stream IDs when registering master devices Andreas Herrmann
2014-01-22 15:53 ` Will Deacon
2014-01-23 21:17 ` Andreas Herrmann
2014-01-16 12:44 ` [PATCH 06/11] documentation/iommu: Update description of ARM System MMU binding Andreas Herrmann
2014-01-16 14:31 ` Rob Herring
2014-01-16 12:44 ` [PATCH 07/11] iommu/arm-smmu: Set MAX_MASTER_STREAMIDS to MAX_PHANDLE_ARGS Andreas Herrmann
2014-01-16 12:44 ` [PATCH 08/11] of: Increase MAX_PHANDLE_ARGS Andreas Herrmann
2014-01-16 14:25 ` Rob Herring
2014-01-17 11:00 ` Andreas Herrmann
2014-01-17 11:08 ` [PATCH v2 " Andreas Herrmann
2014-01-29 16:11 ` Suravee Suthikulanit
[not found] ` < CAL_JsqLhzp5jUJPA91rNkQ07kCDYCDZLxw8LxxFEVP9b12e1Jw@mail.gmail.com>
2014-01-29 16:57 ` Rob Herring
2014-01-29 16:59 ` Suravee Suthikulanit
2014-01-29 17:16 ` Andreas Herrmann
2014-01-29 17:26 ` Suravee Suthikulanit
2014-01-29 17:29 ` Will Deacon
2014-01-29 17:57 ` Suravee Suthikulanit
2014-01-29 18:03 ` Will Deacon
2014-01-30 22:53 ` Suravee Suthikulanit
2014-01-31 0:18 ` Will Deacon
2014-01-30 17:45 ` Andreas Herrmann
2014-01-31 16:24 ` Rob Herring
2014-02-03 16:44 ` Will Deacon
2014-02-04 17:33 ` Grant Likely
2014-02-04 17:36 ` Grant Likely
2014-01-16 12:44 ` [PATCH 09/11] ARM: dts: Add nodes for SMMUs on Calxeda ECX-2000 Andreas Herrmann
2014-01-16 14:30 ` Rob Herring
2014-01-17 11:01 ` Andreas Herrmann
2014-01-17 11:16 ` [PATCH v2 " Andreas Herrmann
2014-01-16 12:44 ` [PATCH 10/11] arm: dma-mapping: Add additional parameters to arm_iommu_create_mapping Andreas Herrmann
2014-01-22 16:01 ` Will Deacon
2014-01-16 12:44 ` [PATCH 11/11] arm: dma-mapping: Add support to extend DMA IOMMU mappings Andreas Herrmann
2014-01-22 16:10 ` Will Deacon
2014-01-23 21:50 ` Andreas Herrmann
2014-01-29 10:57 ` Marek Szyprowski
2014-01-29 11:05 ` Will Deacon
2014-01-29 14:40 ` Andreas Herrmann
2014-01-30 8:28 ` Marek Szyprowski
2014-01-30 8:44 ` Andreas Herrmann
2014-01-31 17:23 ` [PATCH] " Andreas Herrmann
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=1389876263-25759-2-git-send-email-andreas.herrmann@calxeda.com \
--to=andreas.herrmann@calxeda.com \
--cc=linux-arm-kernel@lists.infradead.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 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).