linux-kernel - Re: [PATCH] iommu/mediatek: Fix a build fail of m4u

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 26 Aug 2017 21:33:00 +0300
From:   Matthias Brugger <matthias.bgg@...il.com>
To:     Yong Wu <yong.wu@...iatek.com>, Joerg Roedel <joro@...tes.org>
Cc:     Robin Murphy <robin.murphy@....com>,
        Will Deacon <will.deacon@....com>,
        Daniel Kurtz <djkurtz@...gle.com>,
        Tomasz Figa <tfiga@...gle.com>,
        Rob Herring <robh+dt@...nel.org>,
        Catalin Marinas <catalin.marinas@....com>,
        linux-mediatek@...ts.infradead.org, srv_heupstream@...iatek.com,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org,
        iommu@...ts.linux-foundation.org, arnd@...db.de,
        honghui.zhang@...iatek.com
Subject: Re: [PATCH] iommu/mediatek: Fix a build fail of m4u_type



On 08/24/2017 08:24 AM, 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@...el.com>
> Signed-off-by: Yong Wu <yong.wu@...iatek.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

Because the kernel test robot took the patch from the mailinglist. Please fold 
this fix into v3 of the series.

Regards,
Matthias

> ---
>   drivers/iommu/mtk_iommu.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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].
>