On 24/01/18 10:35, Jeffy Chen wrote:
From: Tomasz Figa <tfiga@xxxxxxxxxxxx>
Current code relies on master driver enabling necessary clocks before
IOMMU is accessed, however there are cases when the IOMMU should be
accessed while the master is not running yet, for example allocating
V4L2 videobuf2 buffers, which is done by the VB2 framework using DMA
mapping API and doesn't engage the master driver at all.
This patch fixes the problem by letting clocks needed for IOMMU
operation to be listed in Device Tree and making the driver enable them
for the time of accessing the hardware.
Signed-off-by: Jeffy Chen <jeffy.chen@xxxxxxxxxxxxxx>
Signed-off-by: Tomasz Figa <tfiga@xxxxxxxxxxxx>
---
Changes in v5:
Use clk_bulk APIs.
Changes in v4: None
Changes in v3: None
Changes in v2: None
 +static int rk_iommu_of_get_clocks(struct rk_iommu *iommu)
+{
+ÂÂÂ struct device_node *np = iommu->dev->of_node;
+ÂÂÂ int ret;
+ÂÂÂ int i;
+
+ÂÂÂ ret = of_count_phandle_with_args(np, "clocks", "#clock-cells");
+ÂÂÂ if (ret == -ENOENT)
+ÂÂÂÂÂÂÂ return 0;
+ÂÂÂ else if (ret < 0)
+ÂÂÂÂÂÂÂ return ret;
+
+ÂÂÂ iommu->num_clocks = ret;
+ÂÂÂ iommu->clocks = devm_kcalloc(iommu->dev, iommu->num_clocks,
+ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ sizeof(*iommu->clocks), GFP_KERNEL);
+ÂÂÂ if (!iommu->clocks)
+ÂÂÂÂÂÂÂ return -ENOMEM;
+
+ÂÂÂ for (i = 0; i < iommu->num_clocks; ++i) {
+ÂÂÂÂÂÂÂ iommu->clocks[i].clk = of_clk_get(np, i);
+ÂÂÂÂÂÂÂ if (IS_ERR(iommu->clocks[i].clk)) {
+ÂÂÂÂÂÂÂÂÂÂÂ ret = PTR_ERR(iommu->clocks[i].clk);
+ÂÂÂÂÂÂÂÂÂÂÂ goto err_clk_put;
+ÂÂÂÂÂÂÂ }
+ÂÂÂ }
Just to confirm my understanding from a quick scan through the code, the reason we can't use clk_bulk_get() here is that currently, clocks[i].id being NULL means we'd end up just getting the first clock multiple times, right?
I guess there could be other users who also want "just get whatever clocks I have" functionality, so it might be worth proposing that for the core API as a separate/follow-up patch, but it definitely doesn't need to be part of this series.
[snip]
I really don't know enough about correct clk API usage, but modulo the binding comments it certainly looks nice and tidy now;
Acked-by: Robin Murphy <robin.murphy@xxxxxxx>
Thanks,
Robin.
_______________________________________________
iommu mailing list
iommu@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/iommu