On Wed, Jun 26, 2013 at 12:28:24PM +0300, Hiroshi Doyu wrote: > Get swgroup ID from DT. "nvidia,swgroups" indicates which swgroup IDs > a device belongs to. > > Signed-off-by: Hiroshi Doyu <[email protected]> > --- > arch/arm/boot/dts/tegra30.dtsi | 1 - > drivers/iommu/tegra-smmu.c | 20 +++++++++++++++++++- > 2 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi > index 7c480f2..a116737 100644 > --- a/arch/arm/boot/dts/tegra30.dtsi > +++ b/arch/arm/boot/dts/tegra30.dtsi > @@ -1,6 +1,5 @@ > #include <dt-bindings/clock/tegra30-car.h> > #include <dt-bindings/gpio/tegra-gpio.h> > -#include <dt-bindings/iommu/tegra-swgid.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > > #include "skeleton.dtsi" > diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c > index 50eb843..96dbef3 100644 > --- a/drivers/iommu/tegra-smmu.c > +++ b/drivers/iommu/tegra-smmu.c > @@ -314,6 +314,24 @@ static inline void smmu_write(struct smmu_device *smmu, > u32 val, size_t offs) > > #define smmu_client_hwgrp(c) (c->as->smmu->swgroups) > > +static u64 tegra_smmu_of_get_swgids(struct device *dev) > +{ > + size_t bytes; > + const char *propname = "nvidia,memory-clients"; > + const __be32 *prop; > + int i; > + u64 swgids = 0; > + > + prop = of_get_property(dev->of_node, propname, &bytes); > + if (!prop || !bytes) > + return 0; > + > + for (i = 0; i < bytes / sizeof(u32); i++, prop++) > + swgids |= 1ULL << be32_to_cpup(prop); > + > + return swgids; > +} > + > static int __smmu_client_set_hwgrp(struct smmu_client *c, > u64 map, int on) > { > @@ -725,7 +743,7 @@ static int smmu_iommu_attach_dev(struct iommu_domain > *domain, > return -ENOMEM; > client->dev = dev; > client->as = as; > - map = smmu->swgroups; > + map = tegra_smmu_of_get_swgids(dev); > if (!map) > return -EINVAL;
Shouldn't this be part of an earlier patch ("[PATCH 17/23] iommu/tegra:
smmu: Use swgroups instead of pdata")? What's the reason for the split?
Thierry
pgppPXAsbVDak.pgp
Description: PGP signature
_______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
