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=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 ACD0AC63697 for ; Thu, 26 Nov 2020 16:10:05 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 2981F206C0 for ; Thu, 26 Nov 2020 16:10:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="j1Z1ZdJt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2981F206C0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RWPOCPksQKDLBs0bYElU0mt9ArRDYcMQDMLa8Bt/QJQ=; b=j1Z1ZdJt4Jr4v44OTgOqjGwka OXeeViF5Ywa0hQNrG/Tvr0FCZjd4VgeWVqoTSAoPdMUFEIYIaDI8dIsjuDsPQRVxw/J1ucrHQ/+EZ za0q3zv7feaHivCSZQWKH/nLTHO2bYvZBS5lZm36jlbmt7DCj0rOX+YL6qll6C5U+Be7+B8gmMWCZ WQlsBQnTAOkEm0CVl+m3u7ZyT0AlNdH3oQRl+zRYMF1ZFZoaK3A3g04yIlmgaNS0kqgrpibUQkcgr dZTJfuIzVvyf2vLAuaZ2dzcu4KU7tLYqybSbNSxB0xo563nWDGkaxly3NKNlLH6yjuapsvRnGaiY9 aJN+DrF8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiJqH-0005ZO-8a; Thu, 26 Nov 2020 16:09:57 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kiJqD-0005YI-0c; Thu, 26 Nov 2020 16:09:54 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 91F1231B; Thu, 26 Nov 2020 08:09:51 -0800 (PST) Received: from [10.57.59.159] (unknown [10.57.59.159]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4972F3F23F; Thu, 26 Nov 2020 08:09:47 -0800 (PST) Subject: Re: [PATCH v4 10/24] iommu/io-pgtable-arm-v7s: Add cfg as a param in some macros To: Yong Wu , Joerg Roedel , Matthias Brugger , Rob Herring , Will Deacon References: <20201111123838.15682-1-yong.wu@mediatek.com> <20201111123838.15682-11-yong.wu@mediatek.com> From: Robin Murphy Message-ID: <95880abb-45e3-3c3c-15f2-b255276084c4@arm.com> Date: Thu, 26 Nov 2020 16:09:46 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20201111123838.15682-11-yong.wu@mediatek.com> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201126_110953_329864_37939320 X-CRM114-Status: GOOD ( 25.03 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , srv_heupstream@mediatek.com, Tomasz Figa , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Evan Green , chao.hao@mediatek.com, iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , anan.sun@mediatek.com, kernel-team@android.com, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On 2020-11-11 12:38, Yong Wu wrote: > Add "cfg" as a parameter for some macros. This is a preparing patch for > mediatek extend the lvl1 pgtable. No functional change. Reviewed-by: Robin Murphy > Signed-off-by: Yong Wu > Acked-by: Will Deacon > --- > drivers/iommu/io-pgtable-arm-v7s.c | 36 +++++++++++++++--------------- > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > index 58cc201c10a3..0b3c5b904ddc 100644 > --- a/drivers/iommu/io-pgtable-arm-v7s.c > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > @@ -47,21 +47,21 @@ > * and 12 bits in a page. > */ > #define ARM_V7S_ADDR_BITS 32 > -#define _ARM_V7S_LVL_BITS(lvl) ((lvl) == 1 ? 12 : 8) > +#define _ARM_V7S_LVL_BITS(lvl, cfg) ((lvl) == 1 ? 12 : 8) > #define ARM_V7S_LVL_SHIFT(lvl) ((lvl) == 1 ? 20 : 12) > #define ARM_V7S_TABLE_SHIFT 10 > > -#define ARM_V7S_PTES_PER_LVL(lvl) (1 << _ARM_V7S_LVL_BITS(lvl)) > -#define ARM_V7S_TABLE_SIZE(lvl) \ > - (ARM_V7S_PTES_PER_LVL(lvl) * sizeof(arm_v7s_iopte)) > +#define ARM_V7S_PTES_PER_LVL(lvl, cfg) (1 << _ARM_V7S_LVL_BITS(lvl, cfg)) > +#define ARM_V7S_TABLE_SIZE(lvl, cfg) \ > + (ARM_V7S_PTES_PER_LVL(lvl, cfg) * sizeof(arm_v7s_iopte)) > > #define ARM_V7S_BLOCK_SIZE(lvl) (1UL << ARM_V7S_LVL_SHIFT(lvl)) > #define ARM_V7S_LVL_MASK(lvl) ((u32)(~0U << ARM_V7S_LVL_SHIFT(lvl))) > #define ARM_V7S_TABLE_MASK ((u32)(~0U << ARM_V7S_TABLE_SHIFT)) > -#define _ARM_V7S_IDX_MASK(lvl) (ARM_V7S_PTES_PER_LVL(lvl) - 1) > -#define ARM_V7S_LVL_IDX(addr, lvl) ({ \ > +#define _ARM_V7S_IDX_MASK(lvl, cfg) (ARM_V7S_PTES_PER_LVL(lvl, cfg) - 1) > +#define ARM_V7S_LVL_IDX(addr, lvl, cfg) ({ \ > int _l = lvl; \ > - ((u32)(addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l); \ > + ((u32)(addr) >> ARM_V7S_LVL_SHIFT(_l)) & _ARM_V7S_IDX_MASK(_l, cfg); \ > }) > > /* > @@ -237,7 +237,7 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, > struct device *dev = cfg->iommu_dev; > phys_addr_t phys; > dma_addr_t dma; > - size_t size = ARM_V7S_TABLE_SIZE(lvl); > + size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg); > void *table = NULL; > > if (lvl == 1) > @@ -283,7 +283,7 @@ static void __arm_v7s_free_table(void *table, int lvl, > { > struct io_pgtable_cfg *cfg = &data->iop.cfg; > struct device *dev = cfg->iommu_dev; > - size_t size = ARM_V7S_TABLE_SIZE(lvl); > + size_t size = ARM_V7S_TABLE_SIZE(lvl, cfg); > > if (!cfg->coherent_walk) > dma_unmap_single(dev, __arm_v7s_dma_addr(table), size, > @@ -427,7 +427,7 @@ static int arm_v7s_init_pte(struct arm_v7s_io_pgtable *data, > arm_v7s_iopte *tblp; > size_t sz = ARM_V7S_BLOCK_SIZE(lvl); > > - tblp = ptep - ARM_V7S_LVL_IDX(iova, lvl); > + tblp = ptep - ARM_V7S_LVL_IDX(iova, lvl, cfg); > if (WARN_ON(__arm_v7s_unmap(data, NULL, iova + i * sz, > sz, lvl, tblp) != sz)) > return -EINVAL; > @@ -480,7 +480,7 @@ static int __arm_v7s_map(struct arm_v7s_io_pgtable *data, unsigned long iova, > int num_entries = size >> ARM_V7S_LVL_SHIFT(lvl); > > /* Find our entry at the current level */ > - ptep += ARM_V7S_LVL_IDX(iova, lvl); > + ptep += ARM_V7S_LVL_IDX(iova, lvl, cfg); > > /* If we can install a leaf entry at this level, then do so */ > if (num_entries) > @@ -553,7 +553,7 @@ static void arm_v7s_free_pgtable(struct io_pgtable *iop) > struct arm_v7s_io_pgtable *data = io_pgtable_to_data(iop); > int i; > > - for (i = 0; i < ARM_V7S_PTES_PER_LVL(1); i++) { > + for (i = 0; i < ARM_V7S_PTES_PER_LVL(1, &data->iop.cfg); i++) { > arm_v7s_iopte pte = data->pgd[i]; > > if (ARM_V7S_PTE_IS_TABLE(pte, 1)) > @@ -605,9 +605,9 @@ static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data, > if (!tablep) > return 0; /* Bytes unmapped */ > > - num_ptes = ARM_V7S_PTES_PER_LVL(2); > + num_ptes = ARM_V7S_PTES_PER_LVL(2, cfg); > num_entries = size >> ARM_V7S_LVL_SHIFT(2); > - unmap_idx = ARM_V7S_LVL_IDX(iova, 2); > + unmap_idx = ARM_V7S_LVL_IDX(iova, 2, cfg); > > pte = arm_v7s_prot_to_pte(arm_v7s_pte_to_prot(blk_pte, 1), 2, cfg); > if (num_entries > 1) > @@ -649,7 +649,7 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data, > if (WARN_ON(lvl > 2)) > return 0; > > - idx = ARM_V7S_LVL_IDX(iova, lvl); > + idx = ARM_V7S_LVL_IDX(iova, lvl, &iop->cfg); > ptep += idx; > do { > pte[i] = READ_ONCE(ptep[i]); > @@ -735,7 +735,7 @@ static phys_addr_t arm_v7s_iova_to_phys(struct io_pgtable_ops *ops, > u32 mask; > > do { > - ptep += ARM_V7S_LVL_IDX(iova, ++lvl); > + ptep += ARM_V7S_LVL_IDX(iova, ++lvl, &data->iop.cfg); > pte = READ_ONCE(*ptep); > ptep = iopte_deref(pte, lvl, data); > } while (ARM_V7S_PTE_IS_TABLE(pte, lvl)); > @@ -778,8 +778,8 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, > > spin_lock_init(&data->split_lock); > data->l2_tables = kmem_cache_create("io-pgtable_armv7s_l2", > - ARM_V7S_TABLE_SIZE(2), > - ARM_V7S_TABLE_SIZE(2), > + ARM_V7S_TABLE_SIZE(2, cfg), > + ARM_V7S_TABLE_SIZE(2, cfg), > ARM_V7S_TABLE_SLAB_FLAGS, NULL); > if (!data->l2_tables) > goto out_free_data; > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek