From: Will Deacon <will@kernel.org> To: linux-kernel@vger.kernel.org Cc: devicetree@vger.kernel.org, iommu@lists.linuxfoundation.org, Will Deacon <will@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Rob Herring <robh@kernel.org>, Saravana Kannan <saravanak@google.com>, Robin Murphy <robin.murphy@arm.com> Subject: [PATCH] of: property: Add device link support for "iommu-map" Date: Wed, 20 Nov 2019 19:00:28 +0000 [thread overview] Message-ID: <20191120190028.4722-1-will@kernel.org> (raw) Commit 8e12257dead7 ("of: property: Add device link support for iommus, mboxes and io-channels") added device link support for IOMMU linkages described using the "iommus" property. For PCI devices, this property is not present and instead the "iommu-map" property is used on the host bridge node to map the endpoint RequesterIDs to their corresponding IOMMU instance. Add support for "iommu-map" to the device link supplier bindings so that probing of PCI devices can be deferred until after the IOMMU is available. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@google.com> Cc: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will@kernel.org> --- Applies against driver-core/driver-core-next. Tested on AMD Seattle (arm64). drivers/of/property.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/of/property.c b/drivers/of/property.c index 0fa04692e3cc..37e0d408430d 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1190,10 +1190,20 @@ DEFINE_SIMPLE_PROP(mboxes, "mboxes", "#mbox-cells") DEFINE_SIMPLE_PROP(io_channels, "io-channel", "#io-channel-cells") DEFINE_SUFFIX_PROP(regulators, "-supply", NULL) +static struct device_node *parse_iommu_maps(struct device_node *np, + const char *prop_name, int index) +{ + if (strcmp(prop_name, "iommu-map")) + return NULL; + + return of_parse_phandle(np, prop_name, (index * 4) + 1); +} + static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, }, { .parse_prop = parse_iommus, }, + { .parse_prop = parse_iommu_maps, }, { .parse_prop = parse_mboxes, }, { .parse_prop = parse_io_channels, }, { .parse_prop = parse_regulators, }, -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Will Deacon <will@kernel.org> To: linux-kernel@vger.kernel.org Cc: iommu@lists.linuxfoundation.org, devicetree@vger.kernel.org, Saravana Kannan <saravanak@google.com>, Rob Herring <robh@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Robin Murphy <robin.murphy@arm.com>, Will Deacon <will@kernel.org> Subject: [PATCH] of: property: Add device link support for "iommu-map" Date: Wed, 20 Nov 2019 19:00:28 +0000 [thread overview] Message-ID: <20191120190028.4722-1-will@kernel.org> (raw) Commit 8e12257dead7 ("of: property: Add device link support for iommus, mboxes and io-channels") added device link support for IOMMU linkages described using the "iommus" property. For PCI devices, this property is not present and instead the "iommu-map" property is used on the host bridge node to map the endpoint RequesterIDs to their corresponding IOMMU instance. Add support for "iommu-map" to the device link supplier bindings so that probing of PCI devices can be deferred until after the IOMMU is available. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Rob Herring <robh@kernel.org> Cc: Saravana Kannan <saravanak@google.com> Cc: Robin Murphy <robin.murphy@arm.com> Signed-off-by: Will Deacon <will@kernel.org> --- Applies against driver-core/driver-core-next. Tested on AMD Seattle (arm64). drivers/of/property.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/of/property.c b/drivers/of/property.c index 0fa04692e3cc..37e0d408430d 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1190,10 +1190,20 @@ DEFINE_SIMPLE_PROP(mboxes, "mboxes", "#mbox-cells") DEFINE_SIMPLE_PROP(io_channels, "io-channel", "#io-channel-cells") DEFINE_SUFFIX_PROP(regulators, "-supply", NULL) +static struct device_node *parse_iommu_maps(struct device_node *np, + const char *prop_name, int index) +{ + if (strcmp(prop_name, "iommu-map")) + return NULL; + + return of_parse_phandle(np, prop_name, (index * 4) + 1); +} + static const struct supplier_bindings of_supplier_bindings[] = { { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, }, { .parse_prop = parse_iommus, }, + { .parse_prop = parse_iommu_maps, }, { .parse_prop = parse_mboxes, }, { .parse_prop = parse_io_channels, }, { .parse_prop = parse_regulators, }, -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
next reply other threads:[~2019-11-20 19:00 UTC|newest] Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-20 19:00 Will Deacon [this message] 2019-11-20 19:00 ` [PATCH] of: property: Add device link support for "iommu-map" Will Deacon 2019-11-20 21:29 ` Saravana Kannan 2019-11-20 21:29 ` Saravana Kannan via iommu 2019-11-22 14:47 ` Rob Herring 2019-11-22 14:47 ` Rob Herring 2019-11-22 14:55 ` Will Deacon 2019-11-22 14:55 ` Will Deacon 2019-11-22 16:01 ` Rob Herring 2019-11-22 16:01 ` Rob Herring 2019-11-22 16:12 ` Ard Biesheuvel 2019-11-22 16:12 ` Ard Biesheuvel 2019-11-22 20:16 ` Rob Herring 2019-11-22 20:16 ` Rob Herring 2019-11-25 7:49 ` Will Deacon 2019-11-25 7:49 ` Will Deacon
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=20191120190028.4722-1-will@kernel.org \ --to=will@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=iommu@lists.linuxfoundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=robh@kernel.org \ --cc=robin.murphy@arm.com \ --cc=saravanak@google.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: linkBe 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.