From patchwork Wed Dec 7 20:35:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9465211 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 EEB5860512 for ; Wed, 7 Dec 2016 20:37:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E31DC28427 for ; Wed, 7 Dec 2016 20:37:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7F942855E; Wed, 7 Dec 2016 20:37:03 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 373A328427 for ; Wed, 7 Dec 2016 20:37:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932807AbcLGUhA (ORCPT ); Wed, 7 Dec 2016 15:37:00 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:52320 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932561AbcLGUg7 (ORCPT ); Wed, 7 Dec 2016 15:36:59 -0500 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id uB7KYZ6J026369; Wed, 7 Dec 2016 21:36:57 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-.pphosted.com with ESMTP id 2756tnbuc1-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 07 Dec 2016 21:36:57 +0100 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id BEC3731; Wed, 7 Dec 2016 20:36:56 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas21.st.com [10.75.90.44]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A3ACA4EB5; Wed, 7 Dec 2016 20:36:56 +0000 (GMT) Received: from localhost (10.129.5.76) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 7 Dec 2016 21:36:56 +0100 From: Loic Pallardy To: , , , CC: , , Subject: [PATCH v1 5/6] rpmsg: virtio_rpmsg: don't allocate buffer if provided by low level driver Date: Wed, 7 Dec 2016 21:35:40 +0100 Message-ID: <1481142941-15616-6-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1481142941-15616-1-git-send-email-loic.pallardy@st.com> References: <1481142941-15616-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.129.5.76] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-12-07_06:, , signatures=0 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 Low level platform specific driver has the knowledge of the different communication link constraints like fixed or secured memory region to use for buffer allocation. If virtual address is defined in virtio_rpmsg_cfg structure, a dedicated memory pool buffer fitting platform requirements is available. Rpmsg virtio layer should rely on it if its size is compliant with link characteristics. Signed-off-by: Loic Pallardy --- drivers/rpmsg/virtio_rpmsg_bus.c | 54 ++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 1a97af8..b12fe2a 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -57,6 +57,7 @@ * @sendq: wait queue of sending contexts waiting for a tx buffers * @sleepers: number of senders that are waiting for a tx buffer * @ns_ept: the bus's name service endpoint + * @ext_buffer: buffer allocated by low level driver * * This structure stores the rpmsg state of a given virtio remote processor * device (there might be several virtio proc devices for each physical @@ -76,6 +77,7 @@ struct virtproc_info { wait_queue_head_t sendq; atomic_t sleepers; struct rpmsg_endpoint *ns_ept; + bool ext_buffer; }; /* The feature bitmap for virtio rpmsg */ @@ -904,6 +906,17 @@ static int virtio_rpmsg_get_config(struct virtio_device *vdev) ret = -ENOMEM; goto out; } + + /* Level platform specific buffer driver ? */ + if (virtio_cfg.va != -1) { + vrp->ext_buffer = true; + /* half of the buffers is dedicated for RX */ + vrp->rbufs = (void *)(uintptr_t)virtio_cfg.va; + + /* and half is dedicated for TX */ + vrp->sbufs = (void *)(uintptr_t) virtio_cfg.va + total_buf_space / 2; + } + return !ret; } out: @@ -960,24 +973,27 @@ static int rpmsg_probe(struct virtio_device *vdev) if (err < 0) goto free_vrp; - total_buf_space = vrp->num_bufs * vrp->buf_size; + /* Allocate buffer if none provided by low level platform driver */ + if (!vrp->ext_buffer) { + total_buf_space = vrp->num_bufs * vrp->buf_size; - bufs_va = dma_alloc_coherent(vdev->dev.parent->parent, - total_buf_space, &vrp->bufs_dma, - GFP_KERNEL); - if (!bufs_va) { - err = -ENOMEM; - goto vqs_del; - } + bufs_va = dma_alloc_coherent(vdev->dev.parent->parent, + total_buf_space, &vrp->bufs_dma, + GFP_KERNEL); + if (!bufs_va) { + err = -ENOMEM; + goto vqs_del; + } - dev_dbg(&vdev->dev, "buffers: va %p, dma %pad\n", - bufs_va, &vrp->bufs_dma); + dev_dbg(&vdev->dev, "buffers: va %p, dma %pad\n", + bufs_va, &vrp->bufs_dma); - /* half of the buffers is dedicated for RX */ - vrp->rbufs = bufs_va; + /* half of the buffers is dedicated for RX */ + vrp->rbufs = bufs_va; - /* and half is dedicated for TX */ - vrp->sbufs = bufs_va + total_buf_space / 2; + /* and half is dedicated for TX */ + vrp->sbufs = bufs_va + total_buf_space / 2; + } /* set up the receive buffers */ for (i = 0; i < vrp->num_bufs / 2; i++) { @@ -1028,8 +1044,9 @@ static int rpmsg_probe(struct virtio_device *vdev) return 0; free_coherent: - dma_free_coherent(vdev->dev.parent->parent, total_buf_space, - bufs_va, vrp->bufs_dma); + if (!vrp->ext_buffer) + dma_free_coherent(vdev->dev.parent->parent, total_buf_space, + bufs_va, vrp->bufs_dma); vqs_del: vdev->config->del_vqs(vrp->vdev); free_vrp: @@ -1063,8 +1080,9 @@ static void rpmsg_remove(struct virtio_device *vdev) vdev->config->del_vqs(vrp->vdev); - dma_free_coherent(vdev->dev.parent->parent, total_buf_space, - vrp->rbufs, vrp->bufs_dma); + if (!vrp->ext_buffer) + dma_free_coherent(vdev->dev.parent->parent, total_buf_space, + vrp->rbufs, vrp->bufs_dma); kfree(vrp); }