> -----Original Message----- > From: Robin Murphy [mailto:robin.murphy@xxxxxxx] > Sent: Tuesday, April 17, 2018 10:23 PM > To: Nipun Gupta <nipun.gupta@xxxxxxx>; robh+dt@xxxxxxxxxx; > frowand.list@xxxxxxxxx > Cc: will.deacon@xxxxxxx; mark.rutland@xxxxxxx; catalin.marinas@xxxxxxx; > hch@xxxxxx; gregkh@xxxxxxxxxxxxxxxxxxx; joro@xxxxxxxxxx; > m.szyprowski@xxxxxxxxxxx; shawnguo@xxxxxxxxxx; bhelgaas@xxxxxxxxxx; > iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; > devicetree@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linuxppc- > dev@xxxxxxxxxxxxxxxx; linux-pci@xxxxxxxxxxxxxxx; Bharat Bhushan > <bharat.bhushan@xxxxxxx>; stuyoder@xxxxxxxxx; Laurentiu Tudor > <laurentiu.tudor@xxxxxxx>; Leo Li <leoyang.li@xxxxxxx> > Subject: Re: [PATCH 2/6 v2] iommu: of: make of_pci_map_rid() available for > other devices too > > On 17/04/18 11:21, Nipun Gupta wrote: > > iommu-map property is also used by devices with fsl-mc. This patch > > moves the of_pci_map_rid to generic location, so that it can be used > > by other busses too. > > > > Signed-off-by: Nipun Gupta <nipun.gupta@xxxxxxx> > > --- > > drivers/iommu/of_iommu.c | 106 > > +++++++++++++++++++++++++++++++++++++++++++++-- > > Doesn't this break "msi-parent" parsing for !CONFIG_OF_IOMMU? I guess you > don't want fsl-mc to have to depend on PCI, but this looks like a step in the > wrong direction. Thanks for pointing out. Agree, this will break "msi-parent" parsing for !CONFIG_OF_IOMMU case. > > I'm not entirely sure where of_map_rid() fits best, but from a quick look around > the least-worst option might be drivers/of/of_address.c, unless Rob and Frank > have a better idea of where generic DT-based ID translation routines could live? > > > drivers/of/irq.c | 6 +-- > > drivers/pci/of.c | 101 -------------------------------------------- > > include/linux/of_iommu.h | 11 +++++ > > include/linux/of_pci.h | 10 ----- > > 5 files changed, 117 insertions(+), 117 deletions(-) > > [...] > > struct of_pci_iommu_alias_info { > > struct device *dev; > > struct device_node *np; > > @@ -149,9 +249,9 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 > alias, void *data) > > struct of_phandle_args iommu_spec = { .args_count = 1 }; > > int err; > > > > - err = of_pci_map_rid(info->np, alias, "iommu-map", > > - "iommu-map-mask", &iommu_spec.np, > > - iommu_spec.args); > > + err = of_map_rid(info->np, alias, "iommu-map", > > + "iommu-map-mask", &iommu_spec.np, > > + iommu_spec.args); > > Super-nit: Apparently I missed rewrapping this to 2 lines in d87beb749281, but if > it's being touched again, that would be nice ;) Sure.. I'll take care of this in the next version :) Regards, Nipun
