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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,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 34D7AC2D0E4 for ; Fri, 27 Nov 2020 06:33:21 +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 B2170221FD for ; Fri, 27 Nov 2020 06:33:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uVgIFlnJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Ug/+xYEL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2170221FD 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=fW/rUyvuX9tW/ibUhZz5T0P4rlVregE82eXesssfdcY=; b=uVgIFlnJGAJLh/TUfLV2iQ9O4 smqb8OXRwIi5kdXEoyhkwRNvvwDRnINGX+OKgAA6+KoXGup3abJGI/Xn3/bQY0+DfJqIxOGfe9ZEy FfsrTGr567H3Mu2FxfnrnP5xWTd1pyaVrYyft89Sbv1a71SPjD/p3smexOcT1sLlEV9cZIa8uIpMT llgCg8MeQDYRDJq+vT0dwNThUrngv/YqGfWnuXQ2KpzLESkTlVIsec7uHIzzIr/QpUrPnahB7C/sH JPaua6V7MsQ6q96wyjNqcIqTYF9y8/go5qt1bBXBXffHJuTXAgIJHiLl/DV5rIUrUg8PpKXDWYTJ3 e4I/JtOHg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiXIN-0000sv-MO; Fri, 27 Nov 2020 06:31:51 +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 1kiXHu-0000jl-Sh; Fri, 27 Nov 2020 06:31:24 +0000 X-UUID: 247dfd70313c48ffa2f5de0def8cb69b-20201126 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=OMqcICORIcAhhkjnMDt3nLKuOy2OfxolaCABKDolAkc=; b=Ug/+xYELIK6kMlj3IIsEmoYCFqKuOLS6MwmyAURs1j9HDn6ltMCkA2jVyMZgFqEJyoN9g226OXa2a5V+TS02GlUMopl2T4iOOXAeFlEyN5khfsfH91I2DE9ILyUIg9ZpJOEYXhPUWgsF1lrUuJHNfsmbZXQL8pL11yy7fLGvL1s=; X-UUID: 247dfd70313c48ffa2f5de0def8cb69b-20201126 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 921167305; Thu, 26 Nov 2020 22:31:13 -0800 Received: from MTKMBS31N2.mediatek.inc (172.27.4.87) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 26 Nov 2020 22:23:17 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS31N2.mediatek.inc (172.27.4.87) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 27 Nov 2020 14:23:14 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 27 Nov 2020 14:23:13 +0800 Message-ID: <1606458194.26323.193.camel@mhfsdcap03> Subject: Re: [PATCH v4 12/24] iommu/mediatek: Move hw_init into attach_device From: Yong Wu To: Robin Murphy Date: Fri, 27 Nov 2020 14:23:14 +0800 In-Reply-To: <55bb14ef-f674-e55c-0803-43d91093eccb@arm.com> References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-13-yong.wu@mediatek.com> <55bb14ef-f674-e55c-0803-43d91093eccb@arm.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 8E4E74E78C2C0A3F2DB182D6E5EF394369AE6F486379FA945EA54C8360F9A0862000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201127_013123_144112_309F267E X-CRM114-Status: GOOD ( 26.82 ) 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: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , srv_heupstream@mediatek.com, Tomasz Figa , kernel-team@android.com, Joerg Roedel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , Matthias Brugger , anan.sun@mediatek.com, Will Deacon , 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 Thu, 2020-11-26 at 16:43 +0000, Robin Murphy wrote: > On 2020-11-11 12:38, Yong Wu wrote: > > In attach device, it will update the pagetable base address register. > > Move the hw_init function also here. Then it only need call > > pm_runtime_get/put one time here if m4u has power domain. > > Doesn't that mean you'll end up writing most of the registers twice > every time? (first from mtk_iommu_resume(), then again from > mtk_iommu_hw_init()) I have skipped the first resume from mtk_iommu_resume with the code in [15/24]: @@ -828,6 +848,9 @@ static int __maybe_unused mtk_iommu_runtime_resume(struct device *dev) +/* Avoid first resume to affect the default value of registers below.*/ +if (!m4u_dom) + return 0; > It might be neater to have mtk_iommu_hw_init() simply populate the > mtk_iommu_suspend_reg data with the initial values at probe time and > manually call mtk_iommu_resume() if the hardware is already powered up > at that point. Or maybe just don't bother saving those registers on Yes. All the power-domains are enabled in lk when bootup. Actually I have plan to remove the pm_runtime_get in this attach_device in the later patchset. This is for fixing a issue that the screen is turned off when bootup. In android project. we always show boot image. If iommu call pm_runtime_get/put here, the display power-domain will be turned off here given that iommu always probe before display drivers and iommu's power-domain always is display's power-domain. Even I plan to move the device's pm_runtime_enable into this attach_device in the case all the drivers(iommu and display...) build as modules. it is for skipping turn off display's power-domain in genpd_power_off_unused. This is only a plan, I'm not sure if power-domain could fix it like[1]. In this patchset, I'd like to keep current status. [1] https://patchwork.kernel.org/project/linux-clk/patch/20190630150230.7878-3-robdclark@gmail.com/ > suspend and put the initialisation directly in the resume path. > > Robin. > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/mtk_iommu.c | 10 ++++++---- > > 1 file changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 55f9b329e637..cfdf5ce696fd 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -125,6 +125,8 @@ struct mtk_iommu_domain { > > > > static const struct iommu_ops mtk_iommu_ops; > > > > +static int mtk_iommu_hw_init(const struct mtk_iommu_data *data); > > + > > /* > > * In M4U 4GB mode, the physical address is remapped as below: > > * > > @@ -380,12 +382,16 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, > > { > > struct mtk_iommu_data *data = dev_iommu_priv_get(dev); > > struct mtk_iommu_domain *dom = to_mtk_domain(domain); > > + int ret; > > > > if (!data) > > return -ENODEV; > > > > /* Update the pgtable base address register of the M4U HW */ > > if (!data->m4u_dom) { > > + ret = mtk_iommu_hw_init(data); > > + if (ret) > > + return ret; > > data->m4u_dom = dom; > > writel(dom->cfg.arm_v7s_cfg.ttbr & MMU_PT_ADDR_MASK, > > data->base + REG_MMU_PT_BASE_ADDR); > > @@ -729,10 +735,6 @@ static int mtk_iommu_probe(struct platform_device *pdev) > > > > platform_set_drvdata(pdev, data); > > > > - ret = mtk_iommu_hw_init(data); > > - if (ret) > > - return ret; > > - > > ret = iommu_device_sysfs_add(&data->iommu, dev, NULL, > > "mtk-iommu.%pa", &ioaddr); > > if (ret) > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel