From: robin.murphy@arm•com (Robin Murphy)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 3/7] of/irq: Break out msi-map lookup (again)
Date: Wed, 15 Jun 2016 11:16:16 +0100 [thread overview]
Message-ID: <57612AF0.7020208@arm.com> (raw)
In-Reply-To: <CAL_JsqJ4km0dH2PxHma9-cPwC20WR0ejn_14UeV0vBWJ+XLBBg@mail.gmail.com>
On 14/06/16 18:01, Rob Herring wrote:
> On Fri, Jun 3, 2016 at 12:15 PM, Robin Murphy <robin.murphy@arm•com> wrote:
>> The PCI msi-map code is already doing double-duty translating IDs and
>> retrieving MSI parents, which unsurprisingly is the same functionality
>> we need for the identically-formatted PCI iommu-map property. Drag the
>> core parsing routine up yet another layer into the general OF-PCI code,
>> and further generalise it for either kind of lookup in either flavour
>> of map property.
>>
>> CC: Rob Herring <robh+dt@kernel•org>
>> CC: Frank Rowand <frowand.list@gmail•com>
>> CC: Marc Zyngier <marc.zyngier@arm•com>
>> Signed-off-by: Robin Murphy <robin.murphy@arm•com>
>> ---
>>
>> v2: No change.
>>
>> drivers/of/irq.c | 70 ++-------------------------------
>> drivers/of/of_pci.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
>> include/linux/of_pci.h | 8 ++++
>> 3 files changed, 114 insertions(+), 66 deletions(-)
>>
>> diff --git a/drivers/of/irq.c b/drivers/of/irq.c
>> index e7bfc175b8e1..0c9118d849ee 100644
>> --- a/drivers/of/irq.c
>> +++ b/drivers/of/irq.c
>> @@ -24,6 +24,7 @@
>> #include <linux/module.h>
>> #include <linux/of.h>
>> #include <linux/of_irq.h>
>> +#include <linux/of_pci.h>
>> #include <linux/string.h>
>> #include <linux/slab.h>
>>
>> @@ -586,13 +587,7 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,
>> u32 rid_in)
>> {
>> struct device *parent_dev;
>> - struct device_node *msi_controller_node;
>> - struct device_node *msi_np = *np;
>> - u32 map_mask, masked_rid, rid_base, msi_base, rid_len, phandle;
>> - int msi_map_len;
>> - bool matched;
>> u32 rid_out = rid_in;
>> - const __be32 *msi_map = NULL;
>>
>> /*
>> * Walk up the device parent links looking for one with a
>> @@ -602,71 +597,14 @@ static u32 __of_msi_map_rid(struct device *dev, struct device_node **np,
>> if (!parent_dev->of_node)
>> continue;
>>
>> - msi_map = of_get_property(parent_dev->of_node,
>> - "msi-map", &msi_map_len);
>> - if (!msi_map)
>> + if (!of_property_read_bool(parent_dev->of_node, "msi-map"))
>
> But msi-map is not bool, right? I think we allow bools to have values
> for historical reasons, but really bool with a value should be an
> error. So don't rely on current behavior.
Right, I now have no idea why that wasn't of_find_property() in the
first place...
>> continue;
>>
>> - if (msi_map_len % (4 * sizeof(__be32))) {
>> - dev_err(parent_dev, "Error: Bad msi-map length: %d\n",
>> - msi_map_len);
>> - return rid_out;
>> - }
>> /* We have a good parent_dev and msi_map, let's use them. */
>> + of_pci_map_rid(parent_dev->of_node, "msi-map", rid_in, np,
>> + &rid_out);
>
> Seems like this could return an error code and then you could continue
> based on the return code. Then you wouldn't be looking up msi-map
> twice. Probably could get rid of the !parent_dev->of_node check too.
...but I agree that approach does sound better overall, so I'll take a
closer look at this whole patch again.
Thanks,
Robin.
>
> Rob
>
next prev parent reply other threads:[~2016-06-15 10:16 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-03 17:15 [PATCH v2 0/7] Generic DT bindings for PCI IOMMUs and ARM SMMUv3 Robin Murphy
2016-06-03 17:15 ` [PATCH v2 1/7] iommu/of: Respect disabled IOMMUs Robin Murphy
2016-06-14 14:11 ` Will Deacon
2016-06-14 15:04 ` Robin Murphy
2016-06-03 17:15 ` [PATCH v2 2/7] Docs: dt: add PCI IOMMU map bindings Robin Murphy
2016-06-14 14:16 ` Will Deacon
2016-06-03 17:15 ` [PATCH v2 3/7] of/irq: Break out msi-map lookup (again) Robin Murphy
2016-06-04 8:10 ` Marc Zyngier
2016-06-14 14:37 ` Will Deacon
2016-06-14 18:12 ` Robin Murphy
2016-06-14 18:20 ` Will Deacon
2016-06-14 17:01 ` Rob Herring
2016-06-15 10:16 ` Robin Murphy [this message]
2016-06-03 17:15 ` [PATCH v2 4/7] iommu/of: Handle iommu-map property for PCI Robin Murphy
2016-06-14 14:45 ` Will Deacon
2016-06-15 11:21 ` Robin Murphy
2016-06-03 17:15 ` [PATCH v2 5/7] iommu/arm-smmu: Implement of_xlate() for SMMUv3 Robin Murphy
2016-06-14 15:07 ` Will Deacon
2016-06-14 16:11 ` Robin Murphy
2016-06-03 17:15 ` [PATCH v2 6/7] iommu/arm-smmu: Finish off SMMUv3 default domain support Robin Murphy
2016-06-06 15:47 ` Jean-Philippe Brucker
2016-06-06 17:22 ` Robin Murphy
2016-06-14 15:59 ` Will Deacon
2016-06-03 17:15 ` [PATCH v2 7/7] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Robin Murphy
2016-06-14 15:16 ` Will Deacon
2016-06-15 1:22 ` Leizhen (ThunderTown)
2016-06-17 1:54 ` Leizhen (ThunderTown)
2016-06-17 9:14 ` Robin Murphy
2016-06-21 8:36 ` Leizhen (ThunderTown)
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=57612AF0.7020208@arm.com \
--to=robin.murphy@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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