Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4904010pxv; Tue, 29 Jun 2021 19:41:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxAyAQyclEbSUAOdjzOvq9jvae79Yo47yhQIxeH4o/CLwq9lWXH6FeclDdxSL9h6DDucmUa X-Received: by 2002:a50:ec08:: with SMTP id g8mr18513677edr.98.1625020880496; Tue, 29 Jun 2021 19:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625020880; cv=none; d=google.com; s=arc-20160816; b=ieyQNiqya/FW5ApPIfxsHsLbWYGQ+2GoQAUMIif/UvR6mUQnnyCZZYmiKhZbBUTKq/ kO93il24+ktv/lIteAIBLlOC524g+TDCuqIul/EoQJwCVGd2LJUwOewQiFV/zLeW/1eV awhKBt44TYTybDXmw446kgb2B1frs2Y+eroLSBeXSi9IyzGTRBEQjop5LpupNjFoA7o4 KSj5jWzoHo28zQBSE3IMxkGzh80dT/LoPtM906e94AViAhEHWYRdb6RqPIZ3rR+XQI3S SEykYyBjEGG9dyQwgnCGeluOdMXZsjFjgb6mntYTTMBv5BMcktvNcTdfTB8KP+jM9G9p omXg== 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=A//BAUSB5xPNcPUlzcvMOCwy5I51vrxfTrICBarth0A=; b=KmozTo/z5QqnIHnwfHH1AwqOVFOMAK10+/WSVav34eJlM1V6OkFHcFbk4tQ5SFmrhh B7eZFQsr+TfvCEeL5Q1Dmwk0IFETKPlShLmx1YrVs3oIvXtzMpKqqxvPOr3D9P5RAZqZ 4n/MsgzBq2hfaz5lT4j2xyIsAETX8GJ98z22NywiaIuUaM4SEr5QIIbd0SbzyNEJW3i5 YZF8XndicRnIfm36mdt5cRm6+RqQSuNsWHA2LOLp4t5Uxd8+SJgTcukJtIbg1Bu8vTfe HRdN0kSBke8L+8RnWP+MUnpsxs65CH6y9kPrm+GZ+s4xK63+lzR0zzvoqeRywR5hGKDw ihpA== 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 p17si19018587edq.574.2021.06.29.19.40.56; Tue, 29 Jun 2021 19:41:20 -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 S233586AbhF3Cki (ORCPT + 99 others); Tue, 29 Jun 2021 22:40:38 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:35390 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S232730AbhF3Ckh (ORCPT ); Tue, 29 Jun 2021 22:40:37 -0400 X-UUID: 570be37dd8d64a85807a872ac176b1a9-20210630 X-UUID: 570be37dd8d64a85807a872ac176b1a9-20210630 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2007470189; Wed, 30 Jun 2021 10:38:05 +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; Wed, 30 Jun 2021 10:38:04 +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:38:03 +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 21/24] iommu/mediatek: Change the domid to iova_region_id Date: Wed, 30 Jun 2021 10:35:01 +0800 Message-ID: <20210630023504.18177-22-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 This patch also have no functional change. In the previous SoC, each a iova_region is a domain; In the multi-banks case, each a bank is a domain; then the original function name "mtk_iommu_get_domain_id" is not proper. the name "iova_region_id" should be proper. this patch only rename the domid to iova_region_id. This is preparing for adding bankid. Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index 042489b8e402..8137cfc9c8b9 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -344,8 +344,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) return IRQ_HANDLED; } -static int mtk_iommu_get_domain_id(struct device *dev, - const struct mtk_iommu_plat_data *plat_data) +static int mtk_iommu_get_iova_region_id(struct device *dev, + const struct mtk_iommu_plat_data *plat_data) { const struct mtk_iommu_iova_region *rgn = plat_data->iova_region; const struct bus_dma_region *dma_rgn = dev->dma_range_map; @@ -375,7 +375,7 @@ static int mtk_iommu_get_domain_id(struct device *dev, } static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, - bool enable, unsigned int domid) + bool enable, unsigned int regionid) { struct mtk_smi_larb_iommu *larb_mmu; unsigned int larbid, portid; @@ -391,12 +391,12 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) { larb_mmu = &data->larb_imu[larbid]; - region = data->plat_data->iova_region + domid; + region = data->plat_data->iova_region + regionid; larb_mmu->bank[portid] = upper_32_bits(region->iova_base); - dev_dbg(dev, "%s iommu for larb(%s) port %d dom %d bank %d.\n", + dev_dbg(dev, "%s iommu for larb(%s) port %d region %d bank %d.\n", enable ? "enable" : "disable", dev_name(larb_mmu->dev), - portid, domid, larb_mmu->bank[portid]); + portid, regionid, larb_mmu->bank[portid]); if (enable) larb_mmu->mmu |= MTK_SMI_MMU_EN(portid); @@ -423,7 +423,7 @@ static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, struct mtk_iommu_data *data, - unsigned int domid) + unsigned int region_id) { const struct mtk_iommu_iova_region *region; struct list_head *head = data->hw_list; @@ -470,7 +470,7 @@ static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, update_iova_region: /* Update the iova region for this domain */ - region = data->plat_data->iova_region + domid; + region = data->plat_data->iova_region + region_id; dom->domain.geometry.aperture_start = region->iova_base; dom->domain.geometry.aperture_end = region->iova_base + region->size - 1; dom->domain.geometry.force_aperture = true; @@ -510,15 +510,15 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, struct mtk_iommu_bank_data *bank; struct device *m4udev = data->dev; unsigned int bankid = 0; - int ret, domid; + int ret, region_id; - domid = mtk_iommu_get_domain_id(dev, data->plat_data); - if (domid < 0) - return domid; + region_id = mtk_iommu_get_iova_region_id(dev, data->plat_data); + if (region_id < 0) + return region_id; bank = &data->bank[bankid]; if (!dom->bank) { - if (mtk_iommu_domain_finalise(dom, data, domid)) + if (mtk_iommu_domain_finalise(dom, data, region_id)) return -ENODEV; dom->bank = bank; } @@ -540,7 +540,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, pm_runtime_put(m4udev); } - return mtk_iommu_config(data, dev, true, domid); + return mtk_iommu_config(data, dev, true, region_id); } static void mtk_iommu_detach_device(struct iommu_domain *domain, @@ -644,21 +644,21 @@ 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; - int domid; + int regionid; data = mtk_iommu_get_frst_data(hw_list); if (!data) return ERR_PTR(-ENODEV); - domid = mtk_iommu_get_domain_id(dev, data->plat_data); - if (domid < 0) - return ERR_PTR(domid); + regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data); + if (regionid < 0) + return ERR_PTR(regionid); - group = data->m4u_group[domid]; + group = data->m4u_group[regionid]; if (!group) { group = iommu_group_alloc(); if (!IS_ERR(group)) - data->m4u_group[domid] = group; + data->m4u_group[regionid] = group; } else { iommu_group_ref_get(group); } @@ -691,14 +691,14 @@ static void mtk_iommu_get_resv_regions(struct device *dev, struct list_head *head) { struct mtk_iommu_data *data = dev_iommu_priv_get(dev); - unsigned int domid = mtk_iommu_get_domain_id(dev, data->plat_data), i; + unsigned int regionid = mtk_iommu_get_iova_region_id(dev, data->plat_data), i; const struct mtk_iommu_iova_region *resv, *curdom; struct iommu_resv_region *region; int prot = IOMMU_WRITE | IOMMU_READ; - if ((int)domid < 0) + if ((int)regionid < 0) return; - curdom = data->plat_data->iova_region + domid; + curdom = data->plat_data->iova_region + regionid; for (i = 0; i < data->plat_data->iova_region_nr; i++) { resv = data->plat_data->iova_region + i; -- 2.18.0