From: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
To: Bjorn Andersson <bjorn.andersson@linaro.org>,
Ohad Ben-Cohen <ohad@wizery.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Andy Gross <agross@kernel.org>
Cc: <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-msm@vger.kernel.org>, <arnaud.pouliquen@foss.st.com>
Subject: [PATCH v2 14/16] rpmsg: glink: add create and release rpmsg channel ops
Date: Tue, 22 Dec 2020 11:57:24 +0100 [thread overview]
Message-ID: <20201222105726.16906-15-arnaud.pouliquen@foss.st.com> (raw)
In-Reply-To: <20201222105726.16906-1-arnaud.pouliquen@foss.st.com>
Add the new ops introduced by the rpmsg_ns series and used
by the rpmsg_ctrl driver to instantiate a new rpmsg channel.
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
---
drivers/rpmsg/qcom_glink_native.c | 94 ++++++++++++++++++++++++-------
1 file changed, 75 insertions(+), 19 deletions(-)
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index 27a05167c18c..d74c338de077 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -205,6 +205,9 @@ static const struct rpmsg_endpoint_ops glink_endpoint_ops;
#define GLINK_FEATURE_INTENTLESS BIT(1)
static void qcom_glink_rx_done_work(struct work_struct *work);
+static struct rpmsg_device *
+qcom_glink_create_rpdev(struct qcom_glink *glink,
+ struct rpmsg_channel_info *chinfo);
static struct glink_channel *qcom_glink_alloc_channel(struct qcom_glink *glink,
const char *name)
@@ -1203,6 +1206,37 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev)
return 0;
}
+static struct rpmsg_device *
+qcom_glink_create_channel(struct rpmsg_device *rp_parent,
+ struct rpmsg_channel_info *chinfo)
+{
+ struct glink_channel *channel = to_glink_channel(rp_parent->ept);
+ struct qcom_glink *glink = channel->glink;
+ struct rpmsg_device *rpdev;
+ const char *name = chinfo->name;
+
+ channel = qcom_glink_alloc_channel(glink, name);
+ if (IS_ERR(channel))
+ return ERR_PTR(PTR_ERR(channel));
+
+ rpdev = qcom_glink_create_rpdev(glink, chinfo);
+ if (!IS_ERR(rpdev)) {
+ rpdev->ept = &channel->ept;
+ channel->rpdev = rpdev;
+ }
+
+ return rpdev;
+}
+
+static int qcom_glink_release_channel(struct rpmsg_device *rpdev,
+ struct rpmsg_channel_info *chinfo)
+{
+ struct glink_channel *channel = to_glink_channel(rpdev->ept);
+ struct qcom_glink *glink = channel->glink;
+
+ return rpmsg_unregister_device(glink->dev, chinfo);
+}
+
static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)
{
struct glink_channel *channel = to_glink_channel(ept);
@@ -1359,6 +1393,8 @@ static struct device_node *qcom_glink_match_channel(struct device_node *node,
static const struct rpmsg_device_ops glink_device_ops = {
.create_ept = qcom_glink_create_ept,
.announce_create = qcom_glink_announce_create,
+ .create_channel = qcom_glink_create_channel,
+ .release_channel = qcom_glink_release_channel,
};
static const struct rpmsg_endpoint_ops glink_endpoint_ops = {
@@ -1376,13 +1412,45 @@ static void qcom_glink_rpdev_release(struct device *dev)
kfree(rpdev);
}
+static struct rpmsg_device *
+qcom_glink_create_rpdev(struct qcom_glink *glink,
+ struct rpmsg_channel_info *chinfo)
+{
+ struct rpmsg_device *rpdev;
+ struct device_node *node;
+ int ret;
+
+ rpdev = kzalloc(sizeof(*rpdev), GFP_KERNEL);
+ if (!rpdev)
+ return ERR_PTR(-ENOMEM);
+
+ strncpy(rpdev->id.name, chinfo->name, RPMSG_NAME_SIZE);
+ rpdev->src = chinfo->src;
+ rpdev->dst = chinfo->dst;
+ rpdev->ops = &glink_device_ops;
+
+ node = qcom_glink_match_channel(glink->dev->of_node, chinfo->name);
+ rpdev->dev.of_node = node;
+ rpdev->dev.parent = glink->dev;
+ rpdev->dev.release = qcom_glink_rpdev_release;
+ rpdev->driver_override = (char *)chinfo->driver_override;
+
+ ret = rpmsg_register_device(rpdev);
+ if (ret) {
+ kfree(rpdev);
+ return ERR_PTR(ret);
+ }
+
+ return rpdev;
+}
+
static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid,
char *name)
{
struct glink_channel *channel;
struct rpmsg_device *rpdev;
bool create_device = false;
- struct device_node *node;
+ struct rpmsg_channel_info chinfo;
int lcid;
int ret;
unsigned long flags;
@@ -1416,27 +1484,15 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid,
complete_all(&channel->open_req);
if (create_device) {
- rpdev = kzalloc(sizeof(*rpdev), GFP_KERNEL);
- if (!rpdev) {
- ret = -ENOMEM;
+ strncpy(chinfo.name, channel->name, sizeof(chinfo.name));
+ chinfo.src = RPMSG_ADDR_ANY;
+ chinfo.dst = RPMSG_ADDR_ANY;
+ rpdev = qcom_glink_create_rpdev(glink, &chinfo);
+ if (IS_ERR(rpdev)) {
+ ret = PTR_ERR(rpdev);
goto rcid_remove;
}
-
rpdev->ept = &channel->ept;
- strncpy(rpdev->id.name, name, RPMSG_NAME_SIZE);
- rpdev->src = RPMSG_ADDR_ANY;
- rpdev->dst = RPMSG_ADDR_ANY;
- rpdev->ops = &glink_device_ops;
-
- node = qcom_glink_match_channel(glink->dev->of_node, name);
- rpdev->dev.of_node = node;
- rpdev->dev.parent = glink->dev;
- rpdev->dev.release = qcom_glink_rpdev_release;
-
- ret = rpmsg_register_device(rpdev);
- if (ret)
- goto rcid_remove;
-
channel->rpdev = rpdev;
}
--
2.17.1
next prev parent reply other threads:[~2020-12-22 10:59 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-22 10:57 [PATCH v2 00/16] introduce generic IOCTL interface for RPMsg channels management Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 01/16] rpmsg: introduce RPMsg control driver for channel creation Arnaud Pouliquen
2020-12-22 16:45 ` Randy Dunlap
2021-01-05 0:21 ` Bjorn Andersson
2021-01-21 23:31 ` Mathieu Poirier
2020-12-22 10:57 ` [PATCH v2 02/16] rpmsg: add RPMsg control API to register service Arnaud Pouliquen
2021-01-05 0:34 ` Bjorn Andersson
2021-01-05 16:53 ` Arnaud POULIQUEN
2021-01-21 23:46 ` Mathieu Poirier
2020-12-22 10:57 ` [PATCH v2 03/16] rpmsg: add override field in channel info Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 04/16] rpmsg: ctrl: implement the ioctl function to create device Arnaud Pouliquen
2021-01-05 1:33 ` Bjorn Andersson
2021-01-05 18:07 ` Arnaud POULIQUEN
2021-01-21 23:52 ` Mathieu Poirier
2021-01-22 13:05 ` Arnaud POULIQUEN
2021-01-22 20:59 ` Mathieu Poirier
2021-01-25 10:52 ` Arnaud POULIQUEN
2021-01-29 0:13 ` Mathieu Poirier
2021-01-29 9:45 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 05/16] rpmsg: ns: initialize channel info override field Arnaud Pouliquen
2021-01-05 0:38 ` Bjorn Andersson
2021-01-05 17:02 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 06/16] rpmsg: add helper to register the rpmsg ctrl device Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 07/16] rpmsg: char: clean up rpmsg class Arnaud Pouliquen
2021-01-05 0:47 ` Bjorn Andersson
2021-01-05 0:54 ` Bjorn Andersson
2021-01-05 17:03 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 08/16] rpmsg: char: make char rpmsg a rpmsg device without the control part Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 09/16] rpmsg: char: register RPMsg raw service to the ioctl interface Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 10/16] rpmsg: char: allow only one endpoint per device Arnaud Pouliquen
2021-01-05 0:59 ` Bjorn Andersson
2021-01-05 17:05 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 11/16] rpmsg: char: check destination address is not null Arnaud Pouliquen
2021-01-05 1:03 ` Bjorn Andersson
2021-01-05 17:08 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 12/16] rpmsg: virtio: use the driver_override in channel creation ops Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 13/16] rpmsg: virtio: probe the rpmsg_ctl device Arnaud Pouliquen
2020-12-29 4:16 ` kernel test robot
2021-01-04 12:59 ` Dan Carpenter
2020-12-22 10:57 ` Arnaud Pouliquen [this message]
2021-01-05 1:08 ` [PATCH v2 14/16] rpmsg: glink: add create and release rpmsg channel ops Bjorn Andersson
2021-01-05 17:29 ` Arnaud POULIQUEN
2020-12-22 10:57 ` [PATCH v2 15/16] rpmsg: smd: " Arnaud Pouliquen
2020-12-22 10:57 ` [PATCH v2 16/16] rpmsg: replace rpmsg_chrdev_register_device use Arnaud Pouliquen
2021-01-05 1:10 ` Bjorn Andersson
2021-01-04 23:03 ` [PATCH v2 00/16] introduce generic IOCTL interface for RPMsg channels management Bjorn Andersson
2021-01-05 16:59 ` Arnaud POULIQUEN
2021-01-13 20:31 ` Mathieu Poirier
2021-01-14 9:05 ` Arnaud POULIQUEN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201222105726.16906-15-arnaud.pouliquen@foss.st.com \
--to=arnaud.pouliquen@foss.st.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mathieu.poirier@linaro.org \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).