From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5781C433E1 for ; Wed, 22 Jul 2020 09:39:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 92AFE2065F for ; Wed, 22 Jul 2020 09:39:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LSJMpVaI"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="NjCDJqZS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 92AFE2065F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=v0pwW1QHw8yh755yT0k6EYIfdxOUXA51MSrNRqbGxzk=; b=LSJMpVaIlGJwXMQ02X3LIz7Zq FFdLOveGNJHO77xFgEsBli973Fe0JIzz0xGE/zBx91qf2mb2sfl5GaWNXzptGH6+2pAH9bIFP2ujL GptqHmYp7RZURcOwfO3j7zRAOdsn6kHn4TICsbEoIrIwE/ZF/uPPoPxe2m+iY/PU/RDrSDB+wq7Wl im1GRPkgoVL71RQJeXXjen+n2tUp1QVzEOoB0yQpYE0ekwGh4jK4EOZvlXM2c9eoWV5zkPez+LSi8 hrGBzY6R650BBieuZmRx57kQWelsGE5xpuBMjs59d6AtJv74Qmw+uvPoNiNiml3Gcacm4ddrGKYHP tq7apxc3w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyBBr-0003Xi-5u; Wed, 22 Jul 2020 09:37:31 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jyBBn-0003WW-5J; Wed, 22 Jul 2020 09:37:28 +0000 X-UUID: b8c56ba6a6f6413b966e74af3e0aa664-20200722 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=FbUlnD+6PGhMZQV7tfhB8H9xa+hG0Mjtj1brBRLF1eY=; b=NjCDJqZSzVquYPFYJwusCyl/Vop979U6xQSBzPzcZwY8yH2c+KowPJAc7jw/6zgmYvqola2IawEkb4pSxDkUiKZt+vQs4ITmdsEUJSiyMWfsteRHOuCRH1WMMTFYpOLxBlxgHBCia9QVM0JHib40F9LYPZXI3mH6pyCF/6TwDgQ=; X-UUID: b8c56ba6a6f6413b966e74af3e0aa664-20200722 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 472641935; Wed, 22 Jul 2020 01:37:19 -0800 Received: from MTKMBS01N2.mediatek.inc (172.21.101.79) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 22 Jul 2020 02:37:20 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 22 Jul 2020 17:37:16 +0800 Received: from [172.21.77.33] (172.21.77.33) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 22 Jul 2020 17:37:17 +0800 Message-ID: <1595410637.10848.7.camel@mtkswgap22> Subject: Re: [PATCH v2] iommu/mediatek: check 4GB mode by reading infracfg From: Miles Chen To: Matthias Brugger Date: Wed, 22 Jul 2020 17:37:17 +0800 In-Reply-To: <1595402238.10848.3.camel@mtkswgap22> References: <20200721021619.25575-1-miles.chen@mediatek.com> <1595330677.16172.55.camel@mhfsdcap03> <28bf052f-e388-d300-4abe-38f17bff01b6@gmail.com> <1595402238.10848.3.camel@mtkswgap22> X-Mailer: Evolution 3.2.3-0ubuntu6 MIME-Version: 1.0 X-TM-SNTS-SMTP: C22B2906B1149C311E4910FDDED4D5CC64A63EC1BAEA8344B0C812F5ABAEB5352000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200722_053727_418549_02374A63 X-CRM114-Status: GOOD ( 33.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , wsd_upstream@mediatek.com, David Hildenbrand , Joerg Roedel , linux-kernel@vger.kernel.org, Mike Rapoport , Chao Hao , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Yong Wu , Yingjoe Chen , Christoph Hellwig , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 2020-07-22 at 15:17 +0800, Miles Chen wrote: > On Tue, 2020-07-21 at 23:19 +0200, Matthias Brugger wrote: > > > > On 21/07/2020 13:24, Yong Wu wrote: > > > On Tue, 2020-07-21 at 11:40 +0200, Matthias Brugger wrote: > > >> > > >> On 21/07/2020 04:16, Miles Chen wrote: > > >>> In previous discussion [1] and [2], we found that it is risky to > > >>> use max_pfn or totalram_pages to tell if 4GB mode is enabled. > > >>> > > >>> Check 4GB mode by reading infracfg register, remove the usage > > >>> of the un-exported symbol max_pfn. > > >>> > > >>> This is a step towards building mtk_iommu as a kernel module. > > >>> > > >>> Change since v1: > > >>> 1. remove the phandle usage, search for infracfg instead [3] > > >>> 2. use infracfg instead of infracfg_regmap > > >>> 3. move infracfg definitaions to linux/soc/mediatek/infracfg.h > > >>> 4. update enable_4GB only when has_4gb_mode > > >>> > > >>> [1] https://urldefense.com/v3/__https://lkml.org/lkml/2020/6/3/733__;!!CTRNKA9wMg0ARbw!w5YjY83YRL9_ijgXHwB1x2Dnb5BqiFUI8H5IAyAWWFMvUJKI9Qbj_zta2AaiFZejiQ$ > > >>> [2] https://urldefense.com/v3/__https://lkml.org/lkml/2020/6/4/136__;!!CTRNKA9wMg0ARbw!w5YjY83YRL9_ijgXHwB1x2Dnb5BqiFUI8H5IAyAWWFMvUJKI9Qbj_zta2Aa9U2yQyg$ > > >>> [3] https://urldefense.com/v3/__https://lkml.org/lkml/2020/7/15/1147__;!!CTRNKA9wMg0ARbw!w5YjY83YRL9_ijgXHwB1x2Dnb5BqiFUI8H5IAyAWWFMvUJKI9Qbj_zta2Aaxpk_Wjw$ > > >>> > > >>> Cc: Mike Rapoport > > >>> Cc: David Hildenbrand > > >>> Cc: Yong Wu > > >>> Cc: Yingjoe Chen > > >>> Cc: Christoph Hellwig > > >>> Cc: Yong Wu > > >>> Cc: Chao Hao > > >>> Cc: Rob Herring > > >>> Cc: Matthias Brugger > > >>> Signed-off-by: Miles Chen > > >>> --- > > >>> drivers/iommu/mtk_iommu.c | 26 +++++++++++++++++++++----- > > >>> include/linux/soc/mediatek/infracfg.h | 3 +++ > > >>> 2 files changed, 24 insertions(+), 5 deletions(-) > > >>> > > >>> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > >>> index 2be96f1cdbd2..16765f532853 100644 > > >>> --- a/drivers/iommu/mtk_iommu.c > > >>> +++ b/drivers/iommu/mtk_iommu.c > > >>> @@ -3,7 +3,6 @@ > > >>> * Copyright (c) 2015-2016 MediaTek Inc. > > >>> * Author: Yong Wu > > >>> */ > > >>> -#include > > >>> #include > > >>> #include > > >>> #include > > >>> @@ -15,13 +14,16 @@ > > >>> #include > > >>> #include > > >>> #include > > >>> +#include > > >>> #include > > >>> #include > > >>> #include > > >>> #include > > >>> #include > > >>> +#include > > >>> #include > > >>> #include > > >>> +#include > > >>> #include > > >>> #include > > >>> > > >>> @@ -599,8 +601,10 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > >>> struct resource *res; > > >>> resource_size_t ioaddr; > > >>> struct component_match *match = NULL; > > >>> + struct regmap *infracfg; > > >>> void *protect; > > >>> int i, larb_nr, ret; > > >>> + u32 val; > > >>> > > >>> data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > > >>> if (!data) > > >>> @@ -614,10 +618,22 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > >>> return -ENOMEM; > > >>> data->protect_base = ALIGN(virt_to_phys(protect), MTK_PROTECT_PA_ALIGN); > > >>> > > >>> - /* Whether the current dram is over 4GB */ > > >>> - data->enable_4GB = !!(max_pfn > (BIT_ULL(32) >> PAGE_SHIFT)); > > >>> - if (!data->plat_data->has_4gb_mode) > > >>> - data->enable_4GB = false; > > >>> + data->enable_4GB = false; > > >>> + if (data->plat_data->has_4gb_mode) { > > >>> + infracfg = syscon_regmap_lookup_by_compatible( > > >>> + "mediatek,mt8173-infracfg"); > > >>> + if (IS_ERR(infracfg)) { > > >>> + infracfg = syscon_regmap_lookup_by_compatible( > > >>> + "mediatek,mt2712-infracfg"); > > >>> + if (IS_ERR(infracfg)) > > >>> + return PTR_ERR(infracfg); > > >> > > >> I think we should check m4u_plat instead to decide which compatible we have to > > >> look for. > > >> Another option would be to add a general compatible something like > > >> "mtk-infracfg" and search for that. That would need an update of all DTS having > > >> a infracfg compatible right now. After thinking twice, this would break newer > > >> kernel with older device tree, so maybe it's better to go with m4u_plat switch > > >> statement. > > > > > > Add a "char *infracfg" in the plat_data, Use the mt2712, mt8173 > > > corresponding string in it. If it is NULL, It means the "enable_4GB" > > > always is false. Then we also can remove the flag "has_4gb_mode". > > > > > > is this OK? > > > > > > > It's an option, but I personally find that a bit hacky. > > Thanks Yong and Matthias for your comment. > I will try adding a char *infracfg in patch v3. > I misunderstood the comment. I should check m4u_plat to decide which string to look for, not adding a char *infracfg in patch v3. Miles > > > > > Regards, > > Matthias > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel