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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 8971FC38145 for ; Thu, 8 Sep 2022 10:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ELtVzzw1Jj1xOom7HPvs3Kk/VJ7H9plStynB/EPQpA0=; b=2K66ndL3SkFNkY JFl5kLQN55Yx2LWHneybpY7K19ByuB0YEtOGa7STnS50/jEFTgNRPkus7DMEaExDsGtd69wu1wEw8 Et/DKZEXTs4Otl4wHNLejSKWRlecrJ7gZp9ClfTk+o7PwjSMdj1a2i8n2zFLNgJBPIcarN0rQeaq9 HS9NN5CYDMzh6SOpb+m2FLEC0ae811hn0KxR097BBeK99Jw+AKKrLz6FytKTHPh7vqZ6SO2F5AQYc 3fWcvV7mZsGb74bvxSyNTS0JvTfvq3u4f9y90BU3ufQ6rD8Pr3HGG1x3VTEmN4s5IGo9EtklYbdTC PL8dcOYb9/gm1E3/4Dpw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWEYI-002HnJ-8g; Thu, 08 Sep 2022 10:14:30 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWEYE-002Hls-EY; Thu, 08 Sep 2022 10:14:28 +0000 X-UUID: a436b10ac78145708b90587fd8bb2a12-20220908 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=trAVb6VnzvU7/puWpO46KfN9AIa8AF7fJCjsxmjkW6g=; b=mf3+go/05fzT4WWK8EE1e4cagu8Uu+pTyxFCh8sMmMNofYusgEU280b204QuS02RlISD+F72wQo6dsMoNoRFTMF9zDNRVYDtdH0rkmm5Og2MyBf7L9eoHRtspRn0VRQLAaPiU7i40pxs8P88WbtALV96qEoAO0asl8u2PPDMon8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.10,REQID:4cf1eab5-d2c2-41e3-b80b-6cd97f83835f,OB:0,L OB:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_ Ham,ACTION:release,TS:0 X-CID-META: VersionHash:84eae18,CLOUDID:a215d1eb-2856-4fce-b125-09d4c7ebe045,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: a436b10ac78145708b90587fd8bb2a12-20220908 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 177457100; Thu, 08 Sep 2022 03:14:22 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 8 Sep 2022 18:03:44 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 8 Sep 2022 18:03:43 +0800 Message-ID: <1cf216299b1a061d16ba56956b0b9f8f51a836e9.camel@mediatek.com> Subject: Re: [PATCH v2 2/3] iommu/mediatek: Add enable IOMMU SMC command for INFRA master From: Chengci.Xu To: Yong Wu CC: , , , , , , Joerg Roedel , Will Deacon , Robin Murphy , Rob Herring , "Krzysztof Kozlowski" , Matthias Brugger Date: Thu, 8 Sep 2022 18:03:43 +0800 In-Reply-To: <9ceced14196f19c38867cc3a2ded979ac25079c8.camel@mediatek.com> References: <20220831125502.7818-1-chengci.xu@mediatek.com> <20220831125502.7818-3-chengci.xu@mediatek.com> <9ceced14196f19c38867cc3a2ded979ac25079c8.camel@mediatek.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220908_031426_504148_41CA7AFB X-CRM114-Status: GOOD ( 28.94 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 2022-09-07 at 11:37 +0800, Yong Wu wrote: > On Wed, 2022-08-31 at 20:55 +0800, Chengci.Xu wrote: > > The register which can enable IOMMU for INFRA master should be > > setted > > in secure world for security concerns. Therefore, we add a SMC > > command > > for INFRA master to enable/disable INFRA IOMMU in ATF. This > > function > > is > > prepared for MT8188. > > > > Signed-off-by: Chengci.Xu > > --- > > drivers/iommu/mtk_iommu.c | 34 ++++++++++++++++++++++++++-------- > > include/soc/mediatek/smi.h | 1 + > > 2 files changed, 27 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > > index 7e363b1f24df..6fe780783ec8 100644 > > --- a/drivers/iommu/mtk_iommu.c > > +++ b/drivers/iommu/mtk_iommu.c > > @@ -3,6 +3,7 @@ > > * Copyright (c) 2015-2016 MediaTek Inc. > > * Author: Yong Wu > > */ > > +#include > > #include > > #include > > #include > > @@ -28,6 +29,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > > > @@ -138,6 +140,7 @@ > > #define PM_CLK_AO BIT(15) > > #define IFA_IOMMU_PCIE_SUPPORT BIT(16) > > #define PGTABLE_PA_35_EN BIT(17) > > +#define CFG_IFA_MASTER_IN_ATF BIT(18) > > > > #define MTK_IOMMU_HAS_FLAG_MASK(pdata, _x, mask) \ > > ((((pdata)->flags) & (mask)) == (_x)) > > @@ -554,14 +557,29 @@ static int mtk_iommu_config(struct > > mtk_iommu_data *data, struct device *dev, > > 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); > > - /* PCI dev has only one output id, enable the > > next writing bit for PCIe */ > > - if (dev_is_pci(dev)) > > - peri_mmuen_msk |= BIT(portid + 1); > > - > > - peri_mmuen = enable ? peri_mmuen_msk : 0; > > - ret = regmap_update_bits(data->pericfg, > > PERICFG_IOMMU_1, > > - peri_mmuen_msk, > > peri_mmuen); > > + if (MTK_IOMMU_HAS_FLAG(data->plat_data, > > CFG_IFA_MASTER_IN_ATF)) { > > + struct arm_smccc_res res; > > + > > + portid = MTK_M4U_TO_PORT(fwspec- > > > ids[i]); > > > > + arm_smccc_smc(MTK_SIP_KERNEL_IOMMU_CONT > > ROL, > > + IOMMU_ATF_CMD_CONFIG_INFR > > A_IOMMU, > > + portid, enable, 0, 0, 0, > > 0, &res); > > + ret = (int)res.a0; > > Too many indentations. Please create a new interface or even just use > "if", like: > > if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_MM)) { > xx > } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA && > MTK_IOMMU_HAS_FLAG(data->plat_data, > CFG_IFA_MASTER_IN_ATF)) > { /* Configure the mmu_en in the ATF for infra IOMMU */ > xx > } else if (MTK_IOMMU_IS_TYPE(data->plat_data, MTK_IOMMU_TYPE_INFRA) { > } > Thanks for your review. We will use the second way to reduce indentations. Best regards, Chengci Xu > > + > > + } else { > > + peri_mmuen_msk = BIT(portid); > > + /* PCI dev has only one output id, > > + * enable the next writing bit for PCIe > > + */ > > + if (dev_is_pci(dev)) > > + peri_mmuen_msk |= BIT(portid + > > 1); > > + > > + 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", > > diff --git a/include/soc/mediatek/smi.h > > b/include/soc/mediatek/smi.h > > index dfd8efca5e60..99f13b0e416d 100644 > > --- a/include/soc/mediatek/smi.h > > +++ b/include/soc/mediatek/smi.h > > @@ -13,6 +13,7 @@ > > > > enum iommu_atf_cmd { > > IOMMU_ATF_CMD_CONFIG_SMI_LARB, /* For mm master to > > en/disable iommu */ > > + IOMMU_ATF_CMD_CONFIG_INFRA_IOMMU, /* For infra master > > en/disable iommu */ > > IOMMU_ATF_CMD_MAX, > > }; > > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel