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=-8.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham 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 499D1C35254 for ; Mon, 17 Feb 2020 11:35:28 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 0F74520836 for ; Mon, 17 Feb 2020 11:35:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="PxgkLckJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F74520836 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA1B485D57; Mon, 17 Feb 2020 11:35:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5V3P+hQu5y8N; Mon, 17 Feb 2020 11:35:27 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 24EB3841DA; Mon, 17 Feb 2020 11:35:27 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 14BC5C08A0; Mon, 17 Feb 2020 11:35:27 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id D9453C013E for ; Mon, 17 Feb 2020 11:35:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C35AB85D57 for ; Mon, 17 Feb 2020 11:35:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iEFqZ6bAKX6Q for ; Mon, 17 Feb 2020 11:35:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by whitealder.osuosl.org (Postfix) with ESMTP id 8EF62841DA for ; Mon, 17 Feb 2020 11:35:23 +0000 (UTC) X-UUID: 3d255e9f271344ebb1ffecef37e7560d-20200217 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=eP5l76kC+wYQ1SgKc3IwEHH0X8lfLQiaEbwRojJdv0w=; b=PxgkLckJECq3POl9lr7b11FiX6J7VBJhpW9lzfhfyaeC8bClzLDomAHJJNbS0AGFXgqS3lT7bRVr/0XoIUCMxYVG6uTnEwRgFURys9PNNNS1h0ZfwzfIKjaNCvsn6+sMuCkpOKLdJdA5NuyTsBr1JQgK52yKnRv5goDgA1i82tY=; X-UUID: 3d255e9f271344ebb1ffecef37e7560d-20200217 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 2131103376; Mon, 17 Feb 2020 19:35:20 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 19:34:24 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 17 Feb 2020 19:35:55 +0800 Message-ID: <1581939298.4784.12.camel@mhfsdcap03> Subject: Re: [PATCH 2/2] iommu/mediatek: add support for MT8167 From: Yong Wu To: Fabien Parent Date: Mon, 17 Feb 2020 19:34:58 +0800 In-Reply-To: <1581902146.28283.0.camel@mtksdaap41> References: <20200103162632.109553-1-fparent@baylibre.com> <20200103162632.109553-2-fparent@baylibre.com> <1581902146.28283.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, CK Hu , iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi Fabien, Thanks very much for your patch. On Mon, 2020-02-17 at 09:15 +0800, CK Hu wrote: > +Yong.Wu. > > On Fri, 2020-01-03 at 17:26 +0100, Fabien Parent wrote: > > Add support for the IOMMU on MT8167 > > > > Signed-off-by: Fabien Parent > > --- > > drivers/iommu/mtk_iommu.c | 11 ++++++++++- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 6fc1f5ecf91e..5fc6178a82dc 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -569,7 +569,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > F_INT_PRETETCH_TRANSATION_FIFO_FAULT; > > writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL); > > > > - if (data->plat_data->m4u_plat == M4U_MT8173) > > + if (data->plat_data->m4u_plat == M4U_MT8173 || > > + data->plat_data->m4u_plat == M4U_MT8167) I didn't know mt8167 will do upstream. In my original thought, there is only mt8173 use this setting and the later SoC won't use this, So I used the "m4u_plat" directly here. If we also need support mt8167, then CK's suggestion is reasonable. we could add a new variable like "legacy_ivrp_paddr" from its register name in a seperated patch, then support mt8167 in a new patch. > > regval = (data->protect_base >> 1) | (data->enable_4GB << 31); > > else > > regval = lower_32_bits(data->protect_base) | > > @@ -782,6 +783,13 @@ static const struct mtk_iommu_plat_data mt2712_data = { > > .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > > }; > > > > +static const struct mtk_iommu_plat_data mt8167_data = { > > + .m4u_plat = M4U_MT8167, > > + .has_4gb_mode = true, > > + .reset_axi = true, > > + .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > > +}; > > + > > static const struct mtk_iommu_plat_data mt8173_data = { > > .m4u_plat = M4U_MT8173, > > .has_4gb_mode = true, > > @@ -798,6 +806,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > > > > static const struct of_device_id mtk_iommu_of_ids[] = { > > { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > > + { .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data}, > > { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > > { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > > {} > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index ea949a324e33..cb8fd5970cd4 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -30,6 +30,7 @@ struct mtk_iommu_suspend_reg { > > enum mtk_iommu_plat { > > M4U_MT2701, > > M4U_MT2712, > > + M4U_MT8167, > > M4U_MT8173, > > M4U_MT8183, > > }; > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-8.2 required=3.0 tests=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,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 A0712C761A3 for ; Mon, 17 Feb 2020 11:35:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 76DE420836 for ; Mon, 17 Feb 2020 11:35:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Inbiz4fe"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="PxgkLckJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76DE420836 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-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=TWE5SB3NzXyvD2wt8kah6TzRoPurXYKr1epKKfRhyN4=; b=Inbiz4feJE4Q3J A+el2G1gERHxz6X/63rlF/7A7H2NEmA5Cpy7C5VYM39PkefMYm+c7RB1Wa7HclBagMTqRuP+lBMUO S6dxosgK+91na+5kW+HfdxYZD2dZi5oyvf6jEocI2WKI8EN4t2Q3mC3MXTls1auTE6u2EJYAtIyia hfFA+bNAhvZ5nufo8XaC8BTUHOSZU8LFKcLOMnLz1W52yCkObWchudlOZTtnHuFrbg1S80A9BWs19 EppsC+7G+zCk9nJoMyVqYIaHJurTVH6NUmrTVvZQeYa7H/XHfk4ljI7DHmRUuYllGD03e3hXXXU23 8u15kVfBH3Ik1yc4Vm+w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3egV-0001HD-Sg; Mon, 17 Feb 2020 11:35:31 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3egT-0001GF-K3; Mon, 17 Feb 2020 11:35:30 +0000 X-UUID: e0ccc3be668542ce884c3f9c48a572b1-20200217 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=eP5l76kC+wYQ1SgKc3IwEHH0X8lfLQiaEbwRojJdv0w=; b=PxgkLckJECq3POl9lr7b11FiX6J7VBJhpW9lzfhfyaeC8bClzLDomAHJJNbS0AGFXgqS3lT7bRVr/0XoIUCMxYVG6uTnEwRgFURys9PNNNS1h0ZfwzfIKjaNCvsn6+sMuCkpOKLdJdA5NuyTsBr1JQgK52yKnRv5goDgA1i82tY=; X-UUID: e0ccc3be668542ce884c3f9c48a572b1-20200217 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 561370588; Mon, 17 Feb 2020 03:35:22 -0800 Received: from mtkmbs05n1.mediatek.inc (172.21.101.15) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 03:35:41 -0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 19:34:24 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 17 Feb 2020 19:35:55 +0800 Message-ID: <1581939298.4784.12.camel@mhfsdcap03> Subject: Re: [PATCH 2/2] iommu/mediatek: add support for MT8167 From: Yong Wu To: Fabien Parent Date: Mon, 17 Feb 2020 19:34:58 +0800 In-Reply-To: <1581902146.28283.0.camel@mtksdaap41> References: <20200103162632.109553-1-fparent@baylibre.com> <20200103162632.109553-2-fparent@baylibre.com> <1581902146.28283.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200217_033529_664293_A21BA71A X-CRM114-Status: GOOD ( 17.92 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, joro@8bytes.org, linux-kernel@vger.kernel.org, CK Hu , iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Fabien, Thanks very much for your patch. On Mon, 2020-02-17 at 09:15 +0800, CK Hu wrote: > +Yong.Wu. > > On Fri, 2020-01-03 at 17:26 +0100, Fabien Parent wrote: > > Add support for the IOMMU on MT8167 > > > > Signed-off-by: Fabien Parent > > --- > > drivers/iommu/mtk_iommu.c | 11 ++++++++++- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 6fc1f5ecf91e..5fc6178a82dc 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -569,7 +569,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > F_INT_PRETETCH_TRANSATION_FIFO_FAULT; > > writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL); > > > > - if (data->plat_data->m4u_plat == M4U_MT8173) > > + if (data->plat_data->m4u_plat == M4U_MT8173 || > > + data->plat_data->m4u_plat == M4U_MT8167) I didn't know mt8167 will do upstream. In my original thought, there is only mt8173 use this setting and the later SoC won't use this, So I used the "m4u_plat" directly here. If we also need support mt8167, then CK's suggestion is reasonable. we could add a new variable like "legacy_ivrp_paddr" from its register name in a seperated patch, then support mt8167 in a new patch. > > regval = (data->protect_base >> 1) | (data->enable_4GB << 31); > > else > > regval = lower_32_bits(data->protect_base) | > > @@ -782,6 +783,13 @@ static const struct mtk_iommu_plat_data mt2712_data = { > > .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > > }; > > > > +static const struct mtk_iommu_plat_data mt8167_data = { > > + .m4u_plat = M4U_MT8167, > > + .has_4gb_mode = true, > > + .reset_axi = true, > > + .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > > +}; > > + > > static const struct mtk_iommu_plat_data mt8173_data = { > > .m4u_plat = M4U_MT8173, > > .has_4gb_mode = true, > > @@ -798,6 +806,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > > > > static const struct of_device_id mtk_iommu_of_ids[] = { > > { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > > + { .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data}, > > { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > > { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > > {} > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index ea949a324e33..cb8fd5970cd4 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -30,6 +30,7 @@ struct mtk_iommu_suspend_reg { > > enum mtk_iommu_plat { > > M4U_MT2701, > > M4U_MT2712, > > + M4U_MT8167, > > M4U_MT8173, > > M4U_MT8183, > > }; > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-8.2 required=3.0 tests=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,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 2292FC7619F for ; Mon, 17 Feb 2020 11:35:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E923B20836 for ; Mon, 17 Feb 2020 11:35:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lfFN+EKG"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="PxgkLckJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E923B20836 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+infradead-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=bombadil.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=5uGj1oLpoK/M7dWp0ymmUrUXO8q46b2Cybv52N5yj5Y=; b=lfFN+EKGpKusuA yHE7tt3FlQwSayw1ZAiodckZXOigUzIggt2RQxrSRz8y8UnLVlayxUnuOtGhOnOqpTiltyhMrwWu7 sYUepyRjznTJlfafMcoGFjyGpATOkiiqv0GqitVaVJRGQ5L01rJNjjDBZzzA3idv8EA0ULOC2C0Tu /LEzcvLVPJpxKTo9tJ5SLmEx6rGfatGP9K+fT+S0y6LbEH7Nu5FrxVShtxZtodQ5t2KmeWSNV4oIs mWg7tSvTDqcyb0Vvq1GzuEX4cDQj7PAWJ6etOQ4VAZUnCcEYnhpP0QAl3Ezff3WiQQ4/VDZVQJJuR nhrNueUa9TxiLvPtBJzA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3egW-0001I9-Se; Mon, 17 Feb 2020 11:35:32 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j3egT-0001GF-K3; Mon, 17 Feb 2020 11:35:30 +0000 X-UUID: e0ccc3be668542ce884c3f9c48a572b1-20200217 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=eP5l76kC+wYQ1SgKc3IwEHH0X8lfLQiaEbwRojJdv0w=; b=PxgkLckJECq3POl9lr7b11FiX6J7VBJhpW9lzfhfyaeC8bClzLDomAHJJNbS0AGFXgqS3lT7bRVr/0XoIUCMxYVG6uTnEwRgFURys9PNNNS1h0ZfwzfIKjaNCvsn6+sMuCkpOKLdJdA5NuyTsBr1JQgK52yKnRv5goDgA1i82tY=; X-UUID: e0ccc3be668542ce884c3f9c48a572b1-20200217 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 561370588; Mon, 17 Feb 2020 03:35:22 -0800 Received: from mtkmbs05n1.mediatek.inc (172.21.101.15) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 03:35:41 -0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 19:34:24 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 17 Feb 2020 19:35:55 +0800 Message-ID: <1581939298.4784.12.camel@mhfsdcap03> Subject: Re: [PATCH 2/2] iommu/mediatek: add support for MT8167 From: Yong Wu To: Fabien Parent Date: Mon, 17 Feb 2020 19:34:58 +0800 In-Reply-To: <1581902146.28283.0.camel@mtksdaap41> References: <20200103162632.109553-1-fparent@baylibre.com> <20200103162632.109553-2-fparent@baylibre.com> <1581902146.28283.0.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200217_033529_664293_A21BA71A X-CRM114-Status: GOOD ( 17.92 ) 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: mark.rutland@arm.com, devicetree@vger.kernel.org, joro@8bytes.org, linux-kernel@vger.kernel.org, CK Hu , iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-mediatek@lists.infradead.org, matthias.bgg@gmail.com, 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Fabien, Thanks very much for your patch. On Mon, 2020-02-17 at 09:15 +0800, CK Hu wrote: > +Yong.Wu. > > On Fri, 2020-01-03 at 17:26 +0100, Fabien Parent wrote: > > Add support for the IOMMU on MT8167 > > > > Signed-off-by: Fabien Parent > > --- > > drivers/iommu/mtk_iommu.c | 11 ++++++++++- > > drivers/iommu/mtk_iommu.h | 1 + > > 2 files changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 6fc1f5ecf91e..5fc6178a82dc 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -569,7 +569,8 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data) > > F_INT_PRETETCH_TRANSATION_FIFO_FAULT; > > writel_relaxed(regval, data->base + REG_MMU_INT_MAIN_CONTROL); > > > > - if (data->plat_data->m4u_plat == M4U_MT8173) > > + if (data->plat_data->m4u_plat == M4U_MT8173 || > > + data->plat_data->m4u_plat == M4U_MT8167) I didn't know mt8167 will do upstream. In my original thought, there is only mt8173 use this setting and the later SoC won't use this, So I used the "m4u_plat" directly here. If we also need support mt8167, then CK's suggestion is reasonable. we could add a new variable like "legacy_ivrp_paddr" from its register name in a seperated patch, then support mt8167 in a new patch. > > regval = (data->protect_base >> 1) | (data->enable_4GB << 31); > > else > > regval = lower_32_bits(data->protect_base) | > > @@ -782,6 +783,13 @@ static const struct mtk_iommu_plat_data mt2712_data = { > > .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > > }; > > > > +static const struct mtk_iommu_plat_data mt8167_data = { > > + .m4u_plat = M4U_MT8167, > > + .has_4gb_mode = true, > > + .reset_axi = true, > > + .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > > +}; > > + > > static const struct mtk_iommu_plat_data mt8173_data = { > > .m4u_plat = M4U_MT8173, > > .has_4gb_mode = true, > > @@ -798,6 +806,7 @@ static const struct mtk_iommu_plat_data mt8183_data = { > > > > static const struct of_device_id mtk_iommu_of_ids[] = { > > { .compatible = "mediatek,mt2712-m4u", .data = &mt2712_data}, > > + { .compatible = "mediatek,mt8167-m4u", .data = &mt8167_data}, > > { .compatible = "mediatek,mt8173-m4u", .data = &mt8173_data}, > > { .compatible = "mediatek,mt8183-m4u", .data = &mt8183_data}, > > {} > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index ea949a324e33..cb8fd5970cd4 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -30,6 +30,7 @@ struct mtk_iommu_suspend_reg { > > enum mtk_iommu_plat { > > M4U_MT2701, > > M4U_MT2712, > > + M4U_MT8167, > > M4U_MT8173, > > M4U_MT8183, > > }; > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham 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 4B423C35254 for ; Mon, 17 Feb 2020 11:35:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 206DE20836 for ; Mon, 17 Feb 2020 11:35:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="PxgkLckJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728421AbgBQLfZ (ORCPT ); Mon, 17 Feb 2020 06:35:25 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:29078 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1728312AbgBQLfZ (ORCPT ); Mon, 17 Feb 2020 06:35:25 -0500 X-UUID: 3d255e9f271344ebb1ffecef37e7560d-20200217 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=eP5l76kC+wYQ1SgKc3IwEHH0X8lfLQiaEbwRojJdv0w=; b=PxgkLckJECq3POl9lr7b11FiX6J7VBJhpW9lzfhfyaeC8bClzLDomAHJJNbS0AGFXgqS3lT7bRVr/0XoIUCMxYVG6uTnEwRgFURys9PNNNS1h0ZfwzfIKjaNCvsn6+sMuCkpOKLdJdA5NuyTsBr1JQgK52yKnRv5goDgA1i82tY=; X-UUID: 3d255e9f271344ebb1ffecef37e7560d-20200217 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 2131103376; Mon, 17 Feb 2020 19:35:20 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by mtkmbs05n1.mediatek.inc (172.21.101.15) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 17 Feb 2020 19:34:24 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 17 Feb 2020 19:35:55 +0800 Message-ID: <1581939298.4784.12.camel@mhfsdcap03> Subject: Re: [PATCH 2/2] iommu/mediatek: add support for MT8167 From: Yong Wu To: Fabien Parent CC: , , , , , , , , , CK Hu Date: Mon, 17 Feb 2020 19:34:58 +0800 In-Reply-To: <1581902146.28283.0.camel@mtksdaap41> References: <20200103162632.109553-1-fparent@baylibre.com> <20200103162632.109553-2-fparent@baylibre.com> <1581902146.28283.0.camel@mtksdaap41> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N Content-Transfer-Encoding: base64 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org SGkgRmFiaWVuLA0KDQpUaGFua3MgdmVyeSBtdWNoIGZvciB5b3VyIHBhdGNoLg0KDQpPbiBNb24s IDIwMjAtMDItMTcgYXQgMDk6MTUgKzA4MDAsIENLIEh1IHdyb3RlOg0KPiArWW9uZy5XdS4NCj4g DQo+IE9uIEZyaSwgMjAyMC0wMS0wMyBhdCAxNzoyNiArMDEwMCwgRmFiaWVuIFBhcmVudCB3cm90 ZToNCj4gPiBBZGQgc3VwcG9ydCBmb3IgdGhlIElPTU1VIG9uIE1UODE2Nw0KPiA+IA0KPiA+IFNp Z25lZC1vZmYtYnk6IEZhYmllbiBQYXJlbnQgPGZwYXJlbnRAYmF5bGlicmUuY29tPg0KPiA+IC0t LQ0KPiA+ICBkcml2ZXJzL2lvbW11L210a19pb21tdS5jIHwgMTEgKysrKysrKysrKy0NCj4gPiAg ZHJpdmVycy9pb21tdS9tdGtfaW9tbXUuaCB8ICAxICsNCj4gPiAgMiBmaWxlcyBjaGFuZ2VkLCAx MSBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pDQo+ID4gDQo+ID4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvaW9tbXUvbXRrX2lvbW11LmMgYi9kcml2ZXJzL2lvbW11L210a19pb21tdS5jDQo+ID4g aW5kZXggNmZjMWY1ZWNmOTFlLi41ZmM2MTc4YTgyZGMgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVy cy9pb21tdS9tdGtfaW9tbXUuYw0KPiA+ICsrKyBiL2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmMN Cj4gPiBAQCAtNTY5LDcgKzU2OSw4IEBAIHN0YXRpYyBpbnQgbXRrX2lvbW11X2h3X2luaXQoY29u c3Qgc3RydWN0IG10a19pb21tdV9kYXRhICpkYXRhKQ0KPiA+ICAJCUZfSU5UX1BSRVRFVENIX1RS QU5TQVRJT05fRklGT19GQVVMVDsNCj4gPiAgCXdyaXRlbF9yZWxheGVkKHJlZ3ZhbCwgZGF0YS0+ YmFzZSArIFJFR19NTVVfSU5UX01BSU5fQ09OVFJPTCk7DQo+ID4gIA0KPiA+IC0JaWYgKGRhdGEt PnBsYXRfZGF0YS0+bTR1X3BsYXQgPT0gTTRVX01UODE3MykNCj4gPiArCWlmIChkYXRhLT5wbGF0 X2RhdGEtPm00dV9wbGF0ID09IE00VV9NVDgxNzMgfHwNCj4gPiArCSAgICBkYXRhLT5wbGF0X2Rh dGEtPm00dV9wbGF0ID09IE00VV9NVDgxNjcpDQoNCkkgZGlkbid0IGtub3cgbXQ4MTY3IHdpbGwg ZG8gdXBzdHJlYW0uIEluIG15IG9yaWdpbmFsIHRob3VnaHQsIHRoZXJlIGlzDQpvbmx5IG10ODE3 MyB1c2UgdGhpcyBzZXR0aW5nIGFuZCB0aGUgbGF0ZXIgU29DIHdvbid0IHVzZSB0aGlzLCBTbyBJ IHVzZWQNCnRoZSAibTR1X3BsYXQiIGRpcmVjdGx5IGhlcmUuDQoNCklmIHdlIGFsc28gbmVlZCBz dXBwb3J0IG10ODE2NywgdGhlbiBDSydzIHN1Z2dlc3Rpb24gaXMgcmVhc29uYWJsZS4gd2UNCmNv dWxkIGFkZCBhIG5ldyB2YXJpYWJsZSBsaWtlICJsZWdhY3lfaXZycF9wYWRkciIgZnJvbSBpdHMg cmVnaXN0ZXIgbmFtZQ0KaW4gYSBzZXBlcmF0ZWQgcGF0Y2gsIHRoZW4gc3VwcG9ydCBtdDgxNjcg aW4gYSBuZXcgcGF0Y2guDQoNCj4gPiAgCQlyZWd2YWwgPSAoZGF0YS0+cHJvdGVjdF9iYXNlID4+ IDEpIHwgKGRhdGEtPmVuYWJsZV80R0IgPDwgMzEpOw0KPiA+ICAJZWxzZQ0KPiA+ICAJCXJlZ3Zh bCA9IGxvd2VyXzMyX2JpdHMoZGF0YS0+cHJvdGVjdF9iYXNlKSB8DQo+ID4gQEAgLTc4Miw2ICs3 ODMsMTMgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBtdGtfaW9tbXVfcGxhdF9kYXRhIG10MjcxMl9k YXRhID0gew0KPiA+ICAJLmxhcmJpZF9yZW1hcCA9IHswLCAxLCAyLCAzLCA0LCA1LCA2LCA3LCA4 LCA5fSwNCj4gPiAgfTsNCj4gPiAgDQo+ID4gK3N0YXRpYyBjb25zdCBzdHJ1Y3QgbXRrX2lvbW11 X3BsYXRfZGF0YSBtdDgxNjdfZGF0YSA9IHsNCj4gPiArCS5tNHVfcGxhdCAgICAgPSBNNFVfTVQ4 MTY3LA0KPiA+ICsJLmhhc180Z2JfbW9kZSA9IHRydWUsDQo+ID4gKwkucmVzZXRfYXhpICAgID0g dHJ1ZSwNCj4gPiArCS5sYXJiaWRfcmVtYXAgPSB7MCwgMSwgMiwgMywgNCwgNX0sIC8qIExpbmVh ciBtYXBwaW5nLiAqLw0KPiA+ICt9Ow0KPiA+ICsNCj4gPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBt dGtfaW9tbXVfcGxhdF9kYXRhIG10ODE3M19kYXRhID0gew0KPiA+ICAJLm00dV9wbGF0ICAgICA9 IE00VV9NVDgxNzMsDQo+ID4gIAkuaGFzXzRnYl9tb2RlID0gdHJ1ZSwNCj4gPiBAQCAtNzk4LDYg KzgwNiw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgbXRrX2lvbW11X3BsYXRfZGF0YSBtdDgxODNf ZGF0YSA9IHsNCj4gPiAgDQo+ID4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG10 a19pb21tdV9vZl9pZHNbXSA9IHsNCj4gPiAgCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQy NzEyLW00dSIsIC5kYXRhID0gJm10MjcxMl9kYXRhfSwNCj4gPiArCXsgLmNvbXBhdGlibGUgPSAi bWVkaWF0ZWssbXQ4MTY3LW00dSIsIC5kYXRhID0gJm10ODE2N19kYXRhfSwNCj4gPiAgCXsgLmNv bXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4MTczLW00dSIsIC5kYXRhID0gJm10ODE3M19kYXRhfSwN Cj4gPiAgCXsgLmNvbXBhdGlibGUgPSAibWVkaWF0ZWssbXQ4MTgzLW00dSIsIC5kYXRhID0gJm10 ODE4M19kYXRhfSwNCj4gPiAgCXt9DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvbXRr X2lvbW11LmggYi9kcml2ZXJzL2lvbW11L210a19pb21tdS5oDQo+ID4gaW5kZXggZWE5NDlhMzI0 ZTMzLi5jYjhmZDU5NzBjZDQgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9pb21tdS9tdGtfaW9t bXUuaA0KPiA+ICsrKyBiL2RyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmgNCj4gPiBAQCAtMzAsNiAr MzAsNyBAQCBzdHJ1Y3QgbXRrX2lvbW11X3N1c3BlbmRfcmVnIHsNCj4gPiAgZW51bSBtdGtfaW9t bXVfcGxhdCB7DQo+ID4gIAlNNFVfTVQyNzAxLA0KPiA+ICAJTTRVX01UMjcxMiwNCj4gPiArCU00 VV9NVDgxNjcsDQo+ID4gIAlNNFVfTVQ4MTczLA0KPiA+ICAJTTRVX01UODE4MywNCj4gPiAgfTsN Cj4gDQo+IA0KDQo=