Received: by 2002:a05:6a10:8a4d:0:0:0:0 with SMTP id dn13csp529058pxb; Thu, 12 Aug 2021 23:58:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycFt4TjotKWuGkn8NnEn/PoRIEUvwAd2ey//xvpto4ilK00TEesPhLwKTP34SddriXxbs9 X-Received: by 2002:a6b:b306:: with SMTP id c6mr944811iof.24.1628837926963; Thu, 12 Aug 2021 23:58:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628837926; cv=none; d=google.com; s=arc-20160816; b=lxzRXnsuZPHWzuoF4hRO6x9XBIaVaFmi/URbRub5NLZd95rtSMdJ0Lu83F3haUKyBx zuG+pPFeSW4DvURQMFuMKzzfCELWuhkXpfuq8s4AbyA85tCbzwU0NBYS6jjDJktwv0+l CDLz6Iu0bUktPOfnIeGcTwNNCLc9Nfu8YAlNP/owxqTfDJjqc6B7cBmtw97ibZoyZV98 y/V6goHdn2NWb7yhK51kJiPIEfwPtQ2P8dKSH6R3/RtDrJBfM0HPnlCFxdf4oghdvj6L 1ng9D1O/uPYeXni66dH6YCtcljVw0jyNgED+d0OI0l/uMnAVamEjd8BphuNwcF8x8oBY mjSA== 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=UpXk41E0JhRw9X5XQK6mmc3oUiltBaX35RWYoRIc85w=; b=SD0sads/2nbBkOJzTUoieBMH3vhWQwrdtlsT4t0EnnleHamOiWjC9gaBRXl79pXEmZ zJaSbqcEZbJQBVHtBDkrhy8SZ7Hww2JOsn9h43WPQ0ix+pMzbDjRfGYOvTBt1MS+nWdx KzxDweTT+iH/AVFNvoprx7YabJdIDNPRNvFb6VuUFa7xSVHn0Adva6Bpw+Nm8UvDWltY XpYuTFy64+HLVG4oTrbxUdN8FUEiU1r5bzvpK04BSeEh3jKtXq2qQllafCpGoFDrvRPm rclVBqgMRZgeUa2yiud0FsyYKfX2rPbLg/+IYivvSo72x9WDi+pg5E+nr/xxXhm/naJY Wd9A== 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 r11si890316ill.21.2021.08.12.23.58.36; Thu, 12 Aug 2021 23:58:46 -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 S239083AbhHMG5w (ORCPT + 99 others); Fri, 13 Aug 2021 02:57:52 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:41068 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S238964AbhHMG5u (ORCPT ); Fri, 13 Aug 2021 02:57:50 -0400 X-UUID: dd2aed077ddb47d3a04cdf1b5beb04e9-20210813 X-UUID: dd2aed077ddb47d3a04cdf1b5beb04e9-20210813 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 811913677; Fri, 13 Aug 2021 14:57:21 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 13 Aug 2021 14:57:19 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 13 Aug 2021 14:57:18 +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 v2 26/29] iommu/mediatek: Get the proper bankid for multi banks Date: Fri, 13 Aug 2021 14:53:21 +0800 Message-ID: <20210813065324.29220-27-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210813065324.29220-1-yong.wu@mediatek.com> References: <20210813065324.29220-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 We preassign some ports in a special bank via the new defined bank_portmsk. Put it in the plat_data means it is not expected to be adjusted dynamically. If the iommu id in the iommu consumer's dtsi node is inside this bank_portmsk, then we switch it to this special iommu bank, and initialise the IOMMU bank HW. Each a bank has the independent pgtable(4GB iova range). Each a bank is a independent iommu domain/group. Currently we don't separate different iova ranges inside a bank. Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 38 +++++++++++++++++++++++++++++++++++--- drivers/iommu/mtk_iommu.h | 1 + 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 29b9ab528774..ce83569eec21 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -358,6 +358,30 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) return IRQ_HANDLED; } +static unsigned int mtk_iommu_get_bank_id(struct device *dev, + const struct mtk_iommu_plat_data *plat_data) +{ + struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + unsigned int i, portmsk = 0, bankid = 0; /* bank default is 0 */ + + if (plat_data->bank_nr == 1) + return bankid; + + for (i = 0; i < fwspec->num_ids; i++) + portmsk |= BIT(MTK_M4U_TO_PORT(fwspec->ids[i])); + + for (i = 0; i < plat_data->bank_nr; i++) { + if (!plat_data->bank_enable[i]) + continue; + + if (portmsk & plat_data->bank_portmsk[i]) { + bankid = i; + break; + } + } + return bankid; +} + static int mtk_iommu_get_iova_region_id(struct device *dev, const struct mtk_iommu_plat_data *plat_data) { @@ -516,13 +540,14 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, struct list_head *hw_list = data->hw_list; struct mtk_iommu_bank_data *bank; struct device *m4udev = data->dev; - unsigned int bankid = 0; + unsigned int bankid; int ret, region_id; region_id = mtk_iommu_get_iova_region_id(dev, data->plat_data); if (region_id < 0) return region_id; + bankid = mtk_iommu_get_bank_id(dev, data->plat_data); bank = &data->bank[bankid]; if (!dom->bank) { /* Data is in the frstdata in sharing pgtable case. */ @@ -653,6 +678,7 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) 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; + unsigned int bankid, groupid; int regionid; data = mtk_iommu_get_frst_data(hw_list); @@ -662,12 +688,18 @@ static struct iommu_group *mtk_iommu_device_group(struct device *dev) regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data); if (regionid < 0) return ERR_PTR(regionid); + bankid = mtk_iommu_get_bank_id(dev, data->plat_data); - group = data->m4u_group[regionid]; + /* + * If the bank function is enabled, each a bank is a iommu group/domain. + * otherwise, each a iova region is a iommu group/domain. + */ + groupid = bankid ? bankid : regionid; + group = data->m4u_group[groupid]; if (!group) { group = iommu_group_alloc(); if (!IS_ERR(group)) - data->m4u_group[regionid] = group; + data->m4u_group[groupid] = group; } else { iommu_group_ref_get(group); } diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index 7a8d6a233d14..905d8740dbcf 100644 --- a/drivers/iommu/mtk_iommu.h +++ b/drivers/iommu/mtk_iommu.h @@ -65,6 +65,7 @@ struct mtk_iommu_plat_data { unsigned int bank_nr; bool bank_enable[MTK_IOMMU_BANK_MAX]; + unsigned int bank_portmsk[MTK_IOMMU_BANK_MAX]; unsigned char larbid_remap[MTK_LARB_COM_MAX][MTK_LARB_SUBCOM_MAX]; }; -- 2.18.0