Hi Dafna,
Am Donnerstag, 29. Juli 2021, 17:59:26 CEST schrieb Dafna Hirschfeld:
> On 25.05.21 14:15, Benjamin Gaignard wrote:
> > @@ -879,7 +895,7 @@ static int rk_iommu_enable(struct rk_iommu *iommu)
> >
> > for (i = 0; i < iommu->num_mmu; i++) {
> > rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR,
> > - rk_domain->dt_dma);
> > + rk_ops->dma_addr_dte(rk_domain->dt_dma));
>
> Hi,
> This is not related to that patch, I was wondring why are all mmu devices initialized
> with the same dt_dma?
> I see for example that the isp0_mmu in rk3399.dtsi has two resources. Can't each resource
> be initialized with different dt_dma and this way there are two dt tables instead of the two mmus pointing
> to the same dt table.
maybe
git log -1 cd6438c5f8446691afa4829fe1a9d7b656204f11
"iommu/rockchip: Reconstruct to support multi slaves
There are some IPs, such as video encoder/decoder, contains 2 slave iommus,
one for reading and the other for writing. They share the same irq and
clock with master.
This patch reconstructs to support this case by making them share the same
Page Directory, Page Tables and even the register operations.
That means every instruction to the reading MMU registers would be
duplicated to the writing MMU and vice versa."
Heiko
>
> Thanks,
> Dafna
>
> > rk_iommu_base_command(iommu->bases[i], RK_MMU_CMD_ZAP_CACHE);
> > rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK);
> > }
> > @@ -1037,7 +1053,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)
> > for (i = 0; i < NUM_DT_ENTRIES; i++) {
> > u32 dte = rk_domain->dt[i];
> > if (rk_dte_is_pt_valid(dte)) {
> > - phys_addr_t pt_phys = rk_dte_pt_address(dte);
> > + phys_addr_t pt_phys = rk_ops->pt_address(dte);
> > u32 *page_table = phys_to_virt(pt_phys);
> > dma_unmap_single(dma_dev, pt_phys,
> > SPAGE_SIZE, DMA_TO_DEVICE);
> > @@ -1127,6 +1143,7 @@ static int rk_iommu_probe(struct platform_device *pdev)
> > struct device *dev = &pdev->dev;
> > struct rk_iommu *iommu;
> > struct resource *res;
> > + const struct rk_iommu_ops *ops;
> > int num_res = pdev->num_resources;
> > int err, i;
> >
> > @@ -1138,6 +1155,17 @@ static int rk_iommu_probe(struct platform_device *pdev)
> > iommu->dev = dev;
> > iommu->num_mmu = 0;
> >
> > + ops = of_device_get_match_data(dev);
> > + if (!rk_ops)
> > + rk_ops = ops;
> > +
> > + /*
> > + * That should not happen unless different versions of the
> > + * hardware block are embedded the same SoC
> > + */
> > + if (WARN_ON(rk_ops != ops))
> > + return -EINVAL;
> > +
> > iommu->bases = devm_kcalloc(dev, num_res, sizeof(*iommu->bases),
> > GFP_KERNEL);
> > if (!iommu->bases)
> > @@ -1226,6 +1254,8 @@ static int rk_iommu_probe(struct platform_device *pdev)
> > }
> > }
> >
> > + dma_set_mask_and_coherent(dev, rk_ops->dma_bit_mask);
> > +
> > return 0;
> > err_remove_sysfs:
> > iommu_device_sysfs_remove(&iommu->iommu);
> > @@ -1277,8 +1307,20 @@ static const struct dev_pm_ops rk_iommu_pm_ops = {
> > pm_runtime_force_resume)
> > };
> >
> > +static struct rk_iommu_ops iommu_data_ops_v1 = {
> > + .pt_address = &rk_dte_pt_address,
> > + .mk_dtentries = &rk_mk_dte,
> > + .mk_ptentries = &rk_mk_pte,
> > + .dte_addr_phys = &rk_dte_addr_phys,
> > + .dma_addr_dte = &rk_dma_addr_dte,
> > + .dma_bit_mask = DMA_BIT_MASK(32),
> > +};
> > +
> > +
> > static const struct of_device_id rk_iommu_dt_ids[] = {
> > - { .compatible = "rockchip,iommu" },
> > + { .compatible = "rockchip,iommu",
> > + .data = &iommu_data_ops_v1,
> > + },
> > { /* sentinel */ }
> > };
> >
> >
>
