From patchwork Fri Jan 10 03:40:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 23071 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0A0C720555 for ; Fri, 10 Jan 2014 03:41:06 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id y13sf3297877pdi.10 for ; Thu, 09 Jan 2014 19:41:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Z8g7B57F+vjzUK3fx5sQFCAWTzYrWc6jbNp2H3R8XwA=; b=cm/1v+ViuGPCcGHDj4GKfAGqrj/r+i+nt/MLLoO1GGNH/BbFCQcSYLw5W8/cvL6pid XZOGLDSjLWhmFbN+Li1yNFIDm+rLSgHwOpGDUAgk6q4OHJk9K5lpzXU8EVojQD2sKmQo avW9367cYyjSOMfZCu7tX167GPQgI3+vb0lg5O7/gj+WCquIpmrGYizFokKutrYCSSA4 JkVbsXCkAAnVo839ENd5b/kcFGFUbsiSEL3BsqTr0EsuIKSiFr/TYKZBDmP82tuug2Qj kO1ZKry9pU9GEQZRiVCIo3s4T6d4mFRAFl7tbdR6ZHJJjFmmE+IjoV7oPtgqo2HwYbUX NsQA== X-Gm-Message-State: ALoCoQnkkiBrq1+R6HFvRgUHitENP9+rja98oYtN5J2bYEUOHlZUC58LcmjJtaZ16CzR2aCNNaK3 X-Received: by 10.66.231.74 with SMTP id te10mr3003324pac.16.1389325266320; Thu, 09 Jan 2014 19:41:06 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.76 with SMTP id gc12ls1444791qeb.44.gmail; Thu, 09 Jan 2014 19:41:06 -0800 (PST) X-Received: by 10.52.237.228 with SMTP id vf4mr4943483vdc.3.1389325266165; Thu, 09 Jan 2014 19:41:06 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id gx6si3980149vdc.11.2014.01.09.19.41.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 19:41:06 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id x11so2830620vbb.36 for ; Thu, 09 Jan 2014 19:41:06 -0800 (PST) X-Received: by 10.52.117.135 with SMTP id ke7mr887688vdb.43.1389325266029; Thu, 09 Jan 2014 19:41:06 -0800 (PST) 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.59.13.131 with SMTP id ey3csp57367ved; Thu, 9 Jan 2014 19:41:05 -0800 (PST) X-Received: by 10.68.231.169 with SMTP id th9mr8017520pbc.113.1389325265024; Thu, 09 Jan 2014 19:41:05 -0800 (PST) Received: from mail-pa0-f50.google.com (mail-pa0-f50.google.com [209.85.220.50]) by mx.google.com with ESMTPS id pu3si5714983pbc.180.2014.01.09.19.41.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 19:41:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.50 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.50; Received: by mail-pa0-f50.google.com with SMTP id kp14so4213382pab.9 for ; Thu, 09 Jan 2014 19:41:04 -0800 (PST) X-Received: by 10.67.3.68 with SMTP id bu4mr8164270pad.144.1389325264524; Thu, 09 Jan 2014 19:41:04 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id lh13sm17308379pab.4.2014.01.09.19.41.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Jan 2014 19:41:03 -0800 (PST) From: John Stultz To: LKML Cc: John Stultz , Colin Cross , Greg KH , Jesse Barker , Android Kernel Team Subject: [PATCH 1/2] ion: Add dummy driver for testing Date: Thu, 9 Jan 2014 19:40:54 -0800 Message-Id: <1389325255-31534-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1389325255-31534-1-git-send-email-john.stultz@linaro.org> References: <1389325255-31534-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 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: , Provide a basic dummy driver to register the ion device and to install basic SYSTEM and SYSTEM_CONTIG heaps. This allows for basic testing with ION without having access to drivers or systems that have been enabled to use ION. Cc: Colin Cross Cc: Greg KH Cc: Jesse Barker Cc: Android Kernel Team Signed-off-by: John Stultz --- drivers/staging/android/ion/Kconfig | 10 +++ drivers/staging/android/ion/Makefile | 3 + drivers/staging/android/ion/ion_dummy_driver.c | 93 ++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 drivers/staging/android/ion/ion_dummy_driver.c diff --git a/drivers/staging/android/ion/Kconfig b/drivers/staging/android/ion/Kconfig index a9a64ea..a087b19 100644 --- a/drivers/staging/android/ion/Kconfig +++ b/drivers/staging/android/ion/Kconfig @@ -17,6 +17,16 @@ config ION_TEST Choose this option to create a device that can be used to test the kernel and device side ION functions. +config ION_DUMMY + tristate "Dummy Ion driver" + depends on ION + help + Provides a dummy ION driver that registers the + /dev/ion device and some basic heaps. This can + be used for testing the ION infrastructure if + one doesn't have access to hardware drivers that + use ION. + config ION_TEGRA tristate "Ion for Tegra" depends on ARCH_TEGRA && ION diff --git a/drivers/staging/android/ion/Makefile b/drivers/staging/android/ion/Makefile index 75039b9..b56fd2b 100644 --- a/drivers/staging/android/ion/Makefile +++ b/drivers/staging/android/ion/Makefile @@ -4,4 +4,7 @@ obj-$(CONFIG_ION_TEST) += ion_test.o ifdef CONFIG_COMPAT obj-$(CONFIG_ION) += compat_ion.o endif + +obj-$(CONFIG_ION_DUMMY) += ion_dummy_driver.o obj-$(CONFIG_ION_TEGRA) += tegra/ + diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c new file mode 100644 index 0000000..6749d29 --- /dev/null +++ b/drivers/staging/android/ion/ion_dummy_driver.c @@ -0,0 +1,93 @@ +/* + * drivers/gpu/ion/ion_dummy_driver.c + * + * Copyright (C) 2013 Linaro, 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 "ion.h" +#include "ion_priv.h" + +struct ion_device *idev; +struct ion_heap **heaps; + +struct ion_platform_heap dummy_heaps[] = { + { + .id = ION_HEAP_TYPE_SYSTEM, + .type = ION_HEAP_TYPE_SYSTEM, + .name = "system", + }, + { + .id = ION_HEAP_TYPE_SYSTEM_CONTIG, + .type = ION_HEAP_TYPE_SYSTEM_CONTIG, + .name = "system contig", + }, +}; + +struct ion_platform_data dummy_ion_pdata = { + .nr = 2, + .heaps = dummy_heaps, +}; + +static int __init ion_dummy_init(void) +{ + int i, err; + + idev = ion_device_create(NULL); + heaps = kzalloc(sizeof(struct ion_heap *) * dummy_ion_pdata.nr, + GFP_KERNEL); + if (!heaps) + return PTR_ERR(heaps); + + for (i = 0; i < dummy_ion_pdata.nr; i++) { + struct ion_platform_heap *heap_data = &dummy_ion_pdata.heaps[i]; + + heaps[i] = ion_heap_create(heap_data); + if (IS_ERR_OR_NULL(heaps[i])) { + err = PTR_ERR(heaps[i]); + goto err; + } + ion_device_add_heap(idev, heaps[i]); + } + return 0; +err: + for (i = 0; i < dummy_ion_pdata.nr; i++) { + if (heaps[i]) + ion_heap_destroy(heaps[i]); + } + kfree(heaps); + + return err; +} + +static void __exit ion_dummy_exit(void) +{ + int i; + + ion_device_destroy(idev); + + for (i = 0; i < dummy_ion_pdata.nr; i++) + ion_heap_destroy(heaps[i]); + kfree(heaps); + + return; +} + +module_init(ion_dummy_init); +module_exit(ion_dummy_exit); +