From patchwork Thu Sep 1 22:28:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 9309947 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 2FACE60756 for ; Thu, 1 Sep 2016 22:31:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E895A293DE for ; Thu, 1 Sep 2016 22:31:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD77229547; Thu, 1 Sep 2016 22:31:13 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 3D39E293DE for ; Thu, 1 Sep 2016 22:31:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753063AbcIAWaq (ORCPT ); Thu, 1 Sep 2016 18:30:46 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:32901 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752294AbcIAW2Y (ORCPT ); Thu, 1 Sep 2016 18:28:24 -0400 Received: by mail-pa0-f44.google.com with SMTP id cy9so33877134pac.0 for ; Thu, 01 Sep 2016 15:28:24 -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=bc1D44qko1+d2oHZhh4E39pkTpRCkwjorh4iYq/U+UI=; b=cxtiTyiMulostdMxWpU3VBczn3zF/R4wV0pIx8KRcXQxJLBwMu7g7iaOMWz3k2g0cC 33cc2ic/vyU33TjFJvkN2Y1ndnsbd9YrFI4bSPM++ILPamFRdY9p5VvMjUibdNK71Vg4 8v54nynuXPgfhsithLPLc3Bak1E1BKpRStuSI= 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=bc1D44qko1+d2oHZhh4E39pkTpRCkwjorh4iYq/U+UI=; b=VAlb0RwsntoSYbwnauFZnN22zbQ86FPBAgR59G6lc/fuk8Nnp14LoksUflFLwG7BGS WCLY47E+yE7NrpxgnFf/cATyfKiZAUGv4JpT03jOu2r88YR1JGiC45MvXX3GAqhJeAvl hNZtyW0abXdyTShUVb1risSVyyLVR6AFNqJsAT2qKbbqrBdYXgJ3BdRc6+8UKbgw4kmM 52L5rHNJ2tnr5/ikvZQuymGlQ2Pmw/FSbwgPWMAFoOpd76S1NFPved29HUwXJlKLkdX7 q0EWjqvScSiq6wPAKNdisuVY6QBtQZrYPyIOLoU17clcGhXtGLLpYyHZUGSTCOshm6Km QlZA== X-Gm-Message-State: AE9vXwPRA836u23mQEZ6k3h0I+0L/R+2evQhknuoiWrBl13qkeGamKJBvO4myQXHuLzP7i8+ X-Received: by 10.66.229.9 with SMTP id sm9mr30675183pac.138.1472768904175; Thu, 01 Sep 2016 15:28:24 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Sep 2016 15:28:23 -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 10/17] rpmsg: Move helper for finding rpmsg devices to core Date: Thu, 1 Sep 2016 15:28:02 -0700 Message-Id: <1472768889-3906-11-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 Extract and move the helper function for finding rpmsg child devices to the core. Signed-off-by: Bjorn Andersson --- Changes since v1: - Extracted this from the big move to rpmsg_core.c in v1 drivers/rpmsg/rpmsg_core.c | 33 +++++++++++++++++++++++++++++++++ drivers/rpmsg/rpmsg_internal.h | 31 +++++++++++++++++++++++++++++++ drivers/rpmsg/virtio_rpmsg_bus.c | 29 ++++------------------------- 3 files changed, 68 insertions(+), 25 deletions(-) create mode 100644 drivers/rpmsg/rpmsg_internal.h diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c index 3bee8e03a387..81101775fed0 100644 --- a/drivers/rpmsg/rpmsg_core.c +++ b/drivers/rpmsg/rpmsg_core.c @@ -22,6 +22,8 @@ #include #include +#include "rpmsg_internal.h" + /** * rpmsg_create_ept() - create a new rpmsg_endpoint * @rpdev: rpmsg channel device @@ -229,3 +231,34 @@ int rpmsg_trysend_offchannel(struct rpmsg_endpoint *ept, u32 src, u32 dst, return ept->ops->trysend_offchannel(ept, src, dst, data, len); } EXPORT_SYMBOL(rpmsg_trysend_offchannel); + +/* + * match an rpmsg channel with a channel info struct. + * this is used to make sure we're not creating rpmsg devices for channels + * that already exist. + */ +static int rpmsg_device_match(struct device *dev, void *data) +{ + struct rpmsg_channel_info *chinfo = data; + struct rpmsg_device *rpdev = to_rpmsg_device(dev); + + if (chinfo->src != RPMSG_ADDR_ANY && chinfo->src != rpdev->src) + return 0; + + if (chinfo->dst != RPMSG_ADDR_ANY && chinfo->dst != rpdev->dst) + return 0; + + if (strncmp(chinfo->name, rpdev->id.name, RPMSG_NAME_SIZE)) + return 0; + + /* found a match ! */ + return 1; +} + +struct device *rpmsg_find_device(struct device *parent, + struct rpmsg_channel_info *chinfo) +{ + return device_find_child(parent, chinfo, rpmsg_device_match); + +} +EXPORT_SYMBOL(rpmsg_find_device); diff --git a/drivers/rpmsg/rpmsg_internal.h b/drivers/rpmsg/rpmsg_internal.h new file mode 100644 index 000000000000..205debf4ea65 --- /dev/null +++ b/drivers/rpmsg/rpmsg_internal.h @@ -0,0 +1,31 @@ +/* + * remote processor messaging bus internals + * + * Copyright (C) 2011 Texas Instruments, Inc. + * Copyright (C) 2011 Google, Inc. + * + * Ohad Ben-Cohen + * Brian Swetland + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __RPMSG_INTERNAL_H__ +#define __RPMSG_INTERNAL_H__ + +#include + +#define to_rpmsg_device(d) container_of(d, struct rpmsg_device, dev) +#define to_rpmsg_driver(d) container_of(d, struct rpmsg_driver, drv) + +struct device *rpmsg_find_device(struct device *parent, + struct rpmsg_channel_info *chinfo); + +#endif diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 184663276e51..488fd93a290c 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -35,6 +35,8 @@ #include #include +#include "rpmsg_internal.h" + /** * struct virtproc_info - virtual remote processor state * @vdev: the virtio device @@ -452,29 +454,6 @@ static void rpmsg_release_device(struct device *dev) kfree(rpdev); } -/* - * match an rpmsg channel with a channel info struct. - * this is used to make sure we're not creating rpmsg devices for channels - * that already exist. - */ -static int rpmsg_device_match(struct device *dev, void *data) -{ - struct rpmsg_channel_info *chinfo = data; - struct rpmsg_device *rpdev = to_rpmsg_device(dev); - - if (chinfo->src != RPMSG_ADDR_ANY && chinfo->src != rpdev->src) - return 0; - - if (chinfo->dst != RPMSG_ADDR_ANY && chinfo->dst != rpdev->dst) - return 0; - - if (strncmp(chinfo->name, rpdev->id.name, RPMSG_NAME_SIZE)) - return 0; - - /* found a match ! */ - return 1; -} - static const struct rpmsg_device_ops virtio_rpmsg_ops = { .create_ept = virtio_rpmsg_create_ept, .announce_create = virtio_rpmsg_announce_create, @@ -494,7 +473,7 @@ static struct rpmsg_device *rpmsg_create_channel(struct virtproc_info *vrp, int ret; /* make sure a similar channel doesn't already exist */ - tmp = device_find_child(dev, chinfo, rpmsg_device_match); + tmp = rpmsg_find_device(dev, chinfo); if (tmp) { /* decrement the matched device's refcount back */ put_device(tmp); @@ -547,7 +526,7 @@ static int rpmsg_destroy_channel(struct virtproc_info *vrp, struct virtio_device *vdev = vrp->vdev; struct device *dev; - dev = device_find_child(&vdev->dev, chinfo, rpmsg_device_match); + dev = rpmsg_find_device(&vdev->dev, chinfo); if (!dev) return -EINVAL;