From patchwork Wed Jun 12 19:58:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 17860 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f198.google.com (mail-qc0-f198.google.com [209.85.216.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B1D0423903 for ; Wed, 12 Jun 2013 19:58:57 +0000 (UTC) Received: by mail-qc0-f198.google.com with SMTP id c1sf2423983qcz.5 for ; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-beenthere:x-forwarded-to:x-forwarded-for:delivered-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=yja/cwE/snLfcH6meWuXqhrbivlj9lVL3uIbsEvYTec=; b=CozukaA8DiVhb0wnqYaaz/Ga9L5OYrmlEAmBLbaas6BXSXrTp220QlxWs+jvnb20kQ r165hSMeetQgcPBCeEXr5oqIuYm/TRnJ76G2b87vCAzfe0qvRwBJwF3az0GiYyVIOi4t kBkxdntM6ZJPyyP0TDLISMU0weuz0GjK2SKdWSmGGVii1x8Z+FrKKU5F5N2spqdNK5JV 8V375UvzMu/tx1Me8WLWT3KQfNf+cGmbEdrYCmRh76ujRpRtCkEmTuAIR48VGPPIJHt1 rpaWemLBTehPuZb6ItBCpSOWs6QfKmkIA2sZdQAYVTeL+a2dYQzHDdxyaO2AeWUUd1ZQ 36tw== X-Received: by 10.236.161.234 with SMTP id w70mr11830261yhk.22.1371067137465; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.39.3 with SMTP id l3ls1474601qek.62.gmail; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) X-Received: by 10.58.211.7 with SMTP id my7mr2852599vec.54.1371067137208; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id d4si9205087vcl.66.2013.06.12.12.58.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 12:58:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hr11so6450512vcb.6 for ; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) X-Received: by 10.52.155.67 with SMTP id vu3mr8818717vdb.94.1371067137047; Wed, 12 Jun 2013 12:58:57 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.191.99 with SMTP id gx3csp157500vec; Wed, 12 Jun 2013 12:58:56 -0700 (PDT) X-Received: by 10.66.251.65 with SMTP id zi1mr26051581pac.200.1371067135909; Wed, 12 Jun 2013 12:58:55 -0700 (PDT) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com [2607:f8b0:400e:c03::233]) by mx.google.com with ESMTPS id z5si2029051pau.345.2013.06.12.12.58.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 12:58:55 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c03::233 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=2607:f8b0:400e:c03::233; Received: by mail-pa0-f51.google.com with SMTP id lf11so4521055pab.38 for ; Wed, 12 Jun 2013 12:58:55 -0700 (PDT) X-Received: by 10.66.253.195 with SMTP id ac3mr19956289pad.107.1371067135438; Wed, 12 Jun 2013 12:58:55 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id vv6sm26056524pab.6.2013.06.12.12.58.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Jun 2013 12:58:54 -0700 (PDT) From: John Stultz To: Rebecca Schultz Zavin Cc: John Stultz , Serban Constantinescu , Arnd Bergmann , Jesse Barker Subject: [PATCH 3/4] ion: Add carveout heap Date: Wed, 12 Jun 2013 12:58:25 -0700 Message-Id: <1371067106-19129-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1371067106-19129-1-git-send-email-john.stultz@linaro.org> References: <1371067106-19129-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm4CzeS6pwwoWpwZZ4eKyHuV1JPvTkCsXuaCsjuloIlnjadtJZodd4YbKWp8b4p3uSMzoBD X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add carveout heap to ion subsystem. This provides physically contiguous memory for devices like cameras and secure media playback codecs. XXX: This needs much more rational and justification. This work was originally by Rebecca Schultz Zavin And contains fixes and improvements by: Arve Hjønnevåg Benjamin Gaignard Colin Cross Dima Zavin Greg Hackmann Jesse Barker Johan Mossberg JP Abgrall KyongHo Cho Laura Abbott Olav Haugan Cc: Rebecca Schultz Zavin Cc: Serban Constantinescu Cc: Arnd Bergmann Cc: Jesse Barker Signed-off-by: John Stultz --- drivers/gpu/ion/Makefile | 4 +- drivers/gpu/ion/ion_carveout_heap.c | 162 ++++++++++++++++++++++++++++++++++++ drivers/gpu/ion/ion_heap.c | 6 ++ include/linux/ion.h | 5 ++ 4 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/ion/ion_carveout_heap.c diff --git a/drivers/gpu/ion/Makefile b/drivers/gpu/ion/Makefile index 59f749e..988f8c6 100644 --- a/drivers/gpu/ion/Makefile +++ b/drivers/gpu/ion/Makefile @@ -1 +1,3 @@ -obj-$(CONFIG_ION) += ion.o ion_heap.o ion_page_pool.o ion_system_heap.o +obj-$(CONFIG_ION) += ion.o ion_heap.o ion_page_pool.o ion_system_heap.o \ + ion_carveout_heap.o + diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/gpu/ion/ion_carveout_heap.c new file mode 100644 index 0000000..8145b42 --- /dev/null +++ b/drivers/gpu/ion/ion_carveout_heap.c @@ -0,0 +1,162 @@ +/* + * drivers/gpu/ion/ion_carveout_heap.c + * + * Copyright (C) 2011 Google, Inc. + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include "ion_priv.h" + +/* #include */ +#define MT_MEMORY 9 +#define MT_MEMORY_NONCACHED 11 + +struct ion_carveout_heap { + struct ion_heap heap; + struct gen_pool *pool; + ion_phys_addr_t base; +}; + +ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap, + unsigned long size, + unsigned long align) +{ + struct ion_carveout_heap *carveout_heap = + container_of(heap, struct ion_carveout_heap, heap); + unsigned long offset = gen_pool_alloc(carveout_heap->pool, size); + + if (!offset) + return ION_CARVEOUT_ALLOCATE_FAIL; + + return offset; +} + +void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr, + unsigned long size) +{ + struct ion_carveout_heap *carveout_heap = + container_of(heap, struct ion_carveout_heap, heap); + + if (addr == ION_CARVEOUT_ALLOCATE_FAIL) + return; + gen_pool_free(carveout_heap->pool, addr, size); +} + +static int ion_carveout_heap_phys(struct ion_heap *heap, + struct ion_buffer *buffer, + ion_phys_addr_t *addr, size_t *len) +{ + *addr = buffer->priv_phys; + *len = buffer->size; + return 0; +} + +static int ion_carveout_heap_allocate(struct ion_heap *heap, + struct ion_buffer *buffer, + unsigned long size, unsigned long align, + unsigned long flags) +{ + buffer->priv_phys = ion_carveout_allocate(heap, size, align); + return buffer->priv_phys == ION_CARVEOUT_ALLOCATE_FAIL ? -ENOMEM : 0; +} + +static void ion_carveout_heap_free(struct ion_buffer *buffer) +{ + struct ion_heap *heap = buffer->heap; + + ion_carveout_free(heap, buffer->priv_phys, buffer->size); + buffer->priv_phys = ION_CARVEOUT_ALLOCATE_FAIL; +} + +struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap, + struct ion_buffer *buffer) +{ + struct sg_table *table; + int ret; + + table = kzalloc(sizeof(struct sg_table), GFP_KERNEL); + if (!table) + return ERR_PTR(-ENOMEM); + ret = sg_alloc_table(table, 1, GFP_KERNEL); + if (ret) { + kfree(table); + return ERR_PTR(ret); + } + sg_set_page(table->sgl, phys_to_page(buffer->priv_phys), buffer->size, + 0); + return table; +} + +void ion_carveout_heap_unmap_dma(struct ion_heap *heap, + struct ion_buffer *buffer) +{ + sg_free_table(buffer->sg_table); +} + +int ion_carveout_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, + struct vm_area_struct *vma) +{ + return remap_pfn_range(vma, vma->vm_start, + __phys_to_pfn(buffer->priv_phys) + vma->vm_pgoff, + vma->vm_end - vma->vm_start, + pgprot_noncached(vma->vm_page_prot)); +} + +static struct ion_heap_ops carveout_heap_ops = { + .allocate = ion_carveout_heap_allocate, + .free = ion_carveout_heap_free, + .phys = ion_carveout_heap_phys, + .map_dma = ion_carveout_heap_map_dma, + .unmap_dma = ion_carveout_heap_unmap_dma, + .map_user = ion_carveout_heap_map_user, +}; + +struct ion_heap *ion_carveout_heap_create(struct ion_platform_heap *heap_data) +{ + struct ion_carveout_heap *carveout_heap; + + carveout_heap = kzalloc(sizeof(struct ion_carveout_heap), GFP_KERNEL); + if (!carveout_heap) + return ERR_PTR(-ENOMEM); + + carveout_heap->pool = gen_pool_create(12, -1); + if (!carveout_heap->pool) { + kfree(carveout_heap); + return ERR_PTR(-ENOMEM); + } + carveout_heap->base = heap_data->base; + gen_pool_add(carveout_heap->pool, carveout_heap->base, heap_data->size, + -1); + carveout_heap->heap.ops = &carveout_heap_ops; + carveout_heap->heap.type = ION_HEAP_TYPE_CARVEOUT; + + return &carveout_heap->heap; +} + +void ion_carveout_heap_destroy(struct ion_heap *heap) +{ + struct ion_carveout_heap *carveout_heap = + container_of(heap, struct ion_carveout_heap, heap); + + gen_pool_destroy(carveout_heap->pool); + kfree(carveout_heap); + carveout_heap = NULL; +} diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c index 0f2e7bb..3a565fc 100644 --- a/drivers/gpu/ion/ion_heap.c +++ b/drivers/gpu/ion/ion_heap.c @@ -101,6 +101,9 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data) case ION_HEAP_TYPE_SYSTEM: heap = ion_system_heap_create(heap_data); break; + case ION_HEAP_TYPE_CARVEOUT: + heap = ion_carveout_heap_create(heap_data); + break; default: pr_err("%s: Invalid heap type %d\n", __func__, heap_data->type); @@ -131,6 +134,9 @@ void ion_heap_destroy(struct ion_heap *heap) case ION_HEAP_TYPE_SYSTEM: ion_system_heap_destroy(heap); break; + case ION_HEAP_TYPE_CARVEOUT: + ion_carveout_heap_destroy(heap); + break; default: pr_err("%s: Invalid heap type %d\n", __func__, heap->type); diff --git a/include/linux/ion.h b/include/linux/ion.h index cc5010e..3f5858b 100644 --- a/include/linux/ion.h +++ b/include/linux/ion.h @@ -24,6 +24,9 @@ struct ion_handle; * enum ion_heap_types - list of all possible types of heaps * @ION_HEAP_TYPE_SYSTEM: memory allocated via vmalloc * @ION_HEAP_TYPE_SYSTEM_CONTIG: memory allocated via kmalloc + * @ION_HEAP_TYPE_CARVEOUT: memory allocated from a prereserved + * carveout heap, allocations are physically + * contiguous * @ION_NUM_HEAPS: helper for iterating over heaps, a bit mask * is used to identify the heaps, so only 32 * total heap types are supported @@ -31,11 +34,13 @@ struct ion_handle; enum ion_heap_type { ION_HEAP_TYPE_SYSTEM, ION_HEAP_TYPE_SYSTEM_CONTIG, + ION_HEAP_TYPE_CARVEOUT, ION_NUM_HEAPS = 16, }; #define ION_HEAP_SYSTEM_MASK (1 << ION_HEAP_TYPE_SYSTEM) #define ION_HEAP_SYSTEM_CONTIG_MASK (1 << ION_HEAP_TYPE_SYSTEM_CONTIG) +#define ION_HEAP_CARVEOUT_MASK (1 << ION_HEAP_TYPE_CARVEOUT) #define ION_NUM_HEAP_IDS (sizeof(unsigned int) * 8)