From patchwork Thu Sep 1 22:27:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9310033 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 0430560756 for ; Thu, 1 Sep 2016 22:35:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B25DB2955E for ; Thu, 1 Sep 2016 22:35:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6ECD29562; Thu, 1 Sep 2016 22:35:41 +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=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 3EFFA2955E for ; Thu, 1 Sep 2016 22:35:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751789AbcIAWfN (ORCPT ); Thu, 1 Sep 2016 18:35:13 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35901 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888AbcIAW2R (ORCPT ); Thu, 1 Sep 2016 18:28:17 -0400 Received: by mail-pa0-f47.google.com with SMTP id fu3so26011219pad.3 for ; Thu, 01 Sep 2016 15:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=InXg5IeaJ4T1BKvIl2OlUYZk4v843hEDtsTk6TEgrM8=; b=OUyovow6RPXepHZAG+A2ND/j6z5xx5NEJ8abB+kpsHw67Vyk2/leIwvBSQ3sY4oS45 2BboQogkfg8gZ8foIp3qhk/+9eKQZ8bfnS9sAvQsl9umQKU4Q6ixxjKv7DXzNMuxoDIo pfJhdESE8RcLE5z7NbvF9KF/+j5MmvsVDbz14= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=InXg5IeaJ4T1BKvIl2OlUYZk4v843hEDtsTk6TEgrM8=; b=YssxfhvWEz31vCKCScvmZ+ML4DHgsRiIMLkQ/QiylAcjmaycF9F4k2rfd/h1TJuors vrT7yDW//7AoxQz8tGhkO5ifWYeEPNcDvzLsoM8c9andFwYhbufcUx7SlH/KwaDuKZ1Z SkO6hRY9+aRIBc2A4GCCh8bW//of8dU06SJF35WEbe+hkseLjJdnQYNB+2+QSoeP7L2l oS472ZN5qtrKW7PdGEnt42/uIt9flf0eOjnhhH4L+wtVFkJ3nlAzPsDm5AvqOIpA7d77 8GYDzUbCUYgLYI6W3owRnArPOsweA/6wOn5VonXwmds0iumi57Y5hovUMnJITDGlL5DM nQSg== X-Gm-Message-State: AE9vXwPZ89jsNd8syFFw3IpO6HIcgvNUYDEhWSyD7lgxfF7FIDeKWApselDjYoQvC+9+SNBn X-Received: by 10.66.217.132 with SMTP id oy4mr30895415pac.46.1472768897110; Thu, 01 Sep 2016 15:28:17 -0700 (PDT) Received: from localhost.localdomain (ip68-111-223-48.sd.sd.cox.net. [68.111.223.48]) by smtp.gmail.com with ESMTPSA id iw10sm8887131pac.14.2016.09.01.15.28.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Sep 2016 15:28:16 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/17] rpmsg: Make rpmsg_create_ept() take channel_info struct Date: Thu, 1 Sep 2016 15:27:56 -0700 Message-Id: <1472768889-3906-5-git-send-email-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1472768889-3906-1-git-send-email-bjorn.andersson@linaro.org> References: <1472768889-3906-1-git-send-email-bjorn.andersson@linaro.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As we introduce support for additional rpmsg backends, some of these only supports point-to-point "links" represented by a name. By making rpmsg_create_ept() take a channel_info struct we allow for these backends to either be passed a source address, a destination address or a name identifier. Signed-off-by: Bjorn Andersson --- Changes since v1: - None drivers/rpmsg/virtio_rpmsg_bus.c | 26 ++++++++++---------------- include/linux/rpmsg.h | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 345036b485d7..7c7c6a8b21d9 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -73,18 +73,6 @@ struct virtproc_info { struct rpmsg_endpoint *ns_ept; }; -/** - * struct rpmsg_channel_info - internal channel info representation - * @name: name of service - * @src: local address - * @dst: destination address - */ -struct rpmsg_channel_info { - char name[RPMSG_NAME_SIZE]; - u32 src; - u32 dst; -}; - #define to_rpmsg_channel(d) container_of(d, struct rpmsg_channel, dev) #define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv) @@ -259,7 +247,7 @@ free_ept: * @rpdev: rpmsg channel device * @cb: rx callback handler * @priv: private data for the driver's use - * @addr: local rpmsg address to bind with @cb + * @chinfo: channel_info with the local rpmsg address to bind with @cb * * Every rpmsg address in the system is bound to an rx callback (so when * inbound messages arrive, they are dispatched by the rpmsg bus using the @@ -295,9 +283,10 @@ free_ept: * Returns a pointer to the endpoint on success, or NULL on error. */ struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *rpdev, - rpmsg_rx_cb_t cb, void *priv, u32 addr) + rpmsg_rx_cb_t cb, void *priv, + struct rpmsg_channel_info chinfo) { - return __rpmsg_create_ept(rpdev->vrp, rpdev, cb, priv, addr); + return __rpmsg_create_ept(rpdev->vrp, rpdev, cb, priv, chinfo.src); } EXPORT_SYMBOL(rpmsg_create_ept); @@ -353,10 +342,15 @@ static int rpmsg_dev_probe(struct device *dev) struct rpmsg_channel *rpdev = to_rpmsg_channel(dev); struct rpmsg_driver *rpdrv = to_rpmsg_driver(rpdev->dev.driver); struct virtproc_info *vrp = rpdev->vrp; + struct rpmsg_channel_info chinfo = {}; struct rpmsg_endpoint *ept; int err; - ept = rpmsg_create_ept(rpdev, rpdrv->callback, NULL, rpdev->src); + strncpy(chinfo.name, rpdev->id.name, RPMSG_NAME_SIZE); + chinfo.src = rpdev->src; + chinfo.dst = RPMSG_ADDR_ANY; + + ept = rpmsg_create_ept(rpdev, rpdrv->callback, NULL, chinfo); if (!ept) { dev_err(dev, "failed to create endpoint\n"); err = -ENOMEM; diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index a901a331a190..f278407fcf48 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -98,6 +98,18 @@ enum rpmsg_ns_flags { struct virtproc_info; /** + * struct rpmsg_channel_info - channel info representation + * @name: name of service + * @src: local address + * @dst: destination address + */ +struct rpmsg_channel_info { + char name[RPMSG_NAME_SIZE]; + u32 src; + u32 dst; +}; + +/** * rpmsg_channel - devices that belong to the rpmsg bus are called channels * @vrp: the remote processor this channel belongs to * @dev: the device struct @@ -171,7 +183,8 @@ int __register_rpmsg_driver(struct rpmsg_driver *drv, struct module *owner); void unregister_rpmsg_driver(struct rpmsg_driver *drv); void rpmsg_destroy_ept(struct rpmsg_endpoint *); struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *, - rpmsg_rx_cb_t cb, void *priv, u32 addr); + rpmsg_rx_cb_t cb, void *priv, + struct rpmsg_channel_info chinfo); int rpmsg_send_offchannel_raw(struct rpmsg_channel *, u32, u32, void *, int, bool);