From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751954AbbJDUjV (ORCPT ); Sun, 4 Oct 2015 16:39:21 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:32858 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751838AbbJDUjT (ORCPT ); Sun, 4 Oct 2015 16:39:19 -0400 From: Vlad Zolotarov To: linux-kernel@vger.kernel.org, mst@redhat.com, hjk@hansjkoch.de, regkh@linuxfoundation.org, corbet@lwn.net Cc: bruce.richardson@intel.com, avi@cloudius-systems.com, gleb@cloudius-systems.com, stephen@networkplumber.org, alexander.duyck@gmail.com, Vlad Zolotarov Subject: [PATCH v3 1/3] uio: add ioctl support Date: Sun, 4 Oct 2015 23:39:09 +0300 Message-Id: <1443991151-21575-2-git-send-email-vladz@cloudius-systems.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1443991151-21575-1-git-send-email-vladz@cloudius-systems.com> References: <1443991151-21575-1-git-send-email-vladz@cloudius-systems.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Vlad Zolotarov --- drivers/uio/uio.c | 15 +++++++++++++++ include/linux/uio_driver.h | 3 +++ 2 files changed, 18 insertions(+) diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 8196581..714b0e5 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -704,6 +704,20 @@ static int uio_mmap(struct file *filep, struct vm_area_struct *vma) } } +static long uio_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) +{ + struct uio_listener *listener = filep->private_data; + struct uio_device *idev = listener->dev; + + if (!idev->info) + return -EIO; + + if (!idev->info->ioctl) + return -ENOTTY; + + return idev->info->ioctl(idev->info, cmd, arg); +} + static const struct file_operations uio_fops = { .owner = THIS_MODULE, .open = uio_open, @@ -712,6 +726,7 @@ static const struct file_operations uio_fops = { .write = uio_write, .mmap = uio_mmap, .poll = uio_poll, + .unlocked_ioctl = uio_ioctl, .fasync = uio_fasync, .llseek = noop_llseek, }; diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h index 32c0e83..10d7833 100644 --- a/include/linux/uio_driver.h +++ b/include/linux/uio_driver.h @@ -89,6 +89,7 @@ struct uio_device { * @mmap: mmap operation for this uio device * @open: open operation for this uio device * @release: release operation for this uio device + * @ioctl: ioctl handler * @irqcontrol: disable/enable irqs when 0/1 is written to /dev/uioX */ struct uio_info { @@ -105,6 +106,8 @@ struct uio_info { int (*open)(struct uio_info *info, struct inode *inode); int (*release)(struct uio_info *info, struct inode *inode); int (*irqcontrol)(struct uio_info *info, s32 irq_on); + int (*ioctl)(struct uio_info *info, unsigned int cmd, + unsigned long arg); }; extern int __must_check -- 2.1.0