From patchwork Tue Jan 31 12:51:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 92977 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1910352qgi; Tue, 31 Jan 2017 04:57:31 -0800 (PST) X-Received: by 10.84.143.165 with SMTP id 34mr39672899plz.2.1485867451378; Tue, 31 Jan 2017 04:57:31 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t11si15894322plm.267.2017.01.31.04.57.30; Tue, 31 Jan 2017 04:57:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163AbdAaM5Y (ORCPT + 25 others); Tue, 31 Jan 2017 07:57:24 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:10233 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751931AbdAaM4f (ORCPT ); Tue, 31 Jan 2017 07:56:35 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id v0VCl0ku013092; Tue, 31 Jan 2017 13:55:52 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 288hn1pq4a-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 31 Jan 2017 13:55:52 +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 8056338; Tue, 31 Jan 2017 12:55:51 +0000 (GMT) Received: from Webmail-eu.st.com (safex1hubcas4.st.com [10.75.90.69]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 5C46D2AFC; Tue, 31 Jan 2017 12:55:51 +0000 (GMT) Received: from localhost (10.201.23.23) by webmail-eu.st.com (10.75.90.13) with Microsoft SMTP Server (TLS) id 8.3.444.0; Tue, 31 Jan 2017 13:55:50 +0100 From: Loic Pallardy To: , , CC: , , , , , , Subject: [PATCH v2 5/6] rpmsg: virtio_rpmsg: don't allocate buffer if provided by low level driver Date: Tue, 31 Jan 2017 13:51:36 +0100 Message-ID: <1485867097-6960-6-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485867097-6960-1-git-send-email-loic.pallardy@st.com> References: <1485867097-6960-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-01-31_05:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Changes since V1: - Alignment with open parenthesis. - Add vrp->bufs_dma intialization in virtio_rpmsg_get_config function --- drivers/rpmsg/virtio_rpmsg_bus.c | 55 +++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 18 deletions(-) -- 1.9.1 diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 080ee07..7c89210 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 */ @@ -893,6 +895,7 @@ static int virtio_rpmsg_get_config(struct virtio_device *vdev) ret = -EINVAL; goto out; } + vrp->bufs_dma = virtio_cfg.pa; /* Check rpmsg buffer length */ total_buf_space = vrp->num_bufs * vrp->buf_size; @@ -903,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: @@ -958,25 +972,28 @@ 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; /* allocate coherent memory for the buffers */ - 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++) { @@ -1027,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: @@ -1062,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); }