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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3119FC433E1 for ; Tue, 30 Jun 2020 11:57:00 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E80FC20702 for ; Tue, 30 Jun 2020 11:56:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="is6ty48i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E80FC20702 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8D183228A7; Tue, 30 Jun 2020 11:56:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xSeSzwY+R63v; Tue, 30 Jun 2020 11:56:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 69AE7226AF; Tue, 30 Jun 2020 11:56:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 47DC7C0865; Tue, 30 Jun 2020 11:56:57 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id A4CBDC016E for ; Tue, 30 Jun 2020 11:56:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8D46987814 for ; Tue, 30 Jun 2020 11:56:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QTJB81Gywqmo for ; Tue, 30 Jun 2020 11:56:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by whitealder.osuosl.org (Postfix) with ESMTP id 08C0785DA4 for ; Tue, 30 Jun 2020 11:56:54 +0000 (UTC) X-UUID: acbe87f48cc347faa2897a3ee950e7a3-20200630 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=HEj432Y5eOzIfGm1gnGAexzqR2J4nebaJR/lmOThafM=; b=is6ty48ih2i0o2tplaZwkH9HMVsOctHzwh1CUBQWFymJsZXADP4tnSdXSuELridBfLddbYj9XlDc45k8T7sxynQsg9HSRnKKNHYyfIvQzBVKpig/wlmO3Qez05Lgrdun28+VNUpGL4A4rWgS+jTGO24eWG16Xbgl9o6034KEkOk=; X-UUID: acbe87f48cc347faa2897a3ee950e7a3-20200630 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 962540657; Tue, 30 Jun 2020 19:56:52 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Jun 2020 19:56:47 +0800 Received: from [10.15.20.246] (10.15.20.246) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 30 Jun 2020 19:56:47 +0800 Message-ID: <1593518147.7022.3.camel@mbjsdccf07> Subject: Re: [PATCH v5 03/10] iommu/mediatek: Modify the usage of mtk_iommu_plat_data structure From: chao hao To: Yong Wu Date: Tue, 30 Jun 2020 19:55:47 +0800 In-Reply-To: <1593514600.24171.26.camel@mhfsdcap03> References: <20200629071310.1557-1-chao.hao@mediatek.com> <20200629071310.1557-4-chao.hao@mediatek.com> <1593514600.24171.26.camel@mhfsdcap03> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 09C13065B4FA34BD99E063267093959635537950F689927C89C089AD58FAF52D2000:8 X-MTK: N Cc: devicetree@vger.kernel.org, FY Yang , wsd_upstream@mediatek.com, linux-kernel@vger.kernel.org, Evan Green , Chao Hao , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Tue, 2020-06-30 at 18:56 +0800, Yong Wu wrote: > Hi Chao, > > This is also ok for me. Only two format nitpick. > > On Mon, 2020-06-29 at 15:13 +0800, Chao Hao wrote: > > Given the fact that we are adding more and more plat_data bool values, > > it would make sense to use a u32 flags register and add the appropriate > > macro definitions to set and check for a flag present. > > No functional change. > > > > Suggested-by: Matthias Brugger > > Signed-off-by: Chao Hao > > --- > > [snip] > > > static const struct mtk_iommu_plat_data mt2712_data = { > > .m4u_plat = M4U_MT2712, > > - .has_4gb_mode = true, > > - .has_bclk = true, > > - .has_vld_pa_rng = true, > > + .flags = HAS_4GB_MODE | > > + HAS_BCLK | > > + HAS_VLD_PA_RNG, > > short enough. we can put it in one line? ok, I will try to put it in one line in next version, thanks > > > .larbid_remap = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, > > }; > > > > static const struct mtk_iommu_plat_data mt8173_data = { > > .m4u_plat = M4U_MT8173, > > - .has_4gb_mode = true, > > - .has_bclk = true, > > - .reset_axi = true, > > + .flags = HAS_4GB_MODE | > > + HAS_BCLK | > > + RESET_AXI, > > .larbid_remap = {0, 1, 2, 3, 4, 5}, /* Linear mapping. */ > > }; > > > > static const struct mtk_iommu_plat_data mt8183_data = { > > .m4u_plat = M4U_MT8183, > > - .reset_axi = true, > > + .flags = RESET_AXI, > > .larbid_remap = {0, 4, 5, 6, 7, 2, 3, 1}, > > }; > > > > diff --git a/drivers/iommu/mtk_iommu.h b/drivers/iommu/mtk_iommu.h > > index 1b6ea839b92c..7cc39f729263 100644 > > --- a/drivers/iommu/mtk_iommu.h > > +++ b/drivers/iommu/mtk_iommu.h > > @@ -17,6 +17,15 @@ > > #include > > #include > > > > +#define HAS_4GB_MODE BIT(0) > > +/* HW will use the EMI clock if there isn't the "bclk". */ > > +#define HAS_BCLK BIT(1) > > +#define HAS_VLD_PA_RNG BIT(2) > > +#define RESET_AXI BIT(3) > > + > > +#define MTK_IOMMU_HAS_FLAG(pdata, _x) \ > > + ((((pdata)->flags) & (_x)) == (_x)) > > If these definitions are not used in mtk_iommu_v1.c(also no this plan), > then we can put them in the mtk_iommu.c. > ok, mtk_iommu_v1.c doesn't use these definitions. I will move them to mtk_iommu.c in next version, thanks. > > BTW, the patch title "modify the usage of mtk_iommu_plat_data structure" > isn't so clear, we could write what the detailed modification is. > something like: > iommu/mediatek: Use a u32 flags to describe different HW features > got it , thanks for you advice. > > + > > struct mtk_iommu_suspend_reg { > > u32 misc_ctrl; > > u32 dcm_dis; > > @@ -36,12 +45,7 @@ enum mtk_iommu_plat { > > > > struct mtk_iommu_plat_data { > > enum mtk_iommu_plat m4u_plat; > > - bool has_4gb_mode; > > - > > - /* HW will use the EMI clock if there isn't the "bclk". */ > > - bool has_bclk; > > - bool has_vld_pa_rng; > > - bool reset_axi; > > + u32 flags; > > unsigned char larbid_remap[MTK_LARB_NR_MAX]; > > }; > > > > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu