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_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=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 EE245C433E0 for ; Tue, 30 Jun 2020 11:00:57 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 BDC152067D for ; Tue, 30 Jun 2020 11:00:57 +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="L21DghCH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDC152067D 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 hemlock.osuosl.org (Postfix) with ESMTP id 9DF62885B6; Tue, 30 Jun 2020 11:00:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XsDLaomPvR3A; Tue, 30 Jun 2020 11:00:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id 27B56885F0; Tue, 30 Jun 2020 11:00:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 121CBC088F; Tue, 30 Jun 2020 11:00:57 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0D06EC016E for ; Tue, 30 Jun 2020 11:00:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 48A4387A68 for ; Tue, 30 Jun 2020 11:00:55 +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 DJrV7wdArEoO for ; Tue, 30 Jun 2020 11:00:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw02.mediatek.com (unknown [1.203.163.81]) by whitealder.osuosl.org (Postfix) with ESMTP id 82A8F87A50 for ; Tue, 30 Jun 2020 11:00:53 +0000 (UTC) X-UUID: d155703b879a48469e70dd2ed73a9869-20200630 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=bwKT46w9uGcCWgvZnA7Tt6P0SET70mbkJOxHElU0i8s=; b=L21DghCHrWldFdaBSXQEGQ15toyjeowj4Fz6tLIXxfOZVWi/ZgOWk3dUAzLmwXcQNIq7cxVGoNhVou11ecJSdwYt8il9snVbilXxT2Y3Bzui3VjK5g1pnnCZ9DKO+oNbtulUvN9Wf54WzvgaHY7bmCGMp6z9BxgSL3TaE92dGlY=; X-UUID: d155703b879a48469e70dd2ed73a9869-20200630 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1915969159; Tue, 30 Jun 2020 18:55:40 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32DR.mediatek.inc (172.27.6.104) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 18:55:34 +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; Tue, 30 Jun 2020 18:55:35 +0800 Message-ID: <1593514516.24171.25.camel@mhfsdcap03> Subject: Re: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault From: Yong Wu To: Chao Hao Date: Tue, 30 Jun 2020 18:55:16 +0800 In-Reply-To: <20200629071310.1557-7-chao.hao@mediatek.com> References: <20200629071310.1557-1-chao.hao@mediatek.com> <20200629071310.1557-7-chao.hao@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: D7FCA91426CFD155D58B85D54AA5A21697363337348731C64131373A298F8F732000:8 X-MTK: N Cc: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Evan Green , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , 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" On Mon, 2020-06-29 at 15:13 +0800, Chao Hao wrote: > The max larb number that a iommu HW support is 8(larb0~larb7 in the below > diagram). > If the larb's number is over 8, we use a sub_common for merging > several larbs into one larb. At this case, we will extend larb_id: > bit[11:9] means common-id; > bit[8:7] means subcommon-id; > From these two variables, we could get the real larb number when > translation fault happen. > The diagram is as below: > EMI > | > IOMMU > | > ----------------- > | | > common1 common0 > | | > ----------------- > | > smi common > | > ------------------------------------ > | | | | | | > 3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8) > | | | | | | > Larb0 Larb1 | Larb3 ... Larb7 > | > smi sub common > | > -------------------------- > | | | | > 2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4) > | | | | > Larb8 Larb9 Larb10 Larb11 > > In this patch we extend larb_remap[] to larb_remap[8][4] for this. > larb_remap[x][y]: x means common-id above, y means subcommon_id above. > > We can also distinguish if the M4U HW has sub_common by HAS_SUB_COMM > macro. > > Cc: Matthias Brugger > Signed-off-by: Chao Hao > Reviewed-by: Yong Wu > --- > drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- > drivers/iommu/mtk_iommu.h | 3 ++- > include/soc/mediatek/smi.h | 2 ++ > 3 files changed, 17 insertions(+), 8 deletions(-) [snip] > @@ -48,7 +49,7 @@ struct mtk_iommu_plat_data { > enum mtk_iommu_plat m4u_plat; > u32 flags; > u32 inv_sel_reg; > - unsigned char larbid_remap[MTK_LARB_NR_MAX]; > + unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; > }; > > struct mtk_iommu_domain; > diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h > index 5a34b87d89e3..fa65a55468e2 100644 > --- a/include/soc/mediatek/smi.h > +++ b/include/soc/mediatek/smi.h > @@ -12,6 +12,8 @@ > #ifdef CONFIG_MTK_SMI > > #define MTK_LARB_NR_MAX 16 > +#define MTK_LARB_COM_MAX 8 > +#define MTK_LARB_SUBCOM_MAX 4 Both are only used in mtk_iommu.h, and I don't think smi has plan to use them. thus we could move them into mtk_iommu.h > > #define MTK_SMI_MMU_EN(port) BIT(port) > _______________________________________________ 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.5 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=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 4A8AEC433E0 for ; Tue, 30 Jun 2020 10:56:02 +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 11A7520780 for ; Tue, 30 Jun 2020 10:56:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u1PFHKjT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="W1MUIfLa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 11A7520780 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=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=z3wduDY9xpY7WfCxjoH5oacPopLHiJZzxKT9ZXy9zDw=; b=u1PFHKjTkfjS0LXur7XbiuZPr LE+8lklB+I4GKnYAsOFlCG62kOyKWm1n3danfjSRe6kIwZVFYHAJYBIa9fnRMuDT+CHf+xhJIe5+8 PnsMdeCW83pKSJjztNVOjRXJl1tjVuI6LkimyAnUaqr7cWasBcFuDayPc/e+A0GLzCX/do341E2Gn mBxWohGzj02g+Os+xo4r7DSaEiEuZ0HvwbHAnwb9rtb5GEMtyvsDeEruG/EONXvye47wrHufWGZFZ oHtImwNH4cKXanmwXO9NcLLsF8ey6LbYxH3RPDa5t2aUdThdrZSLuiqLAo71IsrhUHrZzXw0OSuRF 6Azv6Rj1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDvd-0001zr-JC; Tue, 30 Jun 2020 10:55:53 +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 1jqDvb-0001yz-Dk; Tue, 30 Jun 2020 10:55:52 +0000 X-UUID: 876ed2ea83f642af975784f2b4eabdb8-20200630 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=bwKT46w9uGcCWgvZnA7Tt6P0SET70mbkJOxHElU0i8s=; b=W1MUIfLaM1gJbkVQ7lxcGX2oCQS1LT4kO9HnrjFsM3paV62YTLJ0c2CObuD5+1JCqDAPgJcnctbLPAgvXsw69w1upcROiLRUS4fYBpBjkNYSHcDYz2yITJ1B+iE6+K0rnfdml9TEEdpoU2/cJi3IC1HxdDP8EGJCsJhNIdgLdBo=; X-UUID: 876ed2ea83f642af975784f2b4eabdb8-20200630 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1694588932; Tue, 30 Jun 2020 02:55:40 -0800 Received: from MTKMBS32DR.mediatek.inc (172.27.6.104) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 03:55:41 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32DR.mediatek.inc (172.27.6.104) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 18:55:34 +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; Tue, 30 Jun 2020 18:55:35 +0800 Message-ID: <1593514516.24171.25.camel@mhfsdcap03> Subject: Re: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault From: Yong Wu To: Chao Hao Date: Tue, 30 Jun 2020 18:55:16 +0800 In-Reply-To: <20200629071310.1557-7-chao.hao@mediatek.com> References: <20200629071310.1557-1-chao.hao@mediatek.com> <20200629071310.1557-7-chao.hao@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: D7FCA91426CFD155D58B85D54AA5A21697363337348731C64131373A298F8F732000:8 X-MTK: N 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: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Evan Green , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , 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 On Mon, 2020-06-29 at 15:13 +0800, Chao Hao wrote: > The max larb number that a iommu HW support is 8(larb0~larb7 in the below > diagram). > If the larb's number is over 8, we use a sub_common for merging > several larbs into one larb. At this case, we will extend larb_id: > bit[11:9] means common-id; > bit[8:7] means subcommon-id; > From these two variables, we could get the real larb number when > translation fault happen. > The diagram is as below: > EMI > | > IOMMU > | > ----------------- > | | > common1 common0 > | | > ----------------- > | > smi common > | > ------------------------------------ > | | | | | | > 3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8) > | | | | | | > Larb0 Larb1 | Larb3 ... Larb7 > | > smi sub common > | > -------------------------- > | | | | > 2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4) > | | | | > Larb8 Larb9 Larb10 Larb11 > > In this patch we extend larb_remap[] to larb_remap[8][4] for this. > larb_remap[x][y]: x means common-id above, y means subcommon_id above. > > We can also distinguish if the M4U HW has sub_common by HAS_SUB_COMM > macro. > > Cc: Matthias Brugger > Signed-off-by: Chao Hao > Reviewed-by: Yong Wu > --- > drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- > drivers/iommu/mtk_iommu.h | 3 ++- > include/soc/mediatek/smi.h | 2 ++ > 3 files changed, 17 insertions(+), 8 deletions(-) [snip] > @@ -48,7 +49,7 @@ struct mtk_iommu_plat_data { > enum mtk_iommu_plat m4u_plat; > u32 flags; > u32 inv_sel_reg; > - unsigned char larbid_remap[MTK_LARB_NR_MAX]; > + unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; > }; > > struct mtk_iommu_domain; > diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h > index 5a34b87d89e3..fa65a55468e2 100644 > --- a/include/soc/mediatek/smi.h > +++ b/include/soc/mediatek/smi.h > @@ -12,6 +12,8 @@ > #ifdef CONFIG_MTK_SMI > > #define MTK_LARB_NR_MAX 16 > +#define MTK_LARB_COM_MAX 8 > +#define MTK_LARB_SUBCOM_MAX 4 Both are only used in mtk_iommu.h, and I don't think smi has plan to use them. thus we could move them into mtk_iommu.h > > #define MTK_SMI_MMU_EN(port) BIT(port) > _______________________________________________ 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.5 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,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 15132C433E1 for ; Tue, 30 Jun 2020 10:57:13 +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 D4BC72067D for ; Tue, 30 Jun 2020 10:57:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xXFIVJsS"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="W1MUIfLa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4BC72067D 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=N2P0nMNswTfYG3t8QG6YsFOoRYpSzXhfw0FQKS0Qo8M=; b=xXFIVJsSuW3FoNmxZrWqK4vgX dVGYJwxK5y/1Ga5cX5AkWY6HVqDMT3jz5EkMLzcl5XLwHnjnCUv4zatPhHAdLepolW7sQhMwqi5pC /Bsws1KQV4PH0CeVYRyt1qyO5+H+SkIgahcdQt7AikHzIKVYt8dlmFZfAGQLpnGs2AJajEjGmNjyR sES/XDIHpNDMbmiFg49i2xFJEycBxzwexa1vSHmMS5BVdXNC507+oR804VNv50/IQEwvnrK/UAQee /TC2w9mEtWMwf2TstMQbfwTIHHxVPOEo/YGiK2jvPfCzbHYCzq8eets+QSOMBUnD6Dcr/K6tJpGl/ NmDZuQ2GA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqDvf-000206-HC; Tue, 30 Jun 2020 10:55:55 +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 1jqDvb-0001yz-Dk; Tue, 30 Jun 2020 10:55:52 +0000 X-UUID: 876ed2ea83f642af975784f2b4eabdb8-20200630 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=bwKT46w9uGcCWgvZnA7Tt6P0SET70mbkJOxHElU0i8s=; b=W1MUIfLaM1gJbkVQ7lxcGX2oCQS1LT4kO9HnrjFsM3paV62YTLJ0c2CObuD5+1JCqDAPgJcnctbLPAgvXsw69w1upcROiLRUS4fYBpBjkNYSHcDYz2yITJ1B+iE6+K0rnfdml9TEEdpoU2/cJi3IC1HxdDP8EGJCsJhNIdgLdBo=; X-UUID: 876ed2ea83f642af975784f2b4eabdb8-20200630 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1694588932; Tue, 30 Jun 2020 02:55:40 -0800 Received: from MTKMBS32DR.mediatek.inc (172.27.6.104) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 03:55:41 -0700 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32DR.mediatek.inc (172.27.6.104) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 18:55:34 +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; Tue, 30 Jun 2020 18:55:35 +0800 Message-ID: <1593514516.24171.25.camel@mhfsdcap03> Subject: Re: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault From: Yong Wu To: Chao Hao Date: Tue, 30 Jun 2020 18:55:16 +0800 In-Reply-To: <20200629071310.1557-7-chao.hao@mediatek.com> References: <20200629071310.1557-1-chao.hao@mediatek.com> <20200629071310.1557-7-chao.hao@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: D7FCA91426CFD155D58B85D54AA5A21697363337348731C64131373A298F8F732000:8 X-MTK: N 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: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Evan Green , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , 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 Mon, 2020-06-29 at 15:13 +0800, Chao Hao wrote: > The max larb number that a iommu HW support is 8(larb0~larb7 in the below > diagram). > If the larb's number is over 8, we use a sub_common for merging > several larbs into one larb. At this case, we will extend larb_id: > bit[11:9] means common-id; > bit[8:7] means subcommon-id; > From these two variables, we could get the real larb number when > translation fault happen. > The diagram is as below: > EMI > | > IOMMU > | > ----------------- > | | > common1 common0 > | | > ----------------- > | > smi common > | > ------------------------------------ > | | | | | | > 3'd0 3'd1 3'd2 3'd3 ... 3'd7 <-common_id(max is 8) > | | | | | | > Larb0 Larb1 | Larb3 ... Larb7 > | > smi sub common > | > -------------------------- > | | | | > 2'd0 2'd1 2'd2 2'd3 <-sub_common_id(max is 4) > | | | | > Larb8 Larb9 Larb10 Larb11 > > In this patch we extend larb_remap[] to larb_remap[8][4] for this. > larb_remap[x][y]: x means common-id above, y means subcommon_id above. > > We can also distinguish if the M4U HW has sub_common by HAS_SUB_COMM > macro. > > Cc: Matthias Brugger > Signed-off-by: Chao Hao > Reviewed-by: Yong Wu > --- > drivers/iommu/mtk_iommu.c | 20 +++++++++++++------- > drivers/iommu/mtk_iommu.h | 3 ++- > include/soc/mediatek/smi.h | 2 ++ > 3 files changed, 17 insertions(+), 8 deletions(-) [snip] > @@ -48,7 +49,7 @@ struct mtk_iommu_plat_data { > enum mtk_iommu_plat m4u_plat; > u32 flags; > u32 inv_sel_reg; > - unsigned char larbid_remap[MTK_LARB_NR_MAX]; > + unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; > }; > > struct mtk_iommu_domain; > diff --git a/include/soc/mediatek/smi.h b/include/soc/mediatek/smi.h > index 5a34b87d89e3..fa65a55468e2 100644 > --- a/include/soc/mediatek/smi.h > +++ b/include/soc/mediatek/smi.h > @@ -12,6 +12,8 @@ > #ifdef CONFIG_MTK_SMI > > #define MTK_LARB_NR_MAX 16 > +#define MTK_LARB_COM_MAX 8 > +#define MTK_LARB_SUBCOM_MAX 4 Both are only used in mtk_iommu.h, and I don't think smi has plan to use them. thus we could move them into mtk_iommu.h > > #define MTK_SMI_MMU_EN(port) BIT(port) > _______________________________________________ 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.6 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,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 5413CC433E1 for ; Tue, 30 Jun 2020 10:55:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2568D207E8 for ; Tue, 30 Jun 2020 10:55:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="L21DghCH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732648AbgF3Kzs (ORCPT ); Tue, 30 Jun 2020 06:55:48 -0400 Received: from mailgw02.mediatek.com ([1.203.163.81]:61098 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1732632AbgF3Kzs (ORCPT ); Tue, 30 Jun 2020 06:55:48 -0400 X-UUID: d155703b879a48469e70dd2ed73a9869-20200630 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=bwKT46w9uGcCWgvZnA7Tt6P0SET70mbkJOxHElU0i8s=; b=L21DghCHrWldFdaBSXQEGQ15toyjeowj4Fz6tLIXxfOZVWi/ZgOWk3dUAzLmwXcQNIq7cxVGoNhVou11ecJSdwYt8il9snVbilXxT2Y3Bzui3VjK5g1pnnCZ9DKO+oNbtulUvN9Wf54WzvgaHY7bmCGMp6z9BxgSL3TaE92dGlY=; X-UUID: d155703b879a48469e70dd2ed73a9869-20200630 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1915969159; Tue, 30 Jun 2020 18:55:40 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32DR.mediatek.inc (172.27.6.104) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 18:55:34 +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; Tue, 30 Jun 2020 18:55:35 +0800 Message-ID: <1593514516.24171.25.camel@mhfsdcap03> Subject: Re: [PATCH v5 06/10] iommu/mediatek: Add sub_comm id in translation fault From: Yong Wu To: Chao Hao CC: Joerg Roedel , Rob Herring , Matthias Brugger , Evan Green , , , , , , , FY Yang Date: Tue, 30 Jun 2020 18:55:16 +0800 In-Reply-To: <20200629071310.1557-7-chao.hao@mediatek.com> References: <20200629071310.1557-1-chao.hao@mediatek.com> <20200629071310.1557-7-chao.hao@mediatek.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: D7FCA91426CFD155D58B85D54AA5A21697363337348731C64131373A298F8F732000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org T24gTW9uLCAyMDIwLTA2LTI5IGF0IDE1OjEzICswODAwLCBDaGFvIEhhbyB3cm90ZToNCj4gVGhl IG1heCBsYXJiIG51bWJlciB0aGF0IGEgaW9tbXUgSFcgc3VwcG9ydCBpcyA4KGxhcmIwfmxhcmI3 IGluIHRoZSBiZWxvdw0KPiBkaWFncmFtKS4NCj4gSWYgdGhlIGxhcmIncyBudW1iZXIgaXMgb3Zl ciA4LCB3ZSB1c2UgYSBzdWJfY29tbW9uIGZvciBtZXJnaW5nDQo+IHNldmVyYWwgbGFyYnMgaW50 byBvbmUgbGFyYi4gQXQgdGhpcyBjYXNlLCB3ZSB3aWxsIGV4dGVuZCBsYXJiX2lkOg0KPiBiaXRb MTE6OV0gbWVhbnMgY29tbW9uLWlkOw0KPiBiaXRbODo3XSBtZWFucyBzdWJjb21tb24taWQ7DQo+ IEZyb20gdGhlc2UgdHdvIHZhcmlhYmxlcywgd2UgY291bGQgZ2V0IHRoZSByZWFsIGxhcmIgbnVt YmVyIHdoZW4NCj4gdHJhbnNsYXRpb24gZmF1bHQgaGFwcGVuLg0KPiBUaGUgZGlhZ3JhbSBpcyBh cyBiZWxvdzoNCj4gCQkgRU1JDQo+IAkJICB8DQo+IAkJSU9NTVUNCj4gCQkgIHwNCj4gICAgICAg ICAgICAtLS0tLS0tLS0tLS0tLS0tLQ0KPiAJICAgfCAgICAgICAgICAgICAgIHwNCj4gCWNvbW1v bjEgICAJY29tbW9uMA0KPiAJICAgfAkJICAgfA0KPiAJICAgLS0tLS0tLS0tLS0tLS0tLS0NCj4g CQkgIHwNCj4gICAgICAgICAgICAgIHNtaSBjb21tb24NCj4gCQkgIHwNCj4gICAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCj4gICB8ICAgICAgIHwgICAgICAgfCAgICAgICB8 ICAgICB8ICAgIHwNCj4gIDMnZDAgICAgMydkMSAgICAzJ2QyICAgIDMnZDMgIC4uLiAgMydkNyAg IDwtY29tbW9uX2lkKG1heCBpcyA4KQ0KPiAgIHwgICAgICAgfCAgICAgICB8ICAgICAgIHwgICAg IHwgICAgfA0KPiBMYXJiMCAgIExhcmIxICAgICB8ICAgICBMYXJiMyAgLi4uIExhcmI3DQo+IAkJ ICB8DQo+IAkgICAgc21pIHN1YiBjb21tb24NCj4gCQkgIHwNCj4gICAgICAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQ0KPiAgICAgIHwgICAgICAgIHwgICAgICAgfCAgICAgICB8DQo+ICAgICAy J2QwICAgICAyJ2QxICAgIDInZDIgICAgMidkMyAgIDwtc3ViX2NvbW1vbl9pZChtYXggaXMgNCkN Cj4gICAgICB8ICAgICAgICB8ICAgICAgIHwgICAgICAgfA0KPiAgICBMYXJiOCAgICBMYXJiOSAg IExhcmIxMCAgTGFyYjExDQo+IA0KPiBJbiB0aGlzIHBhdGNoIHdlIGV4dGVuZCBsYXJiX3JlbWFw W10gdG8gbGFyYl9yZW1hcFs4XVs0XSBmb3IgdGhpcy4NCj4gbGFyYl9yZW1hcFt4XVt5XTogeCBt ZWFucyBjb21tb24taWQgYWJvdmUsIHkgbWVhbnMgc3ViY29tbW9uX2lkIGFib3ZlLg0KPiANCj4g V2UgY2FuIGFsc28gZGlzdGluZ3Vpc2ggaWYgdGhlIE00VSBIVyBoYXMgc3ViX2NvbW1vbiBieSBI QVNfU1VCX0NPTU0NCj4gbWFjcm8uDQo+IA0KPiBDYzogTWF0dGhpYXMgQnJ1Z2dlciA8bWF0dGhp YXMuYmdnQGdtYWlsLmNvbT4NCj4gU2lnbmVkLW9mZi1ieTogQ2hhbyBIYW8gPGNoYW8uaGFvQG1l ZGlhdGVrLmNvbT4NCj4gUmV2aWV3ZWQtYnk6IFlvbmcgV3UgPHlvbmcud3VAbWVkaWF0ZWsuY29t Pg0KPiAtLS0NCj4gIGRyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmMgIHwgMjAgKysrKysrKysrKysr Ky0tLS0tLS0NCj4gIGRyaXZlcnMvaW9tbXUvbXRrX2lvbW11LmggIHwgIDMgKystDQo+ICBpbmNs dWRlL3NvYy9tZWRpYXRlay9zbWkuaCB8ICAyICsrDQo+ICAzIGZpbGVzIGNoYW5nZWQsIDE3IGlu c2VydGlvbnMoKyksIDggZGVsZXRpb25zKC0pDQoNCltzbmlwXQ0KDQo+IEBAIC00OCw3ICs0OSw3 IEBAIHN0cnVjdCBtdGtfaW9tbXVfcGxhdF9kYXRhIHsNCj4gIAllbnVtIG10a19pb21tdV9wbGF0 IG00dV9wbGF0Ow0KPiAgCXUzMiAgICAgICAgICAgICAgICAgZmxhZ3M7DQo+ICAJdTMyICAgICAg ICAgICAgICAgICBpbnZfc2VsX3JlZzsNCj4gLQl1bnNpZ25lZCBjaGFyICAgICAgIGxhcmJpZF9y ZW1hcFtNVEtfTEFSQl9OUl9NQVhdOw0KPiArCXVuc2lnbmVkIGNoYXIgICAgICAgbGFyYmlkX3Jl bWFwW01US19MQVJCX0NPTV9NQVhdW01US19MQVJCX1NVQkNPTV9NQVhdOw0KPiAgfTsNCj4gIA0K PiAgc3RydWN0IG10a19pb21tdV9kb21haW47DQo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL3NvYy9t ZWRpYXRlay9zbWkuaCBiL2luY2x1ZGUvc29jL21lZGlhdGVrL3NtaS5oDQo+IGluZGV4IDVhMzRi ODdkODllMy4uZmE2NWE1NTQ2OGUyIDEwMDY0NA0KPiAtLS0gYS9pbmNsdWRlL3NvYy9tZWRpYXRl ay9zbWkuaA0KPiArKysgYi9pbmNsdWRlL3NvYy9tZWRpYXRlay9zbWkuaA0KPiBAQCAtMTIsNiAr MTIsOCBAQA0KPiAgI2lmZGVmIENPTkZJR19NVEtfU01JDQo+ICANCj4gICNkZWZpbmUgTVRLX0xB UkJfTlJfTUFYCQkxNg0KPiArI2RlZmluZSBNVEtfTEFSQl9DT01fTUFYCTgNCj4gKyNkZWZpbmUg TVRLX0xBUkJfU1VCQ09NX01BWAk0DQoNCkJvdGggYXJlIG9ubHkgdXNlZCBpbiBtdGtfaW9tbXUu aCwgYW5kIEkgZG9uJ3QgdGhpbmsgc21pIGhhcyBwbGFuIHRvIHVzZQ0KdGhlbS4gdGh1cyB3ZSBj b3VsZCBtb3ZlIHRoZW0gaW50byBtdGtfaW9tbXUuaA0KDQo+ICANCj4gICNkZWZpbmUgTVRLX1NN SV9NTVVfRU4ocG9ydCkJQklUKHBvcnQpDQo+ICANCg0K