Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4902155pxv; Tue, 29 Jun 2021 19:37:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUFeMAkeZjLISCBCsC4xab/0XN0dMHv0C96q0PviU5f7Urp2gPu32wrPKiHs3TCrr1GCgi X-Received: by 2002:a17:906:ece7:: with SMTP id qt7mr32319392ejb.194.1625020654208; Tue, 29 Jun 2021 19:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625020654; cv=none; d=google.com; s=arc-20160816; b=NDMCVAk3Ntj/T2h2E0XVD10nVc8M7KPF0+YTUEsZQZKxOK+1qmSpf8QdC25R4fJ/gO ymnaLubQANPoqx8aMUe8c/Mg5q8X7n9/Gtmnh0sqQvD2qDFm7Wb18jwt0lYQTrfKsGBN xLaEqPUG8XOpFZcX7axhYIzuNVAUxcGIE0KJ21mv/+13VilHxU3jYYtkd3sIAIdDQPek zSEHPGPp/HRa51icp2Wu5zpeaWEJth5eLMQlBWQSjCSfwlDhuKlj0Q0Pqe2XrRVG2ZsF ouU8njbm+voxOhC0B70Y7eHvmbqF9AKh//rwEAJshDbDCXlosmseLZWstCk+hd98kybs Ds2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=n0BTh1UjXNuFL4CmnOrt+D6ArnlCajr76K5I5ZXmvWo=; b=xQk4q6OTV+Adj9IyKzHej9ZzBnrfKLdq5KPLQS3rE/5CFfktgfOhgcHqiFpzD1SoY3 +uorZ7S4eH0EvTpQW+MoQF77lx8SvHK8ZESTeIhaLaDj9JghXibagxWeuOWANQvgj6iE i1I7AJA36YsHCzHNAb2h0gb3hyTlNglHmCAfRlWX7h0zxKEXGY3loc/bjSCrL8TQBWx5 AZK0MXerYA4rXOPvIyn1IzV6pqepzRjA8iHzl3Ih52iOGOCSz0MqKpqsWkRvfLjt8u9w p54v+mFRcloHn4JMKoJDB+1+9zTeS3rTa4OtP46Ft4rGz9YdIVLMAhED+GDG9YOLTJru 5GQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x17si18880955ejd.416.2021.06.29.19.37.07; Tue, 29 Jun 2021 19:37:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232754AbhF3Ci1 (ORCPT + 99 others); Tue, 29 Jun 2021 22:38:27 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:33983 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232779AbhF3Ci0 (ORCPT ); Tue, 29 Jun 2021 22:38:26 -0400 X-UUID: 608846bcfb7147578300ce976b190209-20210630 X-UUID: 608846bcfb7147578300ce976b190209-20210630 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1171968976; Wed, 30 Jun 2021 10:35:56 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 30 Jun 2021 10:35:54 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 30 Jun 2021 10:35:53 +0800 From: Yong Wu To: Joerg Roedel , Rob Herring , Matthias Brugger , Will Deacon , Robin Murphy CC: Krzysztof Kozlowski , Evan Green , Tomasz Figa , Tomasz Figa , , , , , , , , , Nicolas Boichat , , Subject: [PATCH 04/24] iommu/mediatek: Adapt sharing and non-sharing pgtable case Date: Wed, 30 Jun 2021 10:34:44 +0800 Message-ID: <20210630023504.18177-5-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210630023504.18177-1-yong.wu@mediatek.com> References: <20210630023504.18177-1-yong.wu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In previous mt2712, Both are MM IOMMU, they will share pgtable. But in the later SoC, another is infra IOMMU, there is no reason to share pgtable between MM with INFRA IOMMU. This patch try to manage the two case(sharing or non-sharing pgtable). Currently we use for_each_m4u to loop the 2 HW. I add the list_head into this macro. In the sharing pgtable case, the list_head is the global "m4ulist". In the non-sharing pgtable case, the list_head is hw_list_head which is a variable in the "data". then for_each_m4u will only loop itself. Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 47 ++++++++++++++++++++++----------------- drivers/iommu/mtk_iommu.h | 3 +++ 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 013dbcc87d49..4689b65fdb03 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -120,6 +120,7 @@ #define WR_THROT_EN BIT(6) #define HAS_LEGACY_IVRP_PADDR BIT(7) #define IOVA_34_EN BIT(8) +#define SHARE_PGTABLE BIT(9) /* 2 HW share pgtable */ #define MTK_IOMMU_HAS_FLAG(pdata, _x) \ ((((pdata)->flags) & (_x)) == (_x)) @@ -167,7 +168,7 @@ static int mtk_iommu_hw_init(const struct mtk_iommu_data *data); static LIST_HEAD(m4ulist); /* List all the M4U HWs */ -#define for_each_m4u(data) list_for_each_entry(data, &m4ulist, list) +#define for_each_m4u(data, head) list_for_each_entry(data, head, list) struct mtk_iommu_iova_region { dma_addr_t iova_base; @@ -188,21 +189,10 @@ static const struct mtk_iommu_iova_region mt8192_multi_dom[] = { #endif }; -/* - * There may be 1 or 2 M4U HWs, But we always expect they are in the same domain - * for the performance. - * - * Here always return the mtk_iommu_data of the first probed M4U where the - * iommu domain information is recorded. - */ -static struct mtk_iommu_data *mtk_iommu_get_m4u_data(void) +/* If 2 M4U share a domain(use the same hwlist), Put the corresponding info in first data.*/ +static struct mtk_iommu_data *mtk_iommu_get_frst_data(struct list_head *hwlist) { - struct mtk_iommu_data *data; - - for_each_m4u(data) - return data; - - return NULL; + return list_first_entry(hwlist, struct mtk_iommu_data, list); } static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) @@ -212,7 +202,9 @@ static struct mtk_iommu_domain *to_mtk_domain(struct iommu_domain *dom) static void mtk_iommu_tlb_flush_all(struct mtk_iommu_data *data) { - for_each_m4u(data) { + struct list_head *head = data->hw_list; + + for_each_m4u(data, head) { if (pm_runtime_get_if_in_use(data->dev) <= 0) continue; @@ -229,12 +221,13 @@ static void mtk_iommu_tlb_flush_range_sync(unsigned long iova, size_t size, size_t granule, struct mtk_iommu_data *data) { + struct list_head *head = data->hw_list; bool has_pm = !!data->dev->pm_domain; unsigned long flags; int ret; u32 tmp; - for_each_m4u(data) { + for_each_m4u(data, head) { if (has_pm) { if (pm_runtime_get_if_in_use(data->dev) <= 0) continue; @@ -390,13 +383,14 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, unsigned int domid) { const struct mtk_iommu_iova_region *region; + struct list_head *head = data->hw_list; struct mtk_iommu_data *tmpdata; /* * Loop to find if there is already the exist domain. * Use it when 2 iommu HWs share the pgtable. */ - for_each_m4u(tmpdata) { + for_each_m4u(tmpdata, head) { if (!tmpdata->m4u_dom) continue; @@ -600,10 +594,12 @@ static void mtk_iommu_release_device(struct device *dev) static struct iommu_group *mtk_iommu_device_group(struct device *dev) { - struct mtk_iommu_data *data = mtk_iommu_get_m4u_data(); + struct mtk_iommu_data *c_data = dev_iommu_priv_get(dev), *data; + struct list_head *hw_list = c_data->hw_list; struct iommu_group *group; int domid; + data = mtk_iommu_get_frst_data(hw_list); if (!data) return ERR_PTR(-ENODEV); @@ -904,7 +900,15 @@ static int mtk_iommu_probe(struct platform_device *pdev) goto out_sysfs_remove; spin_lock_init(&data->tlb_lock); - list_add_tail(&data->list, &m4ulist); + + if (MTK_IOMMU_HAS_FLAG(data->plat_data, SHARE_PGTABLE)) { + list_add_tail(&data->list, data->plat_data->hw_list); + data->hw_list = data->plat_data->hw_list; + } else { + INIT_LIST_HEAD(&data->hw_list_head); + list_add_tail(&data->list, &data->hw_list_head); + data->hw_list = &data->hw_list_head; + } if (!iommu_present(&platform_bus_type)) { ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); @@ -1008,7 +1012,8 @@ static const struct dev_pm_ops mtk_iommu_pm_ops = { static const struct mtk_iommu_plat_data mt2712_data = { .m4u_plat = M4U_MT2712, - .flags = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG, + .flags = HAS_4GB_MODE | HAS_BCLK | HAS_VLD_PA_RNG | SHARE_PGTABLE, + .hw_list = &m4ulist, .inv_sel_reg = REG_MMU_INV_SEL_GEN1, .iova_region = single_domain, .iova_region_nr = ARRAY_SIZE(single_domain), diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index f81fa8862ed0..a41334b12b20 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -55,6 +55,7 @@ struct mtk_iommu_plat_data { u32 flags; u32 inv_sel_reg; + struct list_head *hw_list; unsigned int iova_region_nr; const struct mtk_iommu_iova_region *iova_region; unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; @@ -80,6 +81,8 @@ struct mtk_iommu_data { struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */ + struct list_head *hw_list; + struct list_head hw_list_head; struct list_head list; struct mtk_smi_larb_iommu larb_imu[MTK_LARB_NR_MAX]; }; -- 2.18.0