| Message ID | 1503560532-24416-1-git-send-email-yong.wu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 24, 2017 at 03:42:11PM +0800, Yong Wu wrote: > The commit ("iommu/mediatek: Enlarge the validate PA range > for 4GB mode") introduce the following build error: > > drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_hw_init': > >> drivers/iommu/mtk_iommu.c:536:30: error: 'const struct mtk_iommu_data' > has no member named 'm4u_type'; did you mean 'm4u_dom'? > if (data->enable_4GB && data->m4u_type != M4U_MT8173) { > > This patch fix it, use "m4u_plat" instead of "m4u_type". > > Reported-by: kernel test robot <lkp@intel.com> > Signed-off-by: Yong Wu <yong.wu@mediatek.com> Applied both, thanks.
diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 4f233e1..bc00e40 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -533,7 +533,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) writel_relaxed(F_MMU_IVRP_PA_SET(data->protect_base, data->enable_4GB), data->base + REG_MMU_IVRP_PADDR); - if (data->enable_4GB && data->m4u_type != M4U_MT8173) { + if (data->enable_4GB && data->m4u_plat != M4U_MT8173) { /* * If 4GB mode is enabled, the validate PA range is from * 0x1_0000_0000 to 0x1_ffff_ffff. here record bit[32:30].
The commit ("iommu/mediatek: Enlarge the validate PA range for 4GB mode") introduce the following build error: drivers/iommu/mtk_iommu.c: In function 'mtk_iommu_hw_init': >> drivers/iommu/mtk_iommu.c:536:30: error: 'const struct mtk_iommu_data' has no member named 'm4u_type'; did you mean 'm4u_dom'? if (data->enable_4GB && data->m4u_type != M4U_MT8173) { This patch fix it, use "m4u_plat" instead of "m4u_type". Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Yong Wu <yong.wu@mediatek.com> --- 1) In the v2 of mt2712 iommu support patch-set, We changed a variant name from "m4u_type" to "m4u_plat", But I'm sorry that I forgot to change it in the later patch. 2) This patch is based on [1]. [1]:https://lists.linuxfoundation.org/pipermail/iommu/2017-August/023847.html 3) I cann't find the commit id of the patch ("iommu/mediatek: Enlarge the validate PA range for 4GB mode") in the [2]. So I don't write the commit id for that patch in the commit message. [2]https://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git next --- drivers/iommu/mtk_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)