From patchwork Mon Apr 9 20:07:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 896396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="pw3feMw6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40KhFN5XS8z9s4b for ; Tue, 10 Apr 2018 06:08:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754676AbeDIUIB (ORCPT ); Mon, 9 Apr 2018 16:08:01 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:54051 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754692AbeDIUHj (ORCPT ); Mon, 9 Apr 2018 16:07:39 -0400 Received: by mail-wm0-f66.google.com with SMTP id 66so15324213wmd.3; Mon, 09 Apr 2018 13:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=H6VNCVC4hINHozOWB+iONA7cxbEjHCV0x7owYUqAsdw=; b=pw3feMw6t7bJkSho8JlEV3m1I3QEZXiWBL24WzfigM/awfEF/ROng6HR58vqNN1Aou s1B0esw6Sy+dZ3To0O42W9EOmcxLHZQQfmKkEnheDeP7D2YuRg0s9yfHg6qQLbuNbB/A xM6j/zvIcjQx03rzZN2LN9gdtqoFvxKRw3lIBVl1rW82JpAwDhhPs3sw/IB/utXAtcTi DpfV/7uOJnt6Q7nitrb2wuhcQ8X1eNl+1MhM+saY9OL+0eZykD6qkgISYi7i+P2QNlvo fjs/RT77mNGUwFTNF5jPrUFUDbiQQbysiqR+kDVNHnhTwSt+jwGvZvxXF1F5bBFhEIF2 J5fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=H6VNCVC4hINHozOWB+iONA7cxbEjHCV0x7owYUqAsdw=; b=GbcqTOpbEwZY1kIruEbKrXgid0cqCpIZQz5oiwmeCOKmRwR4Jut/B+Y4kq0u4yPlN/ v2ALoiTrxxtnESMKbeuP7dVWgkK+BjzK30NdgSJeSPn3M8K83Za76C4v1n3J9bGSfcxK Of4cyqCRgkksY6gmD4rdNgmuVgnccIOCRm3mnwFvELDz+7CTNrC16rgN8wus0LKjgKiU X0+MPC2p9bUEVnyMeRxN/E9mekpxiLsevPw33tliPGg9W8hWzat41oHd+vEwSETtGM6z 0evU2vW5qdUcgNhSKryIw0c3ZN0oq97hC8sB2ZX2U+wpTs2F8N07/2FSeSFzTGr5mt0J tkIA== X-Gm-Message-State: ALQs6tCxvaQ5PwFkySrOyJosRpRdZirP2K8ZPjbMZ0SVQ6QdnQaptmF0 yxQfp3zKsQXMxRW4vB0WxUQ= X-Google-Smtp-Source: AIpwx4+e1NZPvhjrhZ8KMTub3tzTARP0XDvvqgv3WDC9J91t35rmGBsyK4FX5vxw+pLYppQUiQu9TA== X-Received: by 10.28.34.198 with SMTP id i189mr907833wmi.16.1523304458542; Mon, 09 Apr 2018 13:07:38 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-235.pppoe.spdop.ru. [109.252.91.235]) by smtp.gmail.com with ESMTPSA id p4sm177527wma.5.2018.04.09.13.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Apr 2018 13:07:37 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Joerg Roedel Cc: iommu@lists.linux-foundation.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 3/4] iommu/tegra: gart: Constify number of GART pages Date: Mon, 9 Apr 2018 23:07:21 +0300 Message-Id: <954659be6760130f6ffd5e733db2ad58cbb8e6e4.1523304324.git.digetx@gmail.com> X-Mailer: git-send-email 2.16.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org GART has a fixed aperture size, hence the number of pages is constant. Signed-off-by: Dmitry Osipenko --- drivers/iommu/tegra-gart.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c index 89ec24c6952c..4a0607669d34 100644 --- a/drivers/iommu/tegra-gart.c +++ b/drivers/iommu/tegra-gart.c @@ -33,6 +33,8 @@ #include +#define GART_APERTURE_SIZE SZ_32M + /* bitmap of the page sizes currently supported */ #define GART_IOMMU_PGSIZES (SZ_4K) @@ -47,6 +49,8 @@ #define GART_PAGE_MASK \ (~(GART_PAGE_SIZE - 1) & ~GART_ENTRY_PHYS_ADDR_VALID) +#define GART_PAGECOUNT (GART_APERTURE_SIZE >> GART_PAGE_SHIFT) + struct gart_client { struct device *dev; struct list_head list; @@ -55,7 +59,6 @@ struct gart_client { struct gart_device { void __iomem *regs; u32 *savedata; - u32 page_count; /* total remappable size */ dma_addr_t iovmm_base; /* offset to vmm_area */ spinlock_t pte_lock; /* for pagetable */ struct list_head client; @@ -91,7 +94,7 @@ static struct gart_domain *to_gart_domain(struct iommu_domain *dom) #define for_each_gart_pte(gart, iova) \ for (iova = gart->iovmm_base; \ - iova < gart->iovmm_base + GART_PAGE_SIZE * gart->page_count; \ + iova < gart->iovmm_base + GART_APERTURE_SIZE; \ iova += GART_PAGE_SIZE) static inline void gart_set_pte(struct gart_device *gart, @@ -158,7 +161,7 @@ static inline bool gart_iova_range_valid(struct gart_device *gart, iova_start = iova; iova_end = iova_start + bytes - 1; gart_start = gart->iovmm_base; - gart_end = gart_start + gart->page_count * GART_PAGE_SIZE - 1; + gart_end = gart_start + GART_APERTURE_SIZE - 1; if (iova_start < gart_start) return false; @@ -241,7 +244,7 @@ static struct iommu_domain *gart_iommu_domain_alloc(unsigned type) gart_domain->gart = gart; gart_domain->domain.geometry.aperture_start = gart->iovmm_base; gart_domain->domain.geometry.aperture_end = gart->iovmm_base + - gart->page_count * GART_PAGE_SIZE - 1; + GART_APERTURE_SIZE - 1; gart_domain->domain.geometry.force_aperture = true; return &gart_domain->domain; @@ -463,9 +466,8 @@ static int tegra_gart_probe(struct platform_device *pdev) INIT_LIST_HEAD(&gart->client); gart->regs = gart_regs; gart->iovmm_base = (dma_addr_t)res_remap->start; - gart->page_count = (resource_size(res_remap) >> GART_PAGE_SHIFT); - gart->savedata = vmalloc(sizeof(u32) * gart->page_count); + gart->savedata = vmalloc(sizeof(u32) * GART_PAGECOUNT); if (!gart->savedata) { dev_err(dev, "failed to allocate context save area\n"); return -ENOMEM;