Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1581660pxb; Thu, 4 Mar 2021 15:25:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyW4VyY0ViZkaj7cz9Oea+C93fO5lZP2hyvG74mQGjhTxD3oOcLY9ZK37P6f28+TKqC2qew X-Received: by 2002:a17:906:39cf:: with SMTP id i15mr6805947eje.534.1614900313898; Thu, 04 Mar 2021 15:25:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614900313; cv=none; d=google.com; s=arc-20160816; b=tzGaviN5z3VRWN7eWtiBgevPJmH06+4JftIzF4+SZz6vo61A3Z1a3ZSRHhfzpX0z7i XXD8T4X3BvMFKaVHFLAOZs0JY9b5+hOZ0vULpg/yv3Yu7BvgKy7rWl2441JP18io7JAT Z/qcHl9bG+hXBqCXk0cdVSlBR1zZ+rBZvndJJzgdfST7e3mwBPyTdrNfNzJFtYAdfXDB DRld61SUzoZ/dgPOVGi06xYvzzj6sCr/1ZThCba4ZMSL99/QDPYh1RND2tkMRQT41Qkf JNYSGBg2yNHuoOFSmUl2frfSaLIO/VC30RgR7Q6Q6KwQAqkGdxXUFJIE4WgcuYD4gaWa ceMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=uYGg459EXuHIWECY+IIo8DgWWTzAsQiATwF/BpQV9Ks=; b=oLDBQeqE6MPTaEBhv5LumDW/oPgSm2ssv4g/pTGU9xE2vI7EX6ddFZapBjSxiwhbrI deMwxDGjTAB3x0modTlVJByHPg3Q3cotAAxtSOFB0WyLkjvZSAFe/xslr76LnQHtSBNt G934TQVpJyBtGPloCpcTiMouAQRDTpVpRiYU0GiiO/uIxvsZQ70gnwjHOyF/vQ5U09sM RVX36nDBzaUVWN2mpUVcy+aaC88gdP3LjtxfoNdbP1vYDKmEfUdEWNxWc2sMeo5mRigN TgvueBEokCGpKuIF6uzrH6DEjI7JVtW9Daj5OvrS2piEtb2iMVezAKhQg74fbxSu6FLT 39sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FGy7EG6F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o13si349582ejn.226.2021.03.04.15.24.50; Thu, 04 Mar 2021 15:25:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FGy7EG6F; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1579373AbhCCSbI (ORCPT + 99 others); Wed, 3 Mar 2021 13:31:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240450AbhCCQfT (ORCPT ); Wed, 3 Mar 2021 11:35:19 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 084C2C061765 for ; Wed, 3 Mar 2021 08:34:25 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id o6so4660311pjf.5 for ; Wed, 03 Mar 2021 08:34:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=uYGg459EXuHIWECY+IIo8DgWWTzAsQiATwF/BpQV9Ks=; b=FGy7EG6FYaWzJ3EgAeEonhzn8rvGs6yR9G5oisHbtpsuH0SMdXD4aHsU8QHFXn3Doa BCOnmQgqR28I94demcNg8sRbjeFxsueTF5wPPCzPjHVd92NNaewv2dwBbucCN3Hv5mZs hZ+shcwcXqEOxjMKK2eLzHH8H0Xs8LxgOh497yWgWe2o67Mk+ASYvayB3aOqMOvOYs2y 6+iNDckphVOYvi9vbyj5eQi1pvY5DnLgiz3RvOwMfjMVuvcl9f+jOa/Y9NV914BlMtV6 gRc1lEqwfHx8vZYR7KCqsL3wGnDE9nvvXVmesElCgaE5CAvhOPVpv1/zLL5fx/RqfLcF iAtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=uYGg459EXuHIWECY+IIo8DgWWTzAsQiATwF/BpQV9Ks=; b=MQZmIEJw9t9YHQsOF/XgFPJBHyl2gkt61zh2FoV7jOw0ix26Olg3f5bKBKK6O9Hp0M sRuyqQ+kpxboEVYNrqGiOQzyLTRyzI10CmlOpIJtRBsvhinS72oPanHd/F2QhEh7OWGr l3+pKus15sDurOJcVQl/pbLQtM8nNgu0RxiF+U3T6jpBh7CIRrfrVplM5+DB++eVYiqG rGoDlVJvYTZl6LrbvwTYGNhisastwIl0t9U/I6ThofvyRKX+0jnzhaTEtJ8AO6UW1Rkp 1Hf+RM/X2a4YTSbtZfLm3qsoaWYgOJXX+AgpRxxKatvxJPiZm/5u7cXHm/6KHXL1qXad Ukdg== X-Gm-Message-State: AOAM5324ig6SMCLPEVe7Po0lCYR/YnyxYKVkY3mpId1g9uMDDdXFzDpl tkf6pwdTEOHl20Z3WKsneZ7DTw== X-Received: by 2002:a17:902:ab8f:b029:e5:c92e:2c5f with SMTP id f15-20020a170902ab8fb02900e5c92e2c5fmr3337400plr.75.1614789264418; Wed, 03 Mar 2021 08:34:24 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id l12sm15542229pfd.33.2021.03.03.08.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 08:34:23 -0800 (PST) Date: Wed, 3 Mar 2021 09:34:21 -0700 From: Mathieu Poirier To: Arnaud POULIQUEN Cc: Bjorn Andersson , Ohad Ben-Cohen , Andy Gross , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-msm@vger.kernel.org Subject: Re: [PATCH v5 06/16] rpmsg: move the rpmsg control device from rpmsg_char to rpmsg_ctrl Message-ID: <20210303163421.GB3817330@xps15> References: <20210219111501.14261-1-arnaud.pouliquen@foss.st.com> <20210219111501.14261-7-arnaud.pouliquen@foss.st.com> <20210302183516.GC3791957@xps15> <64760ba3-5b23-bf74-6961-b77813919abc@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <64760ba3-5b23-bf74-6961-b77813919abc@foss.st.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 03, 2021 at 03:59:34PM +0100, Arnaud POULIQUEN wrote: > > > On 3/2/21 7:35 PM, Mathieu Poirier wrote: > > On Fri, Feb 19, 2021 at 12:14:51PM +0100, Arnaud Pouliquen wrote: > >> Move the code related to the rpmsg_ctrl char device to the new > >> rpmsg_ctrl.c module. > >> Manage the dependency in the kconfig. > >> > >> Signed-off-by: Arnaud Pouliquen > >> --- > >> drivers/rpmsg/Kconfig | 9 ++ > >> drivers/rpmsg/Makefile | 1 + > >> drivers/rpmsg/rpmsg_char.c | 163 ---------------------------- > >> drivers/rpmsg/rpmsg_ctrl.c | 216 +++++++++++++++++++++++++++++++++++++ > >> 4 files changed, 226 insertions(+), 163 deletions(-) > >> create mode 100644 drivers/rpmsg/rpmsg_ctrl.c > >> > >> diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig > >> index 0b4407abdf13..2d0cd7fdd710 100644 > >> --- a/drivers/rpmsg/Kconfig > >> +++ b/drivers/rpmsg/Kconfig > >> @@ -10,11 +10,20 @@ config RPMSG_CHAR > >> tristate "RPMSG device interface" > >> depends on RPMSG > >> depends on NET > >> + select RPMSG_CTRL > >> help > >> Say Y here to export rpmsg endpoints as device files, usually found > >> in /dev. They make it possible for user-space programs to send and > >> receive rpmsg packets. > >> > >> +config RPMSG_CTRL > >> + tristate "RPMSG control interface" > >> + depends on RPMSG > >> + help > >> + Say Y here to enable the support of the /dev/rpmsg_ctlX API. This API > > > > s/rpmsg_ctlX/rpmsg_ctrlX > > Good catch! > > > > >> + allows user-space programs to create endpoints with specific service name, > >> + source and destination addresses. > >> + > >> config RPMSG_NS > >> tristate "RPMSG name service announcement" > >> depends on RPMSG > >> diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile > >> index 8d452656f0ee..58e3b382e316 100644 > >> --- a/drivers/rpmsg/Makefile > >> +++ b/drivers/rpmsg/Makefile > >> @@ -1,6 +1,7 @@ > >> # SPDX-License-Identifier: GPL-2.0 > >> obj-$(CONFIG_RPMSG) += rpmsg_core.o > >> obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o > >> +obj-$(CONFIG_RPMSG_CTRL) += rpmsg_ctrl.o > >> obj-$(CONFIG_RPMSG_NS) += rpmsg_ns.o > >> obj-$(CONFIG_RPMSG_MTK_SCP) += mtk_rpmsg.o > >> qcom_glink-objs := qcom_glink_native.o qcom_glink_ssr.o > >> diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c > >> index 23e369a00531..83c10b39b139 100644 > >> --- a/drivers/rpmsg/rpmsg_char.c > >> +++ b/drivers/rpmsg/rpmsg_char.c > >> @@ -31,28 +31,12 @@ > >> static dev_t rpmsg_major; > >> static struct class *rpmsg_class; > >> > >> -static DEFINE_IDA(rpmsg_ctrl_ida); > >> static DEFINE_IDA(rpmsg_ept_ida); > >> static DEFINE_IDA(rpmsg_minor_ida); > >> > >> #define dev_to_eptdev(dev) container_of(dev, struct rpmsg_eptdev, dev) > >> #define cdev_to_eptdev(i_cdev) container_of(i_cdev, struct rpmsg_eptdev, cdev) > >> > >> -#define dev_to_ctrldev(dev) container_of(dev, struct rpmsg_ctrldev, dev) > >> -#define cdev_to_ctrldev(i_cdev) container_of(i_cdev, struct rpmsg_ctrldev, cdev) > >> - > >> -/** > >> - * struct rpmsg_ctrldev - control device for instantiating endpoint devices > >> - * @rpdev: underlaying rpmsg device > >> - * @cdev: cdev for the ctrl device > >> - * @dev: device for the ctrl device > >> - */ > >> -struct rpmsg_ctrldev { > >> - struct rpmsg_device *rpdev; > >> - struct cdev cdev; > >> - struct device dev; > >> -}; > > > > This showed up in rpmsg_ctrl.c as rpmsg_ctrl. The same goes for many functions > > names - they are removed here and re-introduced under a different name, which > > makes it very hard to follow. What ends up in the new file should be a carbon > > copy of what was moved. > > Ok i will split it in 2 steps. In most cases I don't think there is a need for a wholesale renaming exercise. To me having a struct rpmsg_ctrldev and functions names such as rpmsg_ctrldev_open() in a file called rpmsg_ctrl.c is perfectly acceptable. > > Thanks > Arnaud > > > > > I'm out of time for today, more comments tomorrow. > > > > Thanks, > > Mathieu > > > >> - > >> /** > >> * struct rpmsg_eptdev - endpoint device context > >> * @dev: endpoint device > >> @@ -411,145 +395,6 @@ int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent > >> } > >> EXPORT_SYMBOL(rpmsg_chrdev_create_eptdev); > >> > >> -static int rpmsg_ctrldev_open(struct inode *inode, struct file *filp) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev = cdev_to_ctrldev(inode->i_cdev); > >> - > >> - get_device(&ctrldev->dev); > >> - filp->private_data = ctrldev; > >> - > >> - return 0; > >> -} > >> - > >> -static int rpmsg_ctrldev_release(struct inode *inode, struct file *filp) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev = cdev_to_ctrldev(inode->i_cdev); > >> - > >> - put_device(&ctrldev->dev); > >> - > >> - return 0; > >> -} > >> - > >> -static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd, > >> - unsigned long arg) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev = fp->private_data; > >> - void __user *argp = (void __user *)arg; > >> - struct rpmsg_endpoint_info eptinfo; > >> - struct rpmsg_channel_info chinfo; > >> - > >> - if (cmd != RPMSG_CREATE_EPT_IOCTL) > >> - return -EINVAL; > >> - > >> - if (copy_from_user(&eptinfo, argp, sizeof(eptinfo))) > >> - return -EFAULT; > >> - > >> - memcpy(chinfo.name, eptinfo.name, RPMSG_NAME_SIZE); > >> - chinfo.name[RPMSG_NAME_SIZE-1] = '\0'; > >> - chinfo.src = eptinfo.src; > >> - chinfo.dst = eptinfo.dst; > >> - > >> - return rpmsg_chrdev_create_eptdev(ctrldev->rpdev, &ctrldev->dev, chinfo); > >> -}; > >> - > >> -static const struct file_operations rpmsg_ctrldev_fops = { > >> - .owner = THIS_MODULE, > >> - .open = rpmsg_ctrldev_open, > >> - .release = rpmsg_ctrldev_release, > >> - .unlocked_ioctl = rpmsg_ctrldev_ioctl, > >> - .compat_ioctl = compat_ptr_ioctl, > >> -}; > >> - > >> -static void rpmsg_ctrldev_release_device(struct device *dev) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev = dev_to_ctrldev(dev); > >> - > >> - ida_simple_remove(&rpmsg_ctrl_ida, dev->id); > >> - ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); > >> - cdev_del(&ctrldev->cdev); > >> - kfree(ctrldev); > >> -} > >> - > >> -static int rpmsg_chrdev_probe(struct rpmsg_device *rpdev) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev; > >> - struct device *dev; > >> - int ret; > >> - > >> - ctrldev = kzalloc(sizeof(*ctrldev), GFP_KERNEL); > >> - if (!ctrldev) > >> - return -ENOMEM; > >> - > >> - ctrldev->rpdev = rpdev; > >> - > >> - dev = &ctrldev->dev; > >> - device_initialize(dev); > >> - dev->parent = &rpdev->dev; > >> - > >> - cdev_init(&ctrldev->cdev, &rpmsg_ctrldev_fops); > >> - ctrldev->cdev.owner = THIS_MODULE; > >> - > >> - ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL); > >> - if (ret < 0) > >> - goto free_ctrldev; > >> - dev->devt = MKDEV(MAJOR(rpmsg_major), ret); > >> - > >> - ret = ida_simple_get(&rpmsg_ctrl_ida, 0, 0, GFP_KERNEL); > >> - if (ret < 0) > >> - goto free_minor_ida; > >> - dev->id = ret; > >> - dev_set_name(&ctrldev->dev, "rpmsg_ctrl%d", ret); > >> - > >> - ret = cdev_add(&ctrldev->cdev, dev->devt, 1); > >> - if (ret) > >> - goto free_ctrl_ida; > >> - > >> - /* We can now rely on the release function for cleanup */ > >> - dev->release = rpmsg_ctrldev_release_device; > >> - > >> - ret = device_add(dev); > >> - if (ret) { > >> - dev_err(&rpdev->dev, "device_add failed: %d\n", ret); > >> - put_device(dev); > >> - } > >> - > >> - dev_set_drvdata(&rpdev->dev, ctrldev); > >> - > >> - return ret; > >> - > >> -free_ctrl_ida: > >> - ida_simple_remove(&rpmsg_ctrl_ida, dev->id); > >> -free_minor_ida: > >> - ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); > >> -free_ctrldev: > >> - put_device(dev); > >> - kfree(ctrldev); > >> - > >> - return ret; > >> -} > >> - > >> -static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev) > >> -{ > >> - struct rpmsg_ctrldev *ctrldev = dev_get_drvdata(&rpdev->dev); > >> - int ret; > >> - > >> - /* Destroy all endpoints */ > >> - ret = device_for_each_child(&ctrldev->dev, NULL, rpmsg_chrdev_eptdev_destroy); > >> - if (ret) > >> - dev_warn(&rpdev->dev, "failed to nuke endpoints: %d\n", ret); > >> - > >> - device_del(&ctrldev->dev); > >> - put_device(&ctrldev->dev); > >> -} > >> - > >> -static struct rpmsg_driver rpmsg_chrdev_driver = { > >> - .probe = rpmsg_chrdev_probe, > >> - .remove = rpmsg_chrdev_remove, > >> - .drv = { > >> - .name = "rpmsg_chrdev", > >> - }, > >> -}; > >> - > >> static int rpmsg_chrdev_init(void) > >> { > >> int ret; > >> @@ -567,20 +412,12 @@ static int rpmsg_chrdev_init(void) > >> return PTR_ERR(rpmsg_class); > >> } > >> > >> - ret = register_rpmsg_driver(&rpmsg_chrdev_driver); > >> - if (ret < 0) { > >> - pr_err("rpmsgchr: failed to register rpmsg driver\n"); > >> - class_destroy(rpmsg_class); > >> - unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); > >> - } > >> - > >> return ret; > >> } > >> postcore_initcall(rpmsg_chrdev_init); > >> > >> static void rpmsg_chrdev_exit(void) > >> { > >> - unregister_rpmsg_driver(&rpmsg_chrdev_driver); > >> class_destroy(rpmsg_class); > >> unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); > >> } > >> diff --git a/drivers/rpmsg/rpmsg_ctrl.c b/drivers/rpmsg/rpmsg_ctrl.c > >> new file mode 100644 > >> index 000000000000..fa05b67d24da > >> --- /dev/null > >> +++ b/drivers/rpmsg/rpmsg_ctrl.c > >> @@ -0,0 +1,216 @@ > >> +// SPDX-License-Identifier: GPL-2.0 > >> +/* > >> + * Copyright (C) 2021, STMicroelectronics > >> + * Copyright (c) 2016, Linaro Ltd. > >> + * Copyright (c) 2012, Michal Simek > >> + * Copyright (c) 2012, PetaLogix > >> + * Copyright (c) 2011, Texas Instruments, Inc. > >> + * Copyright (c) 2011, Google, Inc. > >> + * > >> + * Based on rpmsg performance statistics driver by Michal Simek, which in turn > >> + * was based on TI & Google OMX rpmsg driver. > >> + */ > >> +#include > >> +#include > >> +#include > >> +#include > >> +#include > >> +#include > >> +#include > >> +#include > >> +#include > >> + > >> +#include "rpmsg_char.h" > >> +#include "rpmsg_internal.h" > >> + > >> +#define RPMSG_DEV_MAX (MINORMASK + 1) > >> + > >> +static dev_t rpmsg_major; > >> + > >> +static DEFINE_IDA(rpmsg_ctrl_ida); > >> +static DEFINE_IDA(rpmsg_minor_ida); > >> + > >> +#define dev_to_ctrldev(dev) container_of(dev, struct rpmsg_ctrl, dev) > >> +#define cdev_to_ctrldev(i_cdev) container_of(i_cdev, struct rpmsg_ctrl, cdev) > >> + > >> +/** > >> + * struct rpmsg_ctrl - control device for instantiating endpoint devices > >> + * @rpdev: underlaying rpmsg device > >> + * @cdev: cdev for the ctrl device > >> + * @dev: device for the ctrl device > >> + */ > >> +struct rpmsg_ctrl { > >> + struct rpmsg_device *rpdev; > >> + struct cdev cdev; > >> + struct device dev; > >> +}; > >> + > >> +static int rpmsg_ctrl_open(struct inode *inode, struct file *filp) > >> +{ > >> + struct rpmsg_ctrl *ctrldev = cdev_to_ctrldev(inode->i_cdev); > >> + > >> + get_device(&ctrldev->dev); > >> + filp->private_data = ctrldev; > >> + > >> + return 0; > >> +} > >> + > >> +static int rpmsg_ctrl_release(struct inode *inode, struct file *filp) > >> +{ > >> + struct rpmsg_ctrl *ctrldev = cdev_to_ctrldev(inode->i_cdev); > >> + > >> + put_device(&ctrldev->dev); > >> + > >> + return 0; > >> +} > >> + > >> +static long rpmsg_ctrl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) > >> +{ > >> + struct rpmsg_ctrl *ctrldev = fp->private_data; > >> + void __user *argp = (void __user *)arg; > >> + struct rpmsg_endpoint_info eptinfo; > >> + struct rpmsg_channel_info chinfo; > >> + > >> + if (cmd != RPMSG_CREATE_EPT_IOCTL) > >> + return -EINVAL; > >> + > >> + if (copy_from_user(&eptinfo, argp, sizeof(eptinfo))) > >> + return -EFAULT; > >> + > >> + memcpy(chinfo.name, eptinfo.name, RPMSG_NAME_SIZE); > >> + chinfo.name[RPMSG_NAME_SIZE - 1] = '\0'; > >> + chinfo.src = eptinfo.src; > >> + chinfo.dst = eptinfo.dst; > >> + > >> + return rpmsg_chrdev_create_eptdev(ctrldev->rpdev, &ctrldev->dev, chinfo); > >> +}; > >> + > >> +static const struct file_operations rpmsg_ctrl_fops = { > >> + .owner = THIS_MODULE, > >> + .open = rpmsg_ctrl_open, > >> + .release = rpmsg_ctrl_release, > >> + .unlocked_ioctl = rpmsg_ctrl_ioctl, > >> + .compat_ioctl = compat_ptr_ioctl, > >> +}; > >> + > >> +static void rpmsg_ctrl_release_device(struct device *dev) > >> +{ > >> + struct rpmsg_ctrl *ctrldev = dev_to_ctrldev(dev); > >> + > >> + ida_simple_remove(&rpmsg_ctrl_ida, dev->id); > >> + ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); > >> + cdev_del(&ctrldev->cdev); > >> + kfree(ctrldev); > >> +} > >> + > >> +static int rpmsg_ctrl_probe(struct rpmsg_device *rpdev) > >> +{ > >> + struct rpmsg_ctrl *ctrldev; > >> + struct device *dev; > >> + int ret; > >> + > >> + ctrldev = kzalloc(sizeof(*ctrldev), GFP_KERNEL); > >> + if (!ctrldev) > >> + return -ENOMEM; > >> + > >> + ctrldev->rpdev = rpdev; > >> + > >> + dev = &ctrldev->dev; > >> + device_initialize(dev); > >> + dev->parent = &rpdev->dev; > >> + > >> + cdev_init(&ctrldev->cdev, &rpmsg_ctrl_fops); > >> + ctrldev->cdev.owner = THIS_MODULE; > >> + > >> + ret = ida_simple_get(&rpmsg_minor_ida, 0, RPMSG_DEV_MAX, GFP_KERNEL); > >> + if (ret < 0) > >> + goto free_ctrldev; > >> + dev->devt = MKDEV(MAJOR(rpmsg_major), ret); > >> + > >> + ret = ida_simple_get(&rpmsg_ctrl_ida, 0, 0, GFP_KERNEL); > >> + if (ret < 0) > >> + goto free_minor_ida; > >> + dev->id = ret; > >> + dev_set_name(&ctrldev->dev, "rpmsg_ctrl%d", ret); > >> + > >> + ret = cdev_add(&ctrldev->cdev, dev->devt, 1); > >> + if (ret) > >> + goto free_ctrl_ida; > >> + > >> + /* We can now rely on the release function for cleanup */ > >> + dev->release = rpmsg_ctrl_release_device; > >> + > >> + ret = device_add(dev); > >> + if (ret) { > >> + dev_err(&rpdev->dev, "device_add failed: %d\n", ret); > >> + put_device(dev); > >> + } > >> + > >> + dev_set_drvdata(&rpdev->dev, ctrldev); > >> + > >> + return ret; > >> + > >> +free_ctrl_ida: > >> + ida_simple_remove(&rpmsg_ctrl_ida, dev->id); > >> +free_minor_ida: > >> + ida_simple_remove(&rpmsg_minor_ida, MINOR(dev->devt)); > >> +free_ctrldev: > >> + put_device(dev); > >> + kfree(ctrldev); > >> + > >> + return ret; > >> +} > >> + > >> +static void rpmsg_ctrl_remove(struct rpmsg_device *rpdev) > >> +{ > >> + struct rpmsg_ctrl *ctrldev = dev_get_drvdata(&rpdev->dev); > >> + int ret; > >> + > >> + /* Destroy all endpoints */ > >> + ret = device_for_each_child(&ctrldev->dev, NULL, > >> + rpmsg_chrdev_eptdev_destroy); > >> + if (ret) > >> + dev_warn(&rpdev->dev, "failed to nuke endpoints: %d\n", ret); > >> + > >> + device_del(&ctrldev->dev); > >> + put_device(&ctrldev->dev); > >> +} > >> + > >> +static struct rpmsg_driver rpmsg_ctrl_driver = { > >> + .probe = rpmsg_ctrl_probe, > >> + .remove = rpmsg_ctrl_remove, > >> + .drv = { > >> + .name = "rpmsg_chrdev", > >> + }, > >> +}; > >> + > >> +static int rpmsg_ctrl_init(void) > >> +{ > >> + int ret; > >> + > >> + ret = alloc_chrdev_region(&rpmsg_major, 0, RPMSG_DEV_MAX, "rpmsg"); > >> + if (ret < 0) { > >> + pr_err("rpmsg: failed to allocate char dev region\n"); > >> + return ret; > >> + } > >> + > >> + ret = register_rpmsg_driver(&rpmsg_ctrl_driver); > >> + if (ret < 0) { > >> + pr_err("rpmsg ctrl: failed to register rpmsg driver\n"); > >> + unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); > >> + } > >> + > >> + return ret; > >> +} > >> +postcore_initcall(rpmsg_ctrl_init); > >> + > >> +static void rpmsg_ctrl_exit(void) > >> +{ > >> + unregister_rpmsg_driver(&rpmsg_ctrl_driver); > >> + unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); > >> +} > >> +module_exit(rpmsg_ctrl_exit); > >> + > >> +MODULE_DESCRIPTION("rpmsg control interface"); > >> +MODULE_ALIAS("rpmsg:" KBUILD_MODNAME); > >> +MODULE_LICENSE("GPL v2"); > >> -- > >> 2.17.1 > >>