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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT 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 0FDA1CA9ED3 for ; Mon, 4 Nov 2019 11:53:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBDAC21D7F for ; Mon, 4 Nov 2019 11:53:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729077AbfKDLxi (ORCPT ); Mon, 4 Nov 2019 06:53:38 -0500 Received: from mailgw02.mediatek.com ([210.61.82.184]:17023 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727138AbfKDLxF (ORCPT ); Mon, 4 Nov 2019 06:53:05 -0500 X-UUID: a0f676bd011b459e9c6217a60ea321a1-20191104 X-UUID: a0f676bd011b459e9c6217a60ea321a1-20191104 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1196001826; Mon, 04 Nov 2019 19:53:00 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 19:52:58 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 4 Nov 2019 19:52:55 +0800 From: Chao Hao To: Joerg Roedel , Rob Herring , Matthias Brugger CC: , , , , , , Jun Yan , Cui Zhang , Guangming Cao , Yong Wu , Anan Sun , Miles Chen , Chao Hao Subject: [RESEND,PATCH 07/13] iommu/mediatek: Add smi_larb info about device Date: Mon, 4 Nov 2019 19:52:32 +0800 Message-ID: <20191104115238.2394-8-chao.hao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191104115238.2394-1-chao.hao@mediatek.com> References: <20191104115238.2394-1-chao.hao@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All the devices which used iommu are connected to SMI_larb port, so when different devices driver execute initialization, iommu can check larb_id and port_id to distinguish them and then make them match to iommu_group accordingly. We also add dom_cnt variable to describe the number of mtk_iommu_domain. Larb_id and port_id define can refer to "mtxxxx-larb-port.h(ex: mt6779-larb-port.h)" file Signed-off-by: Chao Hao --- drivers/iommu/mtk_iommu.c | 50 ++++++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 27995b2b29a6..0eacbc473374 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -126,6 +126,7 @@ struct mtk_iommu_domain { struct mtk_iommu_pgtable { struct io_pgtable_cfg cfg; struct io_pgtable_ops *iop; + struct device *init_dev; struct list_head m4u_dom_v2; }; @@ -177,22 +178,35 @@ static struct mtk_iommu_data *mtk_iommu_get_m4u_data(void) return NULL; } -static u32 get_domain_id(void) +static u32 get_domain_id(struct mtk_iommu_data *data, u32 portid) { - /* only support one mtk_iommu_domain currently */ - return 0; + u32 dom_id = 0; + int i; + + /* only support one mtk_iommu_domain currently(dom_cnt = 1) */ + for (i = 0; i < data->plat_data->dom_cnt; i++) + return i; + + return dom_id; } -static u32 mtk_iommu_get_domain_id(void) +static u32 mtk_iommu_get_domain_id(struct device *dev) { - return get_domain_id(); + struct iommu_fwspec *fwspec = dev->iommu_fwspec; + struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; + u32 portid = fwspec->ids[0]; + + return get_domain_id(data, portid); } static struct mtk_iommu_domain *get_mtk_domain(struct device *dev) { struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_domain *dom; - u32 domain_id = mtk_iommu_get_domain_id(); + u32 domain_id = mtk_iommu_get_domain_id(dev); + + if (domain_id >= data->plat_data->dom_cnt) + return NULL; list_for_each_entry(dom, &data->pgtable->m4u_dom_v2, list) { if (dom->id == domain_id) @@ -431,11 +445,18 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) struct mtk_iommu_pgtable *pgtable = mtk_iommu_get_pgtable(); struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); struct mtk_iommu_domain *dom; + struct device *dev; if (type != IOMMU_DOMAIN_DMA) return NULL; - if (!pgtable) { + if (pgtable) { + dev = pgtable->init_dev; + if (!data->m4u_group) { + pr_err("%s, find m4u_group failed\n", __func__); + return NULL; + } + } else { pr_err("%s, pgtable is not ready\n", __func__); return NULL; } @@ -447,8 +468,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) if (iommu_get_dma_cookie(&dom->domain)) goto free_dom; + dom->id = mtk_iommu_get_domain_id(dev); + if (dom->id >= data->plat_data->dom_cnt) + goto put_dma_cookie; + dom->group = data->m4u_group; - dom->id = mtk_iommu_get_domain_id(); /* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = pgtable->cfg.pgsize_bitmap; @@ -459,6 +483,8 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) return &dom->domain; +put_dma_cookie: + iommu_put_dma_cookie(&dom->domain); free_dom: kfree(dom); return NULL; @@ -619,6 +645,10 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) } else { iommu_group_ref_get(data->m4u_group); } + + /* save the latest init device */ + pgtable->init_dev = dev; + return data->m4u_group; } @@ -927,12 +957,14 @@ static const struct mtk_iommu_plat_data mt2712_data = { .has_4gb_mode = true, .has_bclk = true, .has_vld_pa_rng = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, .inv_sel_reg = REG_MMU_INV_SEL, }; static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat = M4U_MT6779, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 5, 7, 10, 9}, /* vp6a, vp6b, mdla/core2, mdla/edmc*/ .larbid_remap[1] = {2, 0, 3, 1}, @@ -948,6 +980,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ .inv_sel_reg = REG_MMU_INV_SEL, }; @@ -955,6 +988,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 4, 5, 6, 7, 2, 3, 1}, .inv_sel_reg = REG_MMU_INV_SEL, }; diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index dd5f19f78b62..6801f8496fcc 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -49,6 +49,7 @@ struct mtk_iommu_plat_data { bool has_misc_ctrl[2]; u32 inv_sel_reg; u32 m4u1_mask; + u32 dom_cnt; unsigned char larbid_remap[2][MTK_LARB_NR_MAX]; }; -- 2.18.0 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=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_GIT 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 33552CA9EA0 for ; Mon, 4 Nov 2019 11:53:17 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (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 100E021E6F for ; Mon, 4 Nov 2019 11:53:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 100E021E6F 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 mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 78C52F00; Mon, 4 Nov 2019 11:53:06 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 2BAA4F00 for ; Mon, 4 Nov 2019 11:53:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 22B3D89E for ; Mon, 4 Nov 2019 11:53:03 +0000 (UTC) X-UUID: a0f676bd011b459e9c6217a60ea321a1-20191104 X-UUID: a0f676bd011b459e9c6217a60ea321a1-20191104 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1196001826; Mon, 04 Nov 2019 19:53:00 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 19:52:58 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 4 Nov 2019 19:52:55 +0800 From: Chao Hao To: Joerg Roedel , Rob Herring , Matthias Brugger Subject: [RESEND,PATCH 07/13] iommu/mediatek: Add smi_larb info about device Date: Mon, 4 Nov 2019 19:52:32 +0800 Message-ID: <20191104115238.2394-8-chao.hao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191104115238.2394-1-chao.hao@mediatek.com> References: <20191104115238.2394-1-chao.hao@mediatek.com> MIME-Version: 1.0 X-MTK: N Cc: Anan Sun , devicetree@vger.kernel.org, Cui Zhang , Jun Yan , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Miles Chen , linux-arm-kernel@lists.infradead.org, Guangming Cao X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 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 Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org All the devices which used iommu are connected to SMI_larb port, so when different devices driver execute initialization, iommu can check larb_id and port_id to distinguish them and then make them match to iommu_group accordingly. We also add dom_cnt variable to describe the number of mtk_iommu_domain. Larb_id and port_id define can refer to "mtxxxx-larb-port.h(ex: mt6779-larb-port.h)" file Signed-off-by: Chao Hao --- drivers/iommu/mtk_iommu.c | 50 ++++++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 27995b2b29a6..0eacbc473374 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -126,6 +126,7 @@ struct mtk_iommu_domain { struct mtk_iommu_pgtable { struct io_pgtable_cfg cfg; struct io_pgtable_ops *iop; + struct device *init_dev; struct list_head m4u_dom_v2; }; @@ -177,22 +178,35 @@ static struct mtk_iommu_data *mtk_iommu_get_m4u_data(void) return NULL; } -static u32 get_domain_id(void) +static u32 get_domain_id(struct mtk_iommu_data *data, u32 portid) { - /* only support one mtk_iommu_domain currently */ - return 0; + u32 dom_id = 0; + int i; + + /* only support one mtk_iommu_domain currently(dom_cnt = 1) */ + for (i = 0; i < data->plat_data->dom_cnt; i++) + return i; + + return dom_id; } -static u32 mtk_iommu_get_domain_id(void) +static u32 mtk_iommu_get_domain_id(struct device *dev) { - return get_domain_id(); + struct iommu_fwspec *fwspec = dev->iommu_fwspec; + struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; + u32 portid = fwspec->ids[0]; + + return get_domain_id(data, portid); } static struct mtk_iommu_domain *get_mtk_domain(struct device *dev) { struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_domain *dom; - u32 domain_id = mtk_iommu_get_domain_id(); + u32 domain_id = mtk_iommu_get_domain_id(dev); + + if (domain_id >= data->plat_data->dom_cnt) + return NULL; list_for_each_entry(dom, &data->pgtable->m4u_dom_v2, list) { if (dom->id == domain_id) @@ -431,11 +445,18 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) struct mtk_iommu_pgtable *pgtable = mtk_iommu_get_pgtable(); struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); struct mtk_iommu_domain *dom; + struct device *dev; if (type != IOMMU_DOMAIN_DMA) return NULL; - if (!pgtable) { + if (pgtable) { + dev = pgtable->init_dev; + if (!data->m4u_group) { + pr_err("%s, find m4u_group failed\n", __func__); + return NULL; + } + } else { pr_err("%s, pgtable is not ready\n", __func__); return NULL; } @@ -447,8 +468,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) if (iommu_get_dma_cookie(&dom->domain)) goto free_dom; + dom->id = mtk_iommu_get_domain_id(dev); + if (dom->id >= data->plat_data->dom_cnt) + goto put_dma_cookie; + dom->group = data->m4u_group; - dom->id = mtk_iommu_get_domain_id(); /* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = pgtable->cfg.pgsize_bitmap; @@ -459,6 +483,8 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) return &dom->domain; +put_dma_cookie: + iommu_put_dma_cookie(&dom->domain); free_dom: kfree(dom); return NULL; @@ -619,6 +645,10 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) } else { iommu_group_ref_get(data->m4u_group); } + + /* save the latest init device */ + pgtable->init_dev = dev; + return data->m4u_group; } @@ -927,12 +957,14 @@ static const struct mtk_iommu_plat_data mt2712_data = { .has_4gb_mode = true, .has_bclk = true, .has_vld_pa_rng = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, .inv_sel_reg = REG_MMU_INV_SEL, }; static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat = M4U_MT6779, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 5, 7, 10, 9}, /* vp6a, vp6b, mdla/core2, mdla/edmc*/ .larbid_remap[1] = {2, 0, 3, 1}, @@ -948,6 +980,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ .inv_sel_reg = REG_MMU_INV_SEL, }; @@ -955,6 +988,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 4, 5, 6, 7, 2, 3, 1}, .inv_sel_reg = REG_MMU_INV_SEL, }; diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index dd5f19f78b62..6801f8496fcc 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -49,6 +49,7 @@ struct mtk_iommu_plat_data { bool has_misc_ctrl[2]; u32 inv_sel_reg; u32 m4u1_mask; + u32 dom_cnt; unsigned char larbid_remap[2][MTK_LARB_NR_MAX]; }; -- 2.18.0 _______________________________________________ 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=-9.7 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_GIT 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 CD2CBCA9EA0 for ; Mon, 4 Nov 2019 12:04:49 +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 A40BD217F4 for ; Mon, 4 Nov 2019 12:04:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="H3Sp27Ht" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A40BD217F4 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: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y4/rRqgbrc0TYZp1Q2mAJi7egybyLGYkrd2J14Jkhec=; b=H3Sp27Htnfx0GL Qd2R8ilq/Hem70qasI654VmAclCH34QOyG1WKOy8DKx0tgC6oUWoqA8LZRKD1UgP3vRUiTDa0J/dv /D706obePDkkQW/ucWPV0COyDhovuT0t6vzww4RjHLKOylfK9D+nYkeeM32LpatGaNU5tJNlQARCP cSPxXPlQjzjQh8BsPSOnTYAnkAXk8KNUXG2WLggIQeqyNOFbjWa3oWc8nDgvel+zyRIIqCixcaiAa tWtFsrrpyS1dhGzB9a5tbFc+58rOW6uEeK4u9Las7VcmMvnoK2tcBUxy7GmFUiWHWmYWozBhz9G0D LwPPjgGsbq+doIJlEjVQ==; 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 1iRb6H-0008Di-3H; Mon, 04 Nov 2019 12:04:49 +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 1iRb4Y-0006N0-Uk; Mon, 04 Nov 2019 12:03:05 +0000 X-UUID: 97c2fbcd65be454a9e4ce0c47f7d5a1d-20191104 X-UUID: 97c2fbcd65be454a9e4ce0c47f7d5a1d-20191104 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 938873909; Mon, 04 Nov 2019 04:03:07 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 03:52:58 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 19:52:58 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 4 Nov 2019 19:52:55 +0800 From: Chao Hao To: Joerg Roedel , Rob Herring , "Matthias Brugger" Subject: [RESEND,PATCH 07/13] iommu/mediatek: Add smi_larb info about device Date: Mon, 4 Nov 2019 19:52:32 +0800 Message-ID: <20191104115238.2394-8-chao.hao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191104115238.2394-1-chao.hao@mediatek.com> References: <20191104115238.2394-1-chao.hao@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191104_040303_040734_FEAB46CB X-CRM114-Status: GOOD ( 15.36 ) 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: Anan Sun , devicetree@vger.kernel.org, Cui Zhang , Jun Yan , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Yong Wu , Miles Chen , linux-arm-kernel@lists.infradead.org, Guangming Cao 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 All the devices which used iommu are connected to SMI_larb port, so when different devices driver execute initialization, iommu can check larb_id and port_id to distinguish them and then make them match to iommu_group accordingly. We also add dom_cnt variable to describe the number of mtk_iommu_domain. Larb_id and port_id define can refer to "mtxxxx-larb-port.h(ex: mt6779-larb-port.h)" file Signed-off-by: Chao Hao --- drivers/iommu/mtk_iommu.c | 50 ++++++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 27995b2b29a6..0eacbc473374 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -126,6 +126,7 @@ struct mtk_iommu_domain { struct mtk_iommu_pgtable { struct io_pgtable_cfg cfg; struct io_pgtable_ops *iop; + struct device *init_dev; struct list_head m4u_dom_v2; }; @@ -177,22 +178,35 @@ static struct mtk_iommu_data *mtk_iommu_get_m4u_data(void) return NULL; } -static u32 get_domain_id(void) +static u32 get_domain_id(struct mtk_iommu_data *data, u32 portid) { - /* only support one mtk_iommu_domain currently */ - return 0; + u32 dom_id = 0; + int i; + + /* only support one mtk_iommu_domain currently(dom_cnt = 1) */ + for (i = 0; i < data->plat_data->dom_cnt; i++) + return i; + + return dom_id; } -static u32 mtk_iommu_get_domain_id(void) +static u32 mtk_iommu_get_domain_id(struct device *dev) { - return get_domain_id(); + struct iommu_fwspec *fwspec = dev->iommu_fwspec; + struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; + u32 portid = fwspec->ids[0]; + + return get_domain_id(data, portid); } static struct mtk_iommu_domain *get_mtk_domain(struct device *dev) { struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_domain *dom; - u32 domain_id = mtk_iommu_get_domain_id(); + u32 domain_id = mtk_iommu_get_domain_id(dev); + + if (domain_id >= data->plat_data->dom_cnt) + return NULL; list_for_each_entry(dom, &data->pgtable->m4u_dom_v2, list) { if (dom->id == domain_id) @@ -431,11 +445,18 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) struct mtk_iommu_pgtable *pgtable = mtk_iommu_get_pgtable(); struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); struct mtk_iommu_domain *dom; + struct device *dev; if (type != IOMMU_DOMAIN_DMA) return NULL; - if (!pgtable) { + if (pgtable) { + dev = pgtable->init_dev; + if (!data->m4u_group) { + pr_err("%s, find m4u_group failed\n", __func__); + return NULL; + } + } else { pr_err("%s, pgtable is not ready\n", __func__); return NULL; } @@ -447,8 +468,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) if (iommu_get_dma_cookie(&dom->domain)) goto free_dom; + dom->id = mtk_iommu_get_domain_id(dev); + if (dom->id >= data->plat_data->dom_cnt) + goto put_dma_cookie; + dom->group = data->m4u_group; - dom->id = mtk_iommu_get_domain_id(); /* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = pgtable->cfg.pgsize_bitmap; @@ -459,6 +483,8 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) return &dom->domain; +put_dma_cookie: + iommu_put_dma_cookie(&dom->domain); free_dom: kfree(dom); return NULL; @@ -619,6 +645,10 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) } else { iommu_group_ref_get(data->m4u_group); } + + /* save the latest init device */ + pgtable->init_dev = dev; + return data->m4u_group; } @@ -927,12 +957,14 @@ static const struct mtk_iommu_plat_data mt2712_data = { .has_4gb_mode = true, .has_bclk = true, .has_vld_pa_rng = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, .inv_sel_reg = REG_MMU_INV_SEL, }; static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat = M4U_MT6779, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 5, 7, 10, 9}, /* vp6a, vp6b, mdla/core2, mdla/edmc*/ .larbid_remap[1] = {2, 0, 3, 1}, @@ -948,6 +980,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ .inv_sel_reg = REG_MMU_INV_SEL, }; @@ -955,6 +988,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 4, 5, 6, 7, 2, 3, 1}, .inv_sel_reg = REG_MMU_INV_SEL, }; diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index dd5f19f78b62..6801f8496fcc 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -49,6 +49,7 @@ struct mtk_iommu_plat_data { bool has_misc_ctrl[2]; u32 inv_sel_reg; u32 m4u1_mask; + u32 dom_cnt; unsigned char larbid_remap[2][MTK_LARB_NR_MAX]; }; -- 2.18.0 _______________________________________________ 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=-9.7 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_GIT 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 8B66FCA9ECF for ; Mon, 4 Nov 2019 12:04:21 +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 604E5217F4 for ; Mon, 4 Nov 2019 12:04:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pwBwIRoQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 604E5217F4 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: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RVbTzmHUvIWM7cBzpytHRN02K3RLJTSyssEdb1S9DWc=; b=pwBwIRoQRaFVi4 aJksWpnoWDPtV+BSL/+X9EgFfPZDF9n3SFth4gB4ZmAddCl+BL8Y4uAwjHShg7YolSzT2qqxSMOPt YbaZ8Sxy0v68oVkU/ar5M0PKJ5jcR6rBz7/t8peqMF4VqlXuczvsbhcHBaGAOFu9HNxXXgKVOmYLN HF01Cg2/ncnZao/wgOXqHw5VJ+5EktlM14e3L5deGER4ZQ5woSAiQqIqfs9/dR/u34zvgUiK1Em4t FYqa8gW0IYeBWzYF/nhkAqBlBwEdjReEJH4bcVGccSZ7CnaUK0/NahucoqaTdVEFRF0VjAi3rxM8m e15wwpefD8UP+0nPyBPw==; 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 1iRb5o-0007fx-D2; Mon, 04 Nov 2019 12:04:20 +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 1iRb4Y-0006N0-Uk; Mon, 04 Nov 2019 12:03:05 +0000 X-UUID: 97c2fbcd65be454a9e4ce0c47f7d5a1d-20191104 X-UUID: 97c2fbcd65be454a9e4ce0c47f7d5a1d-20191104 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 938873909; Mon, 04 Nov 2019 04:03:07 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 03:52:58 -0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Nov 2019 19:52:58 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 4 Nov 2019 19:52:55 +0800 From: Chao Hao To: Joerg Roedel , Rob Herring , "Matthias Brugger" Subject: [RESEND,PATCH 07/13] iommu/mediatek: Add smi_larb info about device Date: Mon, 4 Nov 2019 19:52:32 +0800 Message-ID: <20191104115238.2394-8-chao.hao@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191104115238.2394-1-chao.hao@mediatek.com> References: <20191104115238.2394-1-chao.hao@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191104_040303_040734_FEAB46CB X-CRM114-Status: GOOD ( 15.36 ) 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: Anan Sun , devicetree@vger.kernel.org, Cui Zhang , Jun Yan , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Chao Hao , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Yong Wu , Miles Chen , linux-arm-kernel@lists.infradead.org, Guangming Cao 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 All the devices which used iommu are connected to SMI_larb port, so when different devices driver execute initialization, iommu can check larb_id and port_id to distinguish them and then make them match to iommu_group accordingly. We also add dom_cnt variable to describe the number of mtk_iommu_domain. Larb_id and port_id define can refer to "mtxxxx-larb-port.h(ex: mt6779-larb-port.h)" file Signed-off-by: Chao Hao --- drivers/iommu/mtk_iommu.c | 50 ++++++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 27995b2b29a6..0eacbc473374 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -126,6 +126,7 @@ struct mtk_iommu_domain { struct mtk_iommu_pgtable { struct io_pgtable_cfg cfg; struct io_pgtable_ops *iop; + struct device *init_dev; struct list_head m4u_dom_v2; }; @@ -177,22 +178,35 @@ static struct mtk_iommu_data *mtk_iommu_get_m4u_data(void) return NULL; } -static u32 get_domain_id(void) +static u32 get_domain_id(struct mtk_iommu_data *data, u32 portid) { - /* only support one mtk_iommu_domain currently */ - return 0; + u32 dom_id = 0; + int i; + + /* only support one mtk_iommu_domain currently(dom_cnt = 1) */ + for (i = 0; i < data->plat_data->dom_cnt; i++) + return i; + + return dom_id; } -static u32 mtk_iommu_get_domain_id(void) +static u32 mtk_iommu_get_domain_id(struct device *dev) { - return get_domain_id(); + struct iommu_fwspec *fwspec = dev->iommu_fwspec; + struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; + u32 portid = fwspec->ids[0]; + + return get_domain_id(data, portid); } static struct mtk_iommu_domain *get_mtk_domain(struct device *dev) { struct mtk_iommu_data *data = dev->iommu_fwspec->iommu_priv; struct mtk_iommu_domain *dom; - u32 domain_id = mtk_iommu_get_domain_id(); + u32 domain_id = mtk_iommu_get_domain_id(dev); + + if (domain_id >= data->plat_data->dom_cnt) + return NULL; list_for_each_entry(dom, &data->pgtable->m4u_dom_v2, list) { if (dom->id == domain_id) @@ -431,11 +445,18 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) struct mtk_iommu_pgtable *pgtable = mtk_iommu_get_pgtable(); struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); struct mtk_iommu_domain *dom; + struct device *dev; if (type != IOMMU_DOMAIN_DMA) return NULL; - if (!pgtable) { + if (pgtable) { + dev = pgtable->init_dev; + if (!data->m4u_group) { + pr_err("%s, find m4u_group failed\n", __func__); + return NULL; + } + } else { pr_err("%s, pgtable is not ready\n", __func__); return NULL; } @@ -447,8 +468,11 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) if (iommu_get_dma_cookie(&dom->domain)) goto free_dom; + dom->id = mtk_iommu_get_domain_id(dev); + if (dom->id >= data->plat_data->dom_cnt) + goto put_dma_cookie; + dom->group = data->m4u_group; - dom->id = mtk_iommu_get_domain_id(); /* Update our support page sizes bitmap */ dom->domain.pgsize_bitmap = pgtable->cfg.pgsize_bitmap; @@ -459,6 +483,8 @@ static struct iommu_domain *mtk_iommu_domain_alloc(unsigned type) return &dom->domain; +put_dma_cookie: + iommu_put_dma_cookie(&dom->domain); free_dom: kfree(dom); return NULL; @@ -619,6 +645,10 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) } else { iommu_group_ref_get(data->m4u_group); } + + /* save the latest init device */ + pgtable->init_dev = dev; + return data->m4u_group; } @@ -927,12 +957,14 @@ static const struct mtk_iommu_plat_data mt2712_data = { .has_4gb_mode = true, .has_bclk = true, .has_vld_pa_rng = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, .inv_sel_reg = REG_MMU_INV_SEL, }; static const struct mtk_iommu_plat_data mt6779_data = { .m4u_plat = M4U_MT6779, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 5, 7, 10, 9}, /* vp6a, vp6b, mdla/core2, mdla/edmc*/ .larbid_remap[1] = {2, 0, 3, 1}, @@ -948,6 +980,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { .has_4gb_mode = true, .has_bclk = true, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ .inv_sel_reg = REG_MMU_INV_SEL, }; @@ -955,6 +988,7 @@ static const struct mtk_iommu_plat_data mt8173_data = { static const struct mtk_iommu_plat_data mt8183_data = { .m4u_plat = M4U_MT8183, .reset_axi = true, + .dom_cnt = 1, .larbid_remap[0] = {0, 4, 5, 6, 7, 2, 3, 1}, .inv_sel_reg = REG_MMU_INV_SEL, }; diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index dd5f19f78b62..6801f8496fcc 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -49,6 +49,7 @@ struct mtk_iommu_plat_data { bool has_misc_ctrl[2]; u32 inv_sel_reg; u32 m4u1_mask; + u32 dom_cnt; unsigned char larbid_remap[2][MTK_LARB_NR_MAX]; }; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel