From patchwork Fri May 27 20:25:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 9138947 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E91160221 for ; Fri, 27 May 2016 20:25:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E8FE280B2 for ; Fri, 27 May 2016 20:25:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3347A28285; Fri, 27 May 2016 20:25:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C1F49280B2 for ; Fri, 27 May 2016 20:25:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756661AbcE0UZk (ORCPT ); Fri, 27 May 2016 16:25:40 -0400 Received: from resqmta-po-02v.sys.comcast.net ([96.114.154.161]:45089 "EHLO resqmta-po-02v.sys.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753187AbcE0UZk (ORCPT ); Fri, 27 May 2016 16:25:40 -0400 Received: from resomta-po-17v.sys.comcast.net ([96.114.154.241]) by comcast with SMTP id 6OKAbDZntGhQ06OKAbj6n3; Fri, 27 May 2016 20:25:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20140121; t=1464380738; bh=28SANMYkfo1j1C1v8pUdT2F3ce2v3HzdFhi9QwjU2y4=; h=Received:Received:Received:From:To:Subject:Date:Message-Id; b=kbJb0nUVcGgjf/D5GwtNaXjYWfhVRjuvAqw1SDkg4m8e4sRXjuyLKcddQuf4xzaTY 5R2wskCmqmpRnKRquUZ+NZaMZUYJZAk/8oOgDPlj6ZFhX9Of7PcuS5WydK5g4Ri+QW QpfVs9ca7aH8xVn2Edi4jv+9VxLkqUIA+ItPOKUUTKhGvsoVH/1zisbiB9+gJKvIHF TsJtZZdHlphfcLoZ0Kz3S4GYHE2k1k2nFIZVJxBzHD5YRiDnutJy99Ns0zo+/FsMxT LLXHPsXh4B+Gl8pIbaaLiKJdLVYTWIxQjlW5xsUXqvxABkUL3rUWegTCk5wsX94rOs hOCKLHTfw/+yA== Received: from mail.gonehiking.org ([73.181.52.62]) by resomta-po-17v.sys.comcast.net with comcast id zYRc1s00P1LXgTt01YRcLm; Fri, 27 May 2016 20:25:38 +0000 Received: from shuah-XPS-13-9350.sisa.samsung.com (shuah-xps.internal [192.168.1.87]) by mail.gonehiking.org (Postfix) with ESMTP id 205D59F3E8; Fri, 27 May 2016 14:25:36 -0600 (MDT) From: Shuah Khan To: mchehab@osg.samsung.com, laurent.pinchart@ideasonboard.com, sakari.ailus@iki.fi, hans.verkuil@cisco.com, chehabrafael@gmail.com, javier@osg.samsung.com, inki.dae@samsung.com, g.liakhovetski@gmx.de, jh1009.sung@samsung.com Cc: Shuah Khan , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3] media: Media Device Allocator API Date: Fri, 27 May 2016 14:25:35 -0600 Message-Id: <1464380735-4527-1-git-send-email-shuahkh@osg.samsung.com> X-Mailer: git-send-email 2.7.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Media Device Allocator API to allows multiple drivers share a media device. Using this API, drivers can allocate a media device with the shared struct device as the key. Once the media device is allocated by a driver, other drivers can get a reference to it. The media device is released when all the references are released. Signed-off-by: Shuah Khan Reviewed-by: Hans Verkuil --- Changes since v2: -- Addressed Hans's comments on v2 drivers/media/Makefile | 3 +- drivers/media/media-dev-allocator.c | 114 ++++++++++++++++++++++++++++++++++++ include/media/media-dev-allocator.h | 85 +++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 drivers/media/media-dev-allocator.c create mode 100644 include/media/media-dev-allocator.h diff --git a/drivers/media/Makefile b/drivers/media/Makefile index e608bbc..b08f091 100644 --- a/drivers/media/Makefile +++ b/drivers/media/Makefile @@ -2,7 +2,8 @@ # Makefile for the kernel multimedia device drivers. # -media-objs := media-device.o media-devnode.o media-entity.o +media-objs := media-device.o media-devnode.o media-entity.o \ + media-dev-allocator.o # # I2C drivers should come before other drivers, otherwise they'll fail diff --git a/drivers/media/media-dev-allocator.c b/drivers/media/media-dev-allocator.c new file mode 100644 index 0000000..21d5337 --- /dev/null +++ b/drivers/media/media-dev-allocator.c @@ -0,0 +1,114 @@ +/* + * media-dev-allocator.c - Media Controller Device Allocator API + * + * Copyright (c) 2016 Shuah Khan + * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * + * This file is released under the GPLv2. + * Credits: Suggested by Laurent Pinchart + */ + +/* + * This file adds a global refcounted Media Controller Device Instance API. + * A system wide global media device list is managed and each media device + * includes a kref count. The last put on the media device releases the media + * device instance. + * +*/ + +#include +#include +#include +#include + +static LIST_HEAD(media_device_list); +static DEFINE_MUTEX(media_device_lock); + +struct media_device_instance { + struct media_device mdev; + struct list_head list; + struct device *dev; + struct kref refcount; +}; + +static inline struct media_device_instance * +to_media_device_instance(struct media_device *mdev) +{ + return container_of(mdev, struct media_device_instance, mdev); +} + +static void media_device_instance_release(struct kref *kref) +{ + struct media_device_instance *mdi = + container_of(kref, struct media_device_instance, refcount); + + dev_dbg(mdi->mdev.dev, "%s: mdev=%p\n", __func__, &mdi->mdev); + + mutex_lock(&media_device_lock); + + media_device_unregister(&mdi->mdev); + media_device_cleanup(&mdi->mdev); + + list_del(&mdi->list); + mutex_unlock(&media_device_lock); + + kfree(mdi); +} + +/* Callers should hold media_device_lock when calling this function */ +static struct media_device *__media_device_get(struct device *dev) +{ + struct media_device_instance *mdi; + + list_for_each_entry(mdi, &media_device_list, list) { + if (mdi->dev == dev) { + kref_get(&mdi->refcount); + dev_dbg(dev, "%s: get mdev=%p\n", + __func__, &mdi->mdev); + return &mdi->mdev; + } + } + + mdi = kzalloc(sizeof(*mdi), GFP_KERNEL); + if (!mdi) + return NULL; + + mdi->dev = dev; + kref_init(&mdi->refcount); + list_add_tail(&mdi->list, &media_device_list); + + dev_dbg(dev, "%s: alloc mdev=%p\n", __func__, &mdi->mdev); + return &mdi->mdev; +} + +struct media_device *media_device_usb_allocate(struct usb_device *udev, + char *driver_name) +{ + struct media_device *mdev; + + mutex_lock(&media_device_lock); + mdev = __media_device_get(&udev->dev); + if (!mdev) { + mutex_unlock(&media_device_lock); + return ERR_PTR(-ENOMEM); + } + + /* check if media device is already initialized */ + if (!mdev->dev) + __media_device_usb_init(mdev, udev, udev->product, + driver_name); + mutex_unlock(&media_device_lock); + + dev_dbg(&udev->dev, "%s\n", __func__); + return mdev; +} +EXPORT_SYMBOL_GPL(media_device_usb_allocate); + +void media_device_delete(struct media_device *mdev) +{ + struct media_device_instance *mdi = to_media_device_instance(mdev); + + dev_dbg(mdi->mdev.dev, "%s: mdev=%p\n", __func__, &mdi->mdev); + kref_put(&mdi->refcount, media_device_instance_release); +} +EXPORT_SYMBOL_GPL(media_device_delete); diff --git a/include/media/media-dev-allocator.h b/include/media/media-dev-allocator.h new file mode 100644 index 0000000..fda032b --- /dev/null +++ b/include/media/media-dev-allocator.h @@ -0,0 +1,85 @@ +/* + * media-dev-allocator.h - Media Controller Device Allocator API + * + * Copyright (c) 2016 Shuah Khan + * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * + * This file is released under the GPLv2. + * Credits: Suggested by Laurent Pinchart + */ + +/* + * This file adds a global ref-counted Media Controller Device Instance API. + * A system wide global media device list is managed and each media device + * includes a kref count. The last put on the media device releases the media + * device instance. +*/ + +#ifndef _MEDIA_DEV_ALLOCTOR_H +#define _MEDIA_DEV_ALLOCTOR_H + +struct usb_device; + +#ifdef CONFIG_MEDIA_CONTROLLER +/** + * DOC: Media Controller Device Allocator API + * + * When media device belongs to more than one driver, the shared media device + * is allocated with the shared struct device as the key for look ups. + * + * Shared media device should stay in registered state until the last driver + * unregisters it. In addition, media device should be released when all the + * references are released. Each driver gets a reference to the media device + * during probe, when it allocates the media device. If media device is already + * allocated, allocate API bumps up the refcount and return the existing media + * device. Driver puts the reference back from its disconnect routine when it + * calls media_device_delete(). + * + * Media device is unregistered and cleaned up from the kref put handler to + * ensure that the media device stays in registered state until the last driver + * unregisters the media device. + * + * Driver Usage: + * + * Drivers should use the media-core routines to get register reference and + * call media_device_delete() routine to make sure the shared media device + * delete is handled correctly. + * + * driver probe: + * Call media_device_usb_allocate() to allocate or get a reference + * Call media_device_register(), if media devnode isn't registered + * + * driver disconnect: + * Call media_device_delete() to free the media_device. Free'ing is + * handled by the put handler. + * + */ + +/** + * media_device_usb_allocate() - Allocate and return media device + * + * @udev - struct usb_device pointer + * @driver_name + * + * This interface should be called to allocate a media device when multiple + * drivers share usb_device and the media device. This interface allocates + * media device and calls media_device_usb_init() to initialize it. + * + */ +struct media_device *media_device_usb_allocate(struct usb_device *udev, + char *driver_name); +/** + * media_device_delete() - Release media device. Calls kref_put(). + * + * @mdev - struct media_device pointer + * + * This interface should be called to put Media Device Instance kref. + */ +void media_device_delete(struct media_device *mdev); +#else +static inline struct media_device *media_device_usb_allocate( + struct usb_device *udev, char *driver_name) + { return NULL; } +static inline void media_device_delete(struct media_device *mdev) { } +#endif /* CONFIG_MEDIA_CONTROLLER */ +#endif