2023-03-16 10:15:31

by Yong Wu (吴勇)

[permalink] [raw]
Subject: [PATCH v3] iommu/mediatek: Set dma_mask for PGTABLE_PA_35_EN

When we enable PGTABLE_PA_35_EN, the PA for pgtable may be 35bits.
Thus add dma_mask for it.

Fixes: 301c3ca12576 ("iommu/mediatek: Allow page table PA up to 35bit")
Signed-off-by: Chengci.Xu <[email protected]>
Signed-off-by: Yong Wu <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
---
v3: Sorry for a typo. Change from "if (!ret)" to "if (ret)".

v2: Just move this out from mt8188 series. Nothing change.

v1: https://lore.kernel.org/linux-mediatek/[email protected]/
---
drivers/iommu/mtk_iommu.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
index d5a4955910ff..6a00ce208dc2 100644
--- a/drivers/iommu/mtk_iommu.c
+++ b/drivers/iommu/mtk_iommu.c
@@ -1258,6 +1258,14 @@ static int mtk_iommu_probe(struct platform_device *pdev)
return PTR_ERR(data->bclk);
}

+ if (MTK_IOMMU_HAS_FLAG(data->plat_data, PGTABLE_PA_35_EN)) {
+ ret = dma_set_mask(dev, DMA_BIT_MASK(35));
+ if (ret) {
+ dev_err(dev, "Failed to set dma_mask 35.\n");
+ return ret;
+ }
+ }
+
pm_runtime_enable(dev);

if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {
--
2.25.1



Subject: Re: [PATCH v3] iommu/mediatek: Set dma_mask for PGTABLE_PA_35_EN

Il 16/03/23 11:14, Yong Wu ha scritto:
> When we enable PGTABLE_PA_35_EN, the PA for pgtable may be 35bits.
> Thus add dma_mask for it.
>
> Fixes: 301c3ca12576 ("iommu/mediatek: Allow page table PA up to 35bit")
> Signed-off-by: Chengci.Xu <[email protected]>
> Signed-off-by: Yong Wu <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> ---
> v3: Sorry for a typo. Change from "if (!ret)" to "if (ret)".

I was just about to make you notice. Glad you've fixed that promptly and before
giving me a chance to complain! :-P

Good job!

Cheers,
Angelo

>
> v2: Just move this out from mt8188 series. Nothing change.
>
> v1: https://lore.kernel.org/linux-mediatek/[email protected]/
> ---
> drivers/iommu/mtk_iommu.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
> index d5a4955910ff..6a00ce208dc2 100644
> --- a/drivers/iommu/mtk_iommu.c
> +++ b/drivers/iommu/mtk_iommu.c
> @@ -1258,6 +1258,14 @@ static int mtk_iommu_probe(struct platform_device *pdev)
> return PTR_ERR(data->bclk);
> }
>
> + if (MTK_IOMMU_HAS_FLAG(data->plat_data, PGTABLE_PA_35_EN)) {
> + ret = dma_set_mask(dev, DMA_BIT_MASK(35));
> + if (ret) {
> + dev_err(dev, "Failed to set dma_mask 35.\n");
> + return ret;
> + }
> + }
> +
> pm_runtime_enable(dev);
>
> if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) {