Received: by 2002:a25:c205:0:0:0:0:0 with SMTP id s5csp2553798ybf; Mon, 2 Mar 2020 10:58:16 -0800 (PST) X-Google-Smtp-Source: ADFU+vtbNiM4du7qbAAK2BKr0uWj6/k1beoqW2BenJ6bqXPKy+9kwwuwOj6BlfVIjKfJQaPfDsXh X-Received: by 2002:a05:6808:b1c:: with SMTP id s28mr10297oij.2.1583175496781; Mon, 02 Mar 2020 10:58:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583175496; cv=none; d=google.com; s=arc-20160816; b=cSeochb8P2L1RGKCzl7eVNXPz2LJLa1bLlqqk0OCFftXz2P4xGpzoTEVET+Mp6DiIo pjhV8IAuWlrz8dWPPJVIk90shJgCzk8G9uZmgmSjYkdufXoqZ8vqCzI/aNwPrlCmjYOq P0y0vuTFXXbeJNniZCJfPxCixEgj50hKXafTQCBetGXpGlllY+tuxEZvXA0EG2TwMz0h GXgrsRHtEDTd4Q9gRnZZuF8IgNp0U9Mvi6vUeRN8oooprr2kJxYuo6LrdLMidOwlUAzv vbKMN6+t6IN6FI//8HDlnIDfgFuDVrjmj/bkiUnvaKnGdFhz3tPyDm8I/dgeCY17JX3y lZEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :dlp-reaction:dlp-version:dlp-product:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from; bh=7idikSh+TK+wQne+Cm8429nYc5LTMrDr52tvaWFOKoA=; b=Aj41oE48TUfvobyCyL4OpMGg4XQwp7fRlPWd/rjcCIGBWK05i1ADfpyq6Inu+IcUuw Tz9QxTI8WK8s7TSf+pamAI32N6xMk+ETvPnrlcRoVyDanLM+WiWNUzpuUqMq7MMWYrc9 vFt8Kjq93IlO6sIowSPLsQyBKXNqBMW50tfodSFSe13MswkTeVpx6oGGY94yKeFMTNHW Bs88Bl6O3etMD1Ii/AVMJPyc/mS2nN9BCa5ynd5G0+I12DhsMyC5i0jvJvNkMReN07ng mopuuD5tXyOlzx0tvJ31cwQCMBEfUO7WA0IH6mS9l8qBdz4Ps5JQaUZt/HIpv7Y3LZny qLRw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si7109007otn.140.2020.03.02.10.58.04; Mon, 02 Mar 2020 10:58:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727414AbgCBS4t convert rfc822-to-8bit (ORCPT + 99 others); Mon, 2 Mar 2020 13:56:49 -0500 Received: from mga06.intel.com ([134.134.136.31]:21229 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727341AbgCBS4t (ORCPT ); Mon, 2 Mar 2020 13:56:49 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2020 10:56:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,507,1574150400"; d="scan'208";a="286705378" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by FMSMGA003.fm.intel.com with ESMTP; 02 Mar 2020 10:56:48 -0800 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 2 Mar 2020 10:56:48 -0800 Received: from fmsmsx108.amr.corp.intel.com ([169.254.9.2]) by FMSMSX157.amr.corp.intel.com ([169.254.14.139]) with mapi id 14.03.0439.000; Mon, 2 Mar 2020 10:56:47 -0800 From: "Ruhl, Michael J" To: Jordan Crouse , "linux-arm-msm@vger.kernel.org" CC: David Airlie , "freedreno@lists.freedesktop.org" , "smasetty@codeaurora.org" , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Douglas Anderson , Sean Paul Subject: RE: [PATCH v3 2/2] drm/msm/a6xx: Use the DMA API for GMU memory objects Thread-Topic: [PATCH v3 2/2] drm/msm/a6xx: Use the DMA API for GMU memory objects Thread-Index: AQHV8L/ED54fmQjYgEe0TQLqR/VKMKg1piEA Date: Mon, 2 Mar 2020 18:56:47 +0000 Message-ID: <14063C7AD467DE4B82DEDB5C278E8663F4FDDC3B@FMSMSX108.amr.corp.intel.com> References: <1583173424-21832-1-git-send-email-jcrouse@codeaurora.org> <1583173424-21832-3-git-send-email-jcrouse@codeaurora.org> In-Reply-To: <1583173424-21832-3-git-send-email-jcrouse@codeaurora.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.1.200.106] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >-----Original Message----- >From: dri-devel On Behalf Of >Jordan Crouse >Sent: Monday, March 2, 2020 1:24 PM >To: linux-arm-msm@vger.kernel.org >Cc: David Airlie ; freedreno@lists.freedesktop.org; >smasetty@codeaurora.org; linux-kernel@vger.kernel.org; dri- >devel@lists.freedesktop.org; Douglas Anderson ; >Sean Paul >Subject: [PATCH v3 2/2] drm/msm/a6xx: Use the DMA API for GMU memory >objects > >The GMU has very few memory allocations and uses a flat memory space so >there is no good reason to go out of our way to bypass the DMA APIs which >were basically designed for this exact scenario. > >v3: Set the dma mask correctly and use dma_addr_t for the iova type > >v2: Pass force_dma false to of_dma_configure to require that the DMA >region be set up and return error from of_dma_configure to fail probe. > >Signed-off-by: Jordan Crouse >--- > > drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 115 ++++--------------------------- >--- > drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 7 +-- > 2 files changed, 15 insertions(+), 107 deletions(-) > >diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c >b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c >index 748cd37..854ba30 100644 >--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c >+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c >@@ -2,6 +2,7 @@ > /* Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. */ > > #include >+#include > #include > #include > #include >@@ -920,21 +921,10 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu) > > static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu, struct >a6xx_gmu_bo *bo) > { >- int count, i; >- u64 iova; >- > if (IS_ERR_OR_NULL(bo)) > return; > >- count = bo->size >> PAGE_SHIFT; >- iova = bo->iova; >- >- for (i = 0; i < count; i++, iova += PAGE_SIZE) { >- iommu_unmap(gmu->domain, iova, PAGE_SIZE); >- __free_pages(bo->pages[i], 0); >- } >- >- kfree(bo->pages); >+ dma_free_attrs(gmu->dev, bo->size, bo->virt, bo->iova, bo->attrs); > kfree(bo); > } > >@@ -942,94 +932,23 @@ static struct a6xx_gmu_bo >*a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, > size_t size) > { > struct a6xx_gmu_bo *bo; >- int ret, count, i; > > bo = kzalloc(sizeof(*bo), GFP_KERNEL); > if (!bo) > return ERR_PTR(-ENOMEM); > > bo->size = PAGE_ALIGN(size); >+ bo->attrs = DMA_ATTR_WRITE_COMBINE; > >- count = bo->size >> PAGE_SHIFT; >+ bo->virt = dma_alloc_attrs(gmu->dev, bo->size, &bo->iova, >GFP_KERNEL, >+ bo->attrs); I see that there is a dma_alloc_wc()/dma_free_wc() which appears to do the same set up that you are using here. Could you use those wrappers, or do you need to keep track of the bo->attrs elsewhere? Mike >- bo->pages = kcalloc(count, sizeof(struct page *), GFP_KERNEL); >- if (!bo->pages) { >+ if (!bo->virt) { > kfree(bo); > return ERR_PTR(-ENOMEM); > } > >- for (i = 0; i < count; i++) { >- bo->pages[i] = alloc_page(GFP_KERNEL); >- if (!bo->pages[i]) >- goto err; >- } >- >- bo->iova = gmu->uncached_iova_base; >- >- for (i = 0; i < count; i++) { >- ret = iommu_map(gmu->domain, >- bo->iova + (PAGE_SIZE * i), >- page_to_phys(bo->pages[i]), PAGE_SIZE, >- IOMMU_READ | IOMMU_WRITE); >- >- if (ret) { >- DRM_DEV_ERROR(gmu->dev, "Unable to map GMU >buffer object\n"); >- >- for (i = i - 1 ; i >= 0; i--) >- iommu_unmap(gmu->domain, >- bo->iova + (PAGE_SIZE * i), >- PAGE_SIZE); >- >- goto err; >- } >- } >- >- bo->virt = vmap(bo->pages, count, VM_IOREMAP, >- pgprot_writecombine(PAGE_KERNEL)); >- if (!bo->virt) >- goto err; >- >- /* Align future IOVA addresses on 1MB boundaries */ >- gmu->uncached_iova_base += ALIGN(size, SZ_1M); >- > return bo; >- >-err: >- for (i = 0; i < count; i++) { >- if (bo->pages[i]) >- __free_pages(bo->pages[i], 0); >- } >- >- kfree(bo->pages); >- kfree(bo); >- >- return ERR_PTR(-ENOMEM); >-} >- >-static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu) >-{ >- int ret; >- >- /* >- * The GMU address space is hardcoded to treat the range >- * 0x60000000 - 0x80000000 as un-cached memory. All buffers shared >- * between the GMU and the CPU will live in this space >- */ >- gmu->uncached_iova_base = 0x60000000; >- >- >- gmu->domain = iommu_domain_alloc(&platform_bus_type); >- if (!gmu->domain) >- return -ENODEV; >- >- ret = iommu_attach_device(gmu->domain, gmu->dev); >- >- if (ret) { >- iommu_domain_free(gmu->domain); >- gmu->domain = NULL; >- } >- >- return ret; > } > > /* Return the 'arc-level' for the given frequency */ >@@ -1289,10 +1208,6 @@ void a6xx_gmu_remove(struct a6xx_gpu >*a6xx_gpu) > > a6xx_gmu_memory_free(gmu, gmu->hfi); > >- iommu_detach_device(gmu->domain, gmu->dev); >- >- iommu_domain_free(gmu->domain); >- > free_irq(gmu->gmu_irq, gmu); > free_irq(gmu->hfi_irq, gmu); > >@@ -1313,7 +1228,13 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, >struct device_node *node) > > gmu->dev = &pdev->dev; > >- of_dma_configure(gmu->dev, node, true); >+ /* Pass force_dma false to require the DT to set the dma region */ >+ ret = of_dma_configure(gmu->dev, node, false); >+ if (ret) >+ return ret; >+ >+ /* Set the mask after the of_dma_configure() */ >+ dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(31)); > > /* Fow now, don't do anything fancy until we get our feet under us */ > gmu->idle_level = GMU_IDLE_STATE_ACTIVE; >@@ -1325,11 +1246,6 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, >struct device_node *node) > if (ret) > goto err_put_device; > >- /* Set up the IOMMU context bank */ >- ret = a6xx_gmu_memory_probe(gmu); >- if (ret) >- goto err_put_device; >- > /* Allocate memory for for the HFI queues */ > gmu->hfi = a6xx_gmu_memory_alloc(gmu, SZ_16K); > if (IS_ERR(gmu->hfi)) >@@ -1375,11 +1291,6 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, >struct device_node *node) > err_memory: > a6xx_gmu_memory_free(gmu, gmu->hfi); > >- if (gmu->domain) { >- iommu_detach_device(gmu->domain, gmu->dev); >- >- iommu_domain_free(gmu->domain); >- } > ret = -ENODEV; > > err_put_device: >diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h >b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h >index 2af91ed..d10cddd 100644 >--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h >+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h >@@ -12,8 +12,8 @@ > struct a6xx_gmu_bo { > void *virt; > size_t size; >- u64 iova; >- struct page **pages; >+ dma_addr_t iova; >+ unsigned long attrs; > }; > > /* >@@ -49,9 +49,6 @@ struct a6xx_gmu { > int hfi_irq; > int gmu_irq; > >- struct iommu_domain *domain; >- u64 uncached_iova_base; >- > struct device *gxpd; > > int idle_level; >-- >2.7.4 >_______________________________________________ >dri-devel mailing list >dri-devel@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/dri-devel