Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp503285pxb; Thu, 23 Sep 2021 05:05:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXx6M3Bf+iydbSk65Q5OIsjaDvmtliikB4iztt+jwcJdkG5QRiX8TJ8mrA5zde+/8JkQmQ X-Received: by 2002:a17:906:ecf4:: with SMTP id qt20mr4483042ejb.375.1632398703676; Thu, 23 Sep 2021 05:05:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632398703; cv=none; d=google.com; s=arc-20160816; b=EXG4E69bQVVIvZVWyrj7tSBTE5Xb/LPmza2kvFiBDCz1quX7zXmDx+HFmvUYYzBiPP jNHvKt6/2yV45U2VPfTUAAJcwK98nJq4tM4CCNOXJBq2tWLw9oqyiYG3sh5GOFrx7k7p JYcVjJ2dfMV+Su6gyflZxheellge5Y492SMLYOm3/6LMm6fuxozkgFU1ClDBMXkwplxu wIv0nyiAcd/VAZw622GHaMO5WsQeklKvdRIQxr6HeKR012Xwo9NRHINwknM9Sy+HaAJy 0qUtNqdzCfYBGiVuJksdMas4U8/l0D7i1UsF6G7tPs/j3HRvISZm+zv76Ws6K/6iAHl/ Cmug== 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=YT2uBVNUx1wk3XYRypjnrQA+NsAVulkEB1wIuOFmAGI=; b=TDxJHcVXiI0nylW/m5mV0hTSTsiJMqSsQC/JVqctnlPDXfsaJWXYMzdOA5AwCs7poy JWd4nXm4o+WnoJl8HU+WulSaUUz8Soxokn7Bh+Mbsh78v1OJSMm1Im2PVuyJYqZtckWE sf20fskpryF0jzcwD3HiRuHt4LzgzNbs7bb6X+pEoHybYsRZyx6bsNjL7qsoxLbPt4x6 LH0nIMpNoFhK+zwDGDk5kdD7YR/EsXC7RZVxX10bpMX2p4jZXeyuQscuNU0mjgQDcLFS 1kAVFOlPghZjIXfGMaX3K8sfGxQDZKhstS6R+iyuKAelnaO0GA4+gZ+6pdiOxy2aDD52 YSlQ== 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 bh6si5640648ejb.691.2021.09.23.05.04.38; Thu, 23 Sep 2021 05:05:03 -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 S240916AbhIWMEH (ORCPT + 99 others); Thu, 23 Sep 2021 08:04:07 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:53808 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S240902AbhIWMD7 (ORCPT ); Thu, 23 Sep 2021 08:03:59 -0400 X-UUID: d14e2240ecf5477fa5f88ec2107b2f67-20210923 X-UUID: d14e2240ecf5477fa5f88ec2107b2f67-20210923 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 589877884; Thu, 23 Sep 2021 20:02:24 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs07n2.mediatek.inc (172.21.101.141) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 23 Sep 2021 20:02:23 +0800 Received: from localhost.localdomain (10.17.3.154) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 23 Sep 2021 20:02:22 +0800 From: Yong Wu To: Joerg Roedel , Rob Herring , Matthias Brugger , Will Deacon , Robin Murphy CC: Krzysztof Kozlowski , Tomasz Figa , , , , , , , Hsin-Yi Wang , , , , , Subject: [PATCH v3 21/33] iommu/mediatek: Add infra iommu support Date: Thu, 23 Sep 2021 19:58:28 +0800 Message-ID: <20210923115840.17813-22-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210923115840.17813-1-yong.wu@mediatek.com> References: <20210923115840.17813-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 The infra iommu enable bits in mt8195 is in the pericfg register segment, use regmap to update it. If infra iommu master translation fault, It don't have the larbid/portid, thus print out the whole register value. Since regmap_update_bits may fail, add return value for mtk_iommu_config. Signed-off-by: Yong Wu --- drivers/iommu/mtk_iommu.c | 36 +++++++++++++++++++++++++++++------- drivers/iommu/mtk_iommu.h | 2 ++ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c index d103e4f33078..37d6dfb4feab 100644 --- a/drivers/iommu/mtk_iommu.c +++ b/drivers/iommu/mtk_iommu.c @@ -112,6 +112,8 @@ #define MTK_PROTECT_PA_ALIGN 256 +#define PERICFG_IOMMU_1 0x714 + #define HAS_4GB_MODE BIT(0) /* HW will use the EMI clock if there isn't the "bclk". */ #define HAS_BCLK BIT(1) @@ -324,8 +326,8 @@ static irqreturn_t mtk_iommu_isr(int irq, void *dev_id) write ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ)) { dev_err_ratelimited( data->dev, - "fault type=0x%x iova=0x%llx pa=0x%llx larb=%d port=%d layer=%d %s\n", - int_state, fault_iova, fault_pa, fault_larb, fault_port, + "fault type=0x%x iova=0x%llx pa=0x%llx master=0x%x(larb=%d port=%d) layer=%d %s\n", + int_state, fault_iova, fault_pa, regval, fault_larb, fault_port, layer, write ? "write" : "read"); } @@ -369,14 +371,15 @@ static int mtk_iommu_get_domain_id(struct device *dev, return -EINVAL; } -static void mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, - bool enable, unsigned int domid) +static int mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, + bool enable, unsigned int domid) { struct mtk_smi_larb_iommu *larb_mmu; unsigned int larbid, portid; struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); const struct mtk_iommu_iova_region *region; - int i; + u32 peri_mmuen, peri_mmuen_msk; + int i, ret = 0; for (i = 0; i < fwspec->num_ids; ++i) { larbid = MTK_M4U_TO_LARB(fwspec->ids[i]); @@ -396,8 +399,19 @@ static void mtk_iommu_config(struct mtk_iommu_data *data, struct device *dev, larb_mmu->mmu |= MTK_SMI_MMU_EN(portid); else larb_mmu->mmu &= ~MTK_SMI_MMU_EN(portid); + } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA)) { + peri_mmuen_msk = BIT(portid); + peri_mmuen = enable ? peri_mmuen_msk : 0; + + ret = regmap_update_bits(data->pericfg, PERICFG_IOMMU_1, + peri_mmuen_msk, peri_mmuen); + if (ret) + dev_err(dev, "%s iommu(%s) inframaster 0x%x fail(%d).\n", + enable ? "enable" : "disable", + dev_name(data->dev), peri_mmuen_msk, ret); } } + return ret; } static int mtk_iommu_domain_finalise(struct mtk_iommu_domain *dom, @@ -504,8 +518,7 @@ static int mtk_iommu_attach_device(struct iommu_domain *domain, pm_runtime_put(m4udev); } - mtk_iommu_config(data, dev, true, domid); - return 0; + return mtk_iommu_config(data, dev, true, domid); } static void mtk_iommu_detach_device(struct iommu_domain *domain, @@ -921,6 +934,15 @@ static int mtk_iommu_probe(struct platform_device *pdev) ret = mtk_iommu_mm_dts_parse(dev, &match, data); if (ret) goto out_runtime_disable; + } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) && + data->plat_data->pericfg_comp_str) { + infracfg = syscon_regmap_lookup_by_compatible(data->plat_data->pericfg_comp_str); + if (IS_ERR(infracfg)) { + ret = PTR_ERR(infracfg); + goto out_runtime_disable; + } + + data->pericfg = infracfg; } platform_set_drvdata(pdev, data); diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h index 5b32277fee99..d83c79bf800a 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; + char *pericfg_comp_str; struct list_head *hw_list; unsigned int iova_region_nr; const struct mtk_iommu_iova_region *iova_region; @@ -80,6 +81,7 @@ struct mtk_iommu_data { struct device *smicomm_dev; struct dma_iommu_mapping *mapping; /* For mtk_iommu_v1.c */ + struct regmap *pericfg; /* * In the sharing pgtable case, list data->list to the global list like m4ulist. -- 2.18.0