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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1482CC433B4 for ; Fri, 21 May 2021 09:17:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7509613C8 for ; Fri, 21 May 2021 09:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235219AbhEUJS6 (ORCPT ); Fri, 21 May 2021 05:18:58 -0400 Received: from gloria.sntech.de ([185.11.138.130]:51648 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233997AbhEUJS6 (ORCPT ); Fri, 21 May 2021 05:18:58 -0400 Received: from ip5f5aa64a.dynamic.kabel-deutschland.de ([95.90.166.74] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lk1Hb-0004vj-Hh; Fri, 21 May 2021 11:17:27 +0200 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: joro@8bytes.org, will@kernel.org, robh+dt@kernel.org, xxm@rock-chips.com, robin.murphy@arm.com, Benjamin Gaignard Cc: iommu@lists.linux-foundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Benjamin Gaignard Subject: Re: [PATCH v5 4/4] iommu: rockchip: Add support for iommu v2 Date: Fri, 21 May 2021 11:17:26 +0200 Message-ID: <23677359.6Emhk5qWAg@diego> In-Reply-To: <20210521083637.3221304-5-benjamin.gaignard@collabora.com> References: <20210521083637.3221304-1-benjamin.gaignard@collabora.com> <20210521083637.3221304-5-benjamin.gaignard@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Am Freitag, 21. Mai 2021, 10:36:37 CEST schrieb Benjamin Gaignard: > This second version of the hardware block has a different bits > mapping for page table entries. > Add the ops matching to this new mapping. > Define a new compatible to distinguish it from the first version. > > Signed-off-by: Benjamin Gaignard Reviewed-by: Heiko Stuebner > --- > version 5: > - Use internal ops to support v2 hardware block > - Use GENMASK macro. > - Keep rk_dte_pt_address() and rk_dte_pt_address_v2() separated > because I believe that is more readable like this. > - Do not duplicate code. > > drivers/iommu/rockchip-iommu.c | 78 ++++++++++++++++++++++++++++++++++ > 1 file changed, 78 insertions(+) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index e7b9bcf174b1..23253a2f269e 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -189,6 +189,33 @@ static inline phys_addr_t rk_dte_pt_address(u32 dte) > return (phys_addr_t)dte & RK_DTE_PT_ADDRESS_MASK; > } > > +/* > + * In v2: > + * 31:12 - PT address bit 31:0 > + * 11: 8 - PT address bit 35:32 > + * 7: 4 - PT address bit 39:36 > + * 3: 1 - Reserved > + * 0 - 1 if PT @ PT address is valid > + */ > +#define RK_DTE_PT_ADDRESS_MASK_V2 GENMASK_ULL(31, 4) > +#define DTE_HI_MASK1 GENMASK(11, 8) > +#define DTE_HI_MASK2 GENMASK(7, 4) > +#define DTE_HI_SHIFT1 24 /* shift bit 8 to bit 32 */ > +#define DTE_HI_SHIFT2 32 /* shift bit 4 to bit 36 */ > +#define PAGE_DESC_HI_MASK1 GENMASK_ULL(39, 36) > +#define PAGE_DESC_HI_MASK2 GENMASK_ULL(35, 32) > + > +static inline phys_addr_t rk_dte_pt_address_v2(u32 dte) > +{ > + u64 dte_v2 = dte; > + > + dte_v2 = ((dte_v2 & DTE_HI_MASK2) << DTE_HI_SHIFT2) | > + ((dte_v2 & DTE_HI_MASK1) << DTE_HI_SHIFT1) | > + (dte_v2 & RK_DTE_PT_ADDRESS_MASK); > + > + return (phys_addr_t)dte_v2; > +} > + > static inline bool rk_dte_is_pt_valid(u32 dte) > { > return dte & RK_DTE_PT_VALID; > @@ -199,6 +226,15 @@ static inline u32 rk_mk_dte(dma_addr_t pt_dma) > return (pt_dma & RK_DTE_PT_ADDRESS_MASK) | RK_DTE_PT_VALID; > } > > +static inline u32 rk_mk_dte_v2(dma_addr_t pt_dma) > +{ > + pt_dma = (pt_dma & RK_DTE_PT_ADDRESS_MASK) | > + ((pt_dma & PAGE_DESC_HI_MASK1) >> DTE_HI_SHIFT1) | > + (pt_dma & PAGE_DESC_HI_MASK2) >> DTE_HI_SHIFT2; > + > + return (pt_dma & RK_DTE_PT_ADDRESS_MASK_V2) | RK_DTE_PT_VALID; > +} > + > /* > * Each PTE has a Page address, some flags and a valid bit: > * +---------------------+---+-------+-+ > @@ -240,6 +276,29 @@ static u32 rk_mk_pte(phys_addr_t page, int prot) > return page | flags | RK_PTE_PAGE_VALID; > } > > +/* > + * In v2: > + * 31:12 - Page address bit 31:0 > + * 11:9 - Page address bit 34:32 > + * 8:4 - Page address bit 39:35 > + * 3 - Security > + * 2 - Readable > + * 1 - Writable > + * 0 - 1 if Page @ Page address is valid > + */ > +#define RK_PTE_PAGE_READABLE_V2 BIT(2) > +#define RK_PTE_PAGE_WRITABLE_V2 BIT(1) > + > +static u32 rk_mk_pte_v2(phys_addr_t page, int prot) > +{ > + u32 flags = 0; > + > + flags |= (prot & IOMMU_READ) ? RK_PTE_PAGE_READABLE_V2 : 0; > + flags |= (prot & IOMMU_WRITE) ? RK_PTE_PAGE_WRITABLE_V2 : 0; > + > + return rk_mk_dte_v2(page) | flags ; > +} > + > static u32 rk_mk_pte_invalid(u32 pte) > { > return pte & ~RK_PTE_PAGE_VALID; > @@ -480,6 +539,14 @@ static inline phys_addr_t rk_dte_addr_phys(phys_addr_t addr) > return addr; > } > > +#define DT_HI_MASK GENMASK_ULL(39, 32) > +#define DT_SHIFT 28 > + > +static inline phys_addr_t rk_dte_addr_phys_v2(phys_addr_t addr) > +{ > + return (addr & RK_DTE_PT_ADDRESS_MASK) | ((addr & DT_HI_MASK) << DT_SHIFT); > +} > + > static void log_iova(struct rk_iommu *iommu, int index, dma_addr_t iova) > { > void __iomem *base = iommu->bases[index]; > @@ -1305,10 +1372,21 @@ static struct rk_iommu_ops iommu_data_ops_v1 = { > .pt_address_mask = RK_DTE_PT_ADDRESS_MASK, > }; > > +static struct rk_iommu_ops iommu_data_ops_v2 = { > + .pt_address = &rk_dte_pt_address_v2, > + .mk_dtentries = &rk_mk_dte_v2, > + .mk_ptentries = &rk_mk_pte_v2, > + .dte_addr_phys = &rk_dte_addr_phys_v2, > + .pt_address_mask = RK_DTE_PT_ADDRESS_MASK_V2, > +}; > + > static const struct of_device_id rk_iommu_dt_ids[] = { > { .compatible = "rockchip,iommu", > .data = &iommu_data_ops_v1, > }, > + { .compatible = "rockchip,rk3568-iommu", > + .data = &iommu_data_ops_v2, > + }, > { /* sentinel */ } > }; > MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids); >