From patchwork Tue Jan 31 12:51:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 92979 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1910493qgi; Tue, 31 Jan 2017 04:57:59 -0800 (PST) X-Received: by 10.84.140.133 with SMTP id 5mr39712890plt.178.1485867479089; Tue, 31 Jan 2017 04:57:59 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q83si15859638pfa.19.2017.01.31.04.57.58; Tue, 31 Jan 2017 04:57:59 -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 S1752214AbdAaM5s (ORCPT + 25 others); Tue, 31 Jan 2017 07:57:48 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:21179 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbdAaM4f (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 v0VCl2Bj013099; Tue, 31 Jan 2017 13:55:53 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 288hn1pq4d-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 31 Jan 2017 13:55:53 +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 6ABFB34; Tue, 31 Jan 2017 12:55:52 +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 50A572AFB; Tue, 31 Jan 2017 12:55:52 +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:51 +0100 From: Loic Pallardy To: , , CC: , , , , , , Subject: [PATCH v2 6/6] rpmsg: virtio_rpmsg: set buffer configuration to virtio Date: Tue, 31 Jan 2017 13:51:37 +0100 Message-ID: <1485867097-6960-7-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 Rpmsg is allocating buffer one dedicated communication link with some specificity like number of buffers, size of one buffer... These characteristics should be shared with remote coprocessor to guarantee communication link coherency. Proposal is to update rpmsg configuration fields in coprocessor firmware resource table if it exists. This is possible thanks to virtio set interface which allows to update cfg fields of struct fw_rsc_vdev. Signed-off-by: Loic Pallardy --- Changes since V1: - Set virtio_cfg.da to -1 (any address) by default - Add comment about IOMMU support --- drivers/rpmsg/virtio_rpmsg_bus.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -- 1.9.1 diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c index 7c89210..90d4531 100644 --- a/drivers/rpmsg/virtio_rpmsg_bus.c +++ b/drivers/rpmsg/virtio_rpmsg_bus.c @@ -923,6 +923,27 @@ static int virtio_rpmsg_get_config(struct virtio_device *vdev) return ret; } +static void virtio_rpmsg_set_config(struct virtio_device *vdev) +{ + struct virtio_rpmsg_cfg virtio_cfg; + struct virtproc_info *vrp = vdev->priv; + + /* fill virtio_cfg struct */ + memset(&virtio_cfg, 0, sizeof(virtio_cfg)); + virtio_cfg.id = VIRTIO_ID_RPMSG; + /* + * IOMMU not managed at the time being, set device address to (-1) + * meaning any address value. + */ + virtio_cfg.da = -1; + virtio_cfg.pa = vrp->bufs_dma; + virtio_cfg.len = vrp->num_bufs * vrp->buf_size; + virtio_cfg.buf_size = vrp->buf_size; + + vdev->config->set(vdev, RPMSG_CONFIG_OFFSET, &virtio_cfg, + sizeof(virtio_cfg)); +} + static int rpmsg_probe(struct virtio_device *vdev) { vq_callback_t *vq_cbs[] = { rpmsg_recv_done, rpmsg_xmit_done }; @@ -933,6 +954,7 @@ static int rpmsg_probe(struct virtio_device *vdev) int err = 0, i; size_t total_buf_space; bool notify; + bool has_cfg = false; vrp = kzalloc(sizeof(*vrp), GFP_KERNEL); if (!vrp) @@ -972,6 +994,9 @@ static int rpmsg_probe(struct virtio_device *vdev) if (err < 0) goto free_vrp; + if (err) + has_cfg = true; + /* Allocate buffer if none provided by low level platform driver */ if (!vrp->ext_buffer) { total_buf_space = vrp->num_bufs * vrp->buf_size; @@ -993,6 +1018,10 @@ static int rpmsg_probe(struct virtio_device *vdev) /* and half is dedicated for TX */ vrp->sbufs = bufs_va + total_buf_space / 2; + + /* Notify configuration to coprocessor */ + if (has_cfg) + virtio_rpmsg_set_config(vdev); } /* set up the receive buffers */