From: robin.murphy@arm•com (Robin Murphy)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4 5/8] iommu/of: Introduce iommu_fwspec
Date: Mon, 11 Jul 2016 12:07:34 +0100 [thread overview]
Message-ID: <57837DF6.5060504@arm.com> (raw)
In-Reply-To: <20160707165631.GB2685@red-moon>
On 07/07/16 17:56, Lorenzo Pieralisi wrote:
> On Fri, Jul 01, 2016 at 05:50:14PM +0100, Robin Murphy wrote:
>
> [...]
>
>> +int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids)
>> +{
>> + struct iommu_fwspec *fwspec = dev->archdata.iommu;
>> + size_t size;
>> +
>> + if (!fwspec)
>> + return -EINVAL;
>> +
>> + size = offsetof(struct iommu_fwspec, ids[fwspec->num_ids + 1]);
> ^^^^
>
> + num_ids ?
Oops, quite right. Thanks!
Robin.
> Lorenzo
>
>> + fwspec = krealloc(dev->archdata.iommu, size, GFP_KERNEL);
>> + if (!fwspec)
>> + return -ENOMEM;
>> +
>> + while (num_ids--)
>> + fwspec->ids[fwspec->num_ids++] = *ids++;
>> +
>> + dev->archdata.iommu = fwspec;
>> + return 0;
>> +}
>> +
>> +inline struct iommu_fwspec *dev_iommu_fwspec(struct device *dev)
>> +{
>> + return dev->archdata.iommu;
>> +}
>> diff --git a/include/linux/of_iommu.h b/include/linux/of_iommu.h
>> index bd02b44902d0..308791fca32d 100644
>> --- a/include/linux/of_iommu.h
>> +++ b/include/linux/of_iommu.h
>> @@ -15,6 +15,14 @@ extern void of_iommu_init(void);
>> extern const struct iommu_ops *of_iommu_configure(struct device *dev,
>> struct device_node *master_np);
>>
>> +struct iommu_fwspec {
>> + const struct iommu_ops *iommu_ops;
>> + struct device_node *iommu_np;
>> + void *iommu_priv;
>> + unsigned int num_ids;
>> + u32 ids[];
>> +};
>> +
>> #else
>>
>> static inline int of_get_dma_window(struct device_node *dn, const char *prefix,
>> @@ -31,8 +39,15 @@ static inline const struct iommu_ops *of_iommu_configure(struct device *dev,
>> return NULL;
>> }
>>
>> +struct iommu_fwspec;
>> +
>> #endif /* CONFIG_OF_IOMMU */
>>
>> +int iommu_fwspec_init(struct device *dev, struct device_node *iommu_np);
>> +void iommu_fwspec_free(struct device *dev);
>> +int iommu_fwspec_add_ids(struct device *dev, u32 *ids, int num_ids);
>> +struct iommu_fwspec *dev_iommu_fwspec(struct device *dev);
>> +
>> void of_iommu_set_ops(struct device_node *np, const struct iommu_ops *ops);
>> const struct iommu_ops *of_iommu_get_ops(struct device_node *np);
>>
>> --
>> 2.8.1.dirty
>>
>
next prev parent reply other threads:[~2016-07-11 11:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 16:50 [PATCH v4 0/8] Generic DT bindings for PCI IOMMUs and ARM SMMUv3 Robin Murphy
2016-07-01 16:50 ` [PATCH v4 1/8] arm64: mm: change IOMMU notifier action to attach DMA ops Robin Murphy
2016-07-08 14:55 ` Will Deacon
2016-07-08 17:06 ` Catalin Marinas
2016-07-01 16:50 ` [PATCH v4 2/8] Docs: dt: add PCI IOMMU map bindings Robin Murphy
2016-07-01 16:50 ` [PATCH v4 3/8] of/irq: Break out msi-map lookup (again) Robin Murphy
2016-07-07 16:51 ` Will Deacon
2016-07-18 17:54 ` Rob Herring
2016-07-01 16:50 ` [PATCH v4 4/8] iommu/of: Handle iommu-map property for PCI Robin Murphy
2016-07-01 16:50 ` [PATCH v4 5/8] iommu/of: Introduce iommu_fwspec Robin Murphy
2016-07-07 16:56 ` Lorenzo Pieralisi
2016-07-11 11:07 ` Robin Murphy [this message]
2016-07-01 16:50 ` [PATCH v4 6/8] iommu/arm-smmu: Implement of_xlate() for SMMUv3 Robin Murphy
2016-07-15 13:55 ` Lorenzo Pieralisi
2016-07-15 18:27 ` Robin Murphy
2016-07-29 14:46 ` Jean-Philippe Brucker
2016-07-29 18:55 ` Robin Murphy
2016-08-24 15:08 ` Robin Murphy
2016-07-01 16:50 ` [PATCH v4 7/8] iommu/arm-smmu: Support non-PCI devices with SMMUv3 Robin Murphy
2016-07-01 16:50 ` [PATCH v4 8/8] iommu/arm-smmu: Set PRIVCFG in stage 1 STEs Robin Murphy
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=57837DF6.5060504@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