Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2839374pxb; Tue, 13 Apr 2021 11:22:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyBkZtiTuCMSSrZ/KxtiJ4NO56GHAbn3Scg0T1IxYnzAHS0F4GPpORE49GI5p2YcMa6A45S X-Received: by 2002:a05:6402:34cd:: with SMTP id w13mr36902888edc.73.1618338176793; Tue, 13 Apr 2021 11:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618338176; cv=none; d=google.com; s=arc-20160816; b=Ut2Bosvh1KaCJHk8g1mft8zHcYMLrZQBhfJjW4MWj7xwnzkXiiEM4poBYu1lx6pSpu o0wn4moGujRqFSd4YXrvl7GRME947Fq9Jw1a7Cr8lflJjerQOtEDYQWPQo5vIeplzi1U g6Dx7Q/MM/1I6N5HK2/WTK0RLaM3HtUzqgDymaXyOAiNDihMBWeQT3NQrRliq/nsBH1c t9MfLuYCcVAUfW+d1mlXcI+DEqLDff60X0gp8a2xel4GUaDJKnMfhF9E4N+N1dUoPV2c jEImufJvGzhcbPW8qyVJHIQlHpffofS9zuAi6UhQO+ckkj0/OJiY7qh7/9mj/9KqZlC/ DWWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=laDwFTmG7vxs31sYjPVO9eB9hW/Vwa1wSF+VStrGCJU=; b=R/FaW/lbBg0YlygESH2ht00nkxx/lRXNEPFVUcfNWkuqgXzwpnOEl1M8EvHx7kE5nh Rl9l5pwM/FdoUC46GxyyUk3sXv5wF1wvZUTs2UyteQHHCplGIyE/WoBx4P3i6h3UzoeL DeHJALO4ZpTDgKXgoO722N5npqUFI2ivRkoPqhr1vdxiwm1mCBAwBCMfnldzZ76FBjbd FttIsCGM8UWu1h/Q3VQTwlICsvo67NnzeE2jN/JhU8GEqAKm6ZIg85yvRgM1Nfp5xx4h mLfjB4opoEsXRm4ofPUtPXW6uWg+fr2uNAEVdExK1vQUyaElGnuoc8yBpJHfFxReysaS QXiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=l5RtvVbM; 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=foss.st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si10900525ejk.0.2021.04.13.11.22.33; Tue, 13 Apr 2021 11:22:56 -0700 (PDT) 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=@foss.st.com header.s=selector1 header.b=l5RtvVbM; 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=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346095AbhDMNpr (ORCPT + 99 others); Tue, 13 Apr 2021 09:45:47 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:47842 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1346073AbhDMNpo (ORCPT ); Tue, 13 Apr 2021 09:45:44 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 13DDhSmw031780; Tue, 13 Apr 2021 15:45:20 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=laDwFTmG7vxs31sYjPVO9eB9hW/Vwa1wSF+VStrGCJU=; b=l5RtvVbMnHaJv74y607kL88wCKcp1F9pgre7Xo5/YWESs8Dc1N0e+pdDeHWP9uV4vXpd kMeJwc3lTBP1JGatUolorpAGXtPzuv3DC5sMguXHywPv3Kff9wNlp8EWKQ0wSvKg8yM5 jyNmoc4k/84PY88d1UZf23vYaPYAJ7ThJJ5Xvq4SF2EzFKJ9gXf1w3PQmnS3HWhNvtcY n3PA3Bt8SD3ERCvtnsCIJ1CdUoPH1v3En8TjyFlOKGJ9byI8Jjj3H+ZkXpaaVQJOVgwR zaC4Re1WSiPkyDJ+QeEmu2DfPprowQen/uDC2lRf5MYuqEv1mlJ0f+fMlmyfIPz7cMan 6g== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 37vu4e52sh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Apr 2021 15:45:20 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id D6C0E100034; Tue, 13 Apr 2021 15:45:19 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node3.st.com [10.75.127.6]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id C5A79226C5A; Tue, 13 Apr 2021 15:45:19 +0200 (CEST) Received: from localhost (10.75.127.50) by SFHDAG2NODE3.st.com (10.75.127.6) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 13 Apr 2021 15:45:19 +0200 From: Arnaud Pouliquen To: Bjorn Andersson , Ohad Ben-Cohen , Mathieu Poirier CC: , , , Subject: [PATCH v2 1/7] rpmsg: char: Export eptdev create an destroy functions Date: Tue, 13 Apr 2021 15:44:52 +0200 Message-ID: <20210413134458.17912-2-arnaud.pouliquen@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210413134458.17912-1-arnaud.pouliquen@foss.st.com> References: <20210413134458.17912-1-arnaud.pouliquen@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG3NODE2.st.com (10.75.127.8) To SFHDAG2NODE3.st.com (10.75.127.6) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-04-13_07:2021-04-13,2021-04-13 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To prepare the split of the code related to the control (ctrldev) and the endpoint (eptdev) devices in 2 separate files: - Rename and export the functions in rpmsg_char.h. - Suppress the dependency with the rpmsg_ctrldev struct in the rpmsg_chrdev_create_eptdev function. - The rpmsg class is provided as parameter in rpmsg_chrdev_create_eptdev, because the class is associated to the control part. Suggested-by: Mathieu Poirier Signed-off-by: Arnaud Pouliquen --- drivers/rpmsg/rpmsg_char.c | 19 +++++++++------ drivers/rpmsg/rpmsg_char.h | 50 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 drivers/rpmsg/rpmsg_char.h diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 2bebc9b2d163..b9df8dc4365f 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* + * Copyright (C) 2021, STMicroelectronics * Copyright (c) 2016, Linaro Ltd. * Copyright (c) 2012, Michal Simek * Copyright (c) 2012, PetaLogix @@ -22,6 +23,7 @@ #include #include +#include "rpmsg_char.h" #include "rpmsg_internal.h" #define RPMSG_DEV_MAX (MINORMASK + 1) @@ -78,7 +80,7 @@ struct rpmsg_eptdev { wait_queue_head_t readq; }; -static int rpmsg_eptdev_destroy(struct device *dev, void *data) +int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data) { struct rpmsg_eptdev *eptdev = dev_to_eptdev(dev); @@ -97,6 +99,7 @@ static int rpmsg_eptdev_destroy(struct device *dev, void *data) return 0; } +EXPORT_SYMBOL(rpmsg_chrdev_destroy_eptdev); static int rpmsg_ept_cb(struct rpmsg_device *rpdev, void *buf, int len, void *priv, u32 addr) @@ -280,7 +283,7 @@ static long rpmsg_eptdev_ioctl(struct file *fp, unsigned int cmd, if (cmd != RPMSG_DESTROY_EPT_IOCTL) return -EINVAL; - return rpmsg_eptdev_destroy(&eptdev->dev, NULL); + return rpmsg_chrdev_destroy_eptdev(&eptdev->dev, NULL); } static const struct file_operations rpmsg_eptdev_fops = { @@ -339,10 +342,9 @@ static void rpmsg_eptdev_release_device(struct device *dev) kfree(eptdev); } -static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev, - struct rpmsg_channel_info chinfo) +int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent, + struct rpmsg_channel_info chinfo, struct class *rpmsg_class) { - struct rpmsg_device *rpdev = ctrldev->rpdev; struct rpmsg_eptdev *eptdev; struct device *dev; int ret; @@ -362,7 +364,7 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev, device_initialize(dev); dev->class = rpmsg_class; - dev->parent = &ctrldev->dev; + dev->parent = parent; dev->groups = rpmsg_eptdev_groups; dev_set_drvdata(dev, eptdev); @@ -405,6 +407,7 @@ static int rpmsg_eptdev_create(struct rpmsg_ctrldev *ctrldev, return ret; } +EXPORT_SYMBOL(rpmsg_chrdev_create_eptdev); static int rpmsg_ctrldev_open(struct inode *inode, struct file *filp) { @@ -444,7 +447,7 @@ static long rpmsg_ctrldev_ioctl(struct file *fp, unsigned int cmd, chinfo.src = eptinfo.src; chinfo.dst = eptinfo.dst; - return rpmsg_eptdev_create(ctrldev, chinfo); + return rpmsg_chrdev_create_eptdev(ctrldev->rpdev, &ctrldev->dev, chinfo, rpmsg_class); }; static const struct file_operations rpmsg_ctrldev_fops = { @@ -530,7 +533,7 @@ static void rpmsg_chrdev_remove(struct rpmsg_device *rpdev) int ret; /* Destroy all endpoints */ - ret = device_for_each_child(&ctrldev->dev, NULL, rpmsg_eptdev_destroy); + ret = device_for_each_child(&ctrldev->dev, NULL, rpmsg_chrdev_destroy_eptdev); if (ret) dev_warn(&rpdev->dev, "failed to nuke endpoints: %d\n", ret); diff --git a/drivers/rpmsg/rpmsg_char.h b/drivers/rpmsg/rpmsg_char.h new file mode 100644 index 000000000000..379d2ae2bee8 --- /dev/null +++ b/drivers/rpmsg/rpmsg_char.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * Copyright (C) STMicroelectronics 2021. + */ + +#ifndef __RPMSG_CHRDEV_H__ +#define __RPMSG_CHRDEV_H__ + +#if IS_REACHABLE(CONFIG_RPMSG_CHAR) +/** + * rpmsg_chrdev_create_eptdev() - register char device based on an endpoint + * @rpdev: prepared rpdev to be used for creating endpoints + * @parent: parent device + * @chinfo: assiated endpoint channel information. + * + * This function create a new rpmsg char endpoint device to instantiate a new + * endpoint based on chinfo information. + */ +int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent, + struct rpmsg_channel_info chinfo, struct class *rpmsg_class); + +/** + * rpmsg_chrdev_destroy_eptdev() - destroy created char device endpoint. + * @data: private data associated to the endpoint device + * + * This function destroys a rpmsg char endpoint device created by the RPMSG_DESTROY_EPT_IOCTL + * control. + */ +int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data); + +#else /*IS_REACHABLE(CONFIG_RPMSG_CHAR) */ + +static inline int rpmsg_chrdev_create_eptdev(struct rpmsg_device *rpdev, struct device *parent, + struct rpmsg_channel_info chinfo, + struct class *rpmsg_class) +{ + return -EINVAL; +} + +static inline int rpmsg_chrdev_destroy_eptdev(struct device *dev, void *data) +{ + /* This shouldn't be possible */ + WARN_ON(1); + + return 0; +} + +#endif /*IS_REACHABLE(CONFIG_RPMSG_CHAR) */ + +#endif /*__RPMSG_CHRDEV_H__ */ -- 2.17.1