From patchwork Fri Oct 27 12:44:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 117314 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp727558qgn; Fri, 27 Oct 2017 05:45:07 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S/BuxzlcQ/KiCHVYoRwUFchb8IuWRhWIjwl5iIUJgYcCPHsuMmUd3jnWOLObqoJUu6a1Gg X-Received: by 10.101.77.144 with SMTP id p16mr211117pgq.226.1509108307281; Fri, 27 Oct 2017 05:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509108307; cv=none; d=google.com; s=arc-20160816; b=CM2S3AvmS7l5XrH9tQLOEKlI7X+7moWKMhm0tAnEhuKHmHHlzuLWcwZmGIX0EUOSdB V2DfRqE1PYzghyEqOzHgRjnwBp34L4e9HIZL0/WtYhERjIq0b7QHN6P5kr8KfGYBePCx wEkXGkWG+p9KJmaYp4YA21K5B6VZH7TnNIBfzeLatySTVaLUAwak7j2PuKDo201KUOCt zCCErZUns3c1H7aQUqQhqzt0NHfu4CoP5eaMOEpDy9JEHOFgR5e2/OZuSJnNsvAMVMiO yxlfMBbKbDVJHtCQpA8FQVZKTIRBRx+/h6ZIZVDnMc3z1Gi/Fd0zIs8xd8IP5oJ0fFnv p9xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=1Ni09qPXMYZKWbdfNAfB/2UC+YJ6j88a87f3FCoER78=; b=Gw7iSBQvq9mPfY3jI5jC1dlAtfP4E2tQBvPHGyhYKIT13PsVYIkig1d0Pt6BxT+gH8 GqQaQA3mmMjjM4OOdwWox/dSIbF6Bixees3FDmMwRhGofDSCmPH+t5wqEUybzxiAqwG/ 3Ef4bLJ5n63r810wyYTkSY5B4orRlyU176+xZxUKhcZAnzNXEPTv42hQGwGf3Wp+I11z IgMLYGkm5zDTANQQklgIOLvmHNJ55psyWoCzwYppBp9dh9QbHNj4GWHeyd+y7RgKx4LX MaulPhjcTk9Q3y19b5O4tXI2pJTm5eh/CRW37xVRKZ+MuMWljE04ym6VKjGYzQlKpqs6 0RiQ== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m18si5298857pfh.138.2017.10.27.05.45.06; Fri, 27 Oct 2017 05:45:07 -0700 (PDT) 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 S1752739AbdJ0MpG (ORCPT + 27 others); Fri, 27 Oct 2017 08:45:06 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:38751 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752635AbdJ0Moh (ORCPT ); Fri, 27 Oct 2017 08:44:37 -0400 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9RCi2oQ004813; Fri, 27 Oct 2017 14:44:35 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2dtg42ywkg-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 27 Oct 2017 14:44:35 +0200 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 1827331; Fri, 27 Oct 2017 12:44:35 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag7node2.st.com [10.75.127.20]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 007F726E0; Fri, 27 Oct 2017 12:44:34 +0000 (GMT) Received: from localhost (10.75.127.46) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 27 Oct 2017 14:44:34 +0200 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH 6/7] remoteproc: modify vring allocation to support preallocated region Date: Fri, 27 Oct 2017 14:44:13 +0200 Message-ID: <1509108254-22296-7-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1509108254-22296-1-git-send-email-loic.pallardy@st.com> References: <1509108254-22296-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.46] X-ClientProxiedBy: SFHDAG3NODE1.st.com (10.75.127.7) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-10-27_07:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current version of rproc_alloc_vring function supports only dynamic vring allocation. This patch extends rproc_alloc_vring to verify if requested vring DA is already part or not of a registered carveout. If true, nothing to do, else just allocate vring as before. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 50 +++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 18 deletions(-) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 515a17a..e1dbe65 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -263,21 +263,41 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) struct device *dev = &rproc->dev; struct rproc_vring *rvring = &rvdev->vring[i]; struct fw_rsc_vdev *rsc; - dma_addr_t dma; + dma_addr_t dma = 0; void *va; int ret, size, notifyid; /* actual size of vring (in bytes) */ size = PAGE_ALIGN(vring_size(rvring->len, rvring->align)); - /* - * Allocate non-cacheable memory for the vring. In the future - * this call will also configure the IOMMU for us - */ - va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL); - if (!va) { - dev_err(dev->parent, "dma_alloc_coherent failed\n"); - return -EINVAL; + /* get vring resource table pointer */ + rsc = (void *)rproc->table_ptr + rvdev->rsc_offset; + + if (rsc->vring[i].da != FW_RSC_ADDR_ANY) { + va = rproc_find_carveout_by_da(rproc, rsc->vring[i].da, size); + + if (!va) { + /* No region not found */ + dev_err(dev->parent, "Pre-allocated vring not found\n"); + return -ENOMEM; + } + } else { + /* + * Allocate non-cacheable memory for the vring. In the future + * this call will also configure the IOMMU for us + */ + va = dma_alloc_coherent(dev->parent, size, &dma, GFP_KERNEL); + if (!va) { + dev_err(dev->parent, "dma_alloc_coherent failed\n"); + return -EINVAL; + } + /* + * Let the rproc know the da of this vring. + * Not all platforms use dma_alloc_coherent to automatically + * set up the iommu. In this case the device address (da) will + * hold the physical address and not the device address. + */ + rsc->vring[i].da = dma; } /* @@ -304,14 +324,7 @@ int rproc_alloc_vring(struct rproc_vdev *rvdev, int i) rvring->dma = dma; rvring->notifyid = notifyid; - /* - * Let the rproc know the notifyid and da of this vring. - * Not all platforms use dma_alloc_coherent to automatically - * set up the iommu. In this case the device address (da) will - * hold the physical address and not the device address. - */ - rsc = (void *)rproc->table_ptr + rvdev->rsc_offset; - rsc->vring[i].da = dma; + /* Let the rproc know the notifyid of this vring. */ rsc->vring[i].notifyid = notifyid; return 0; } @@ -348,7 +361,8 @@ void rproc_free_vring(struct rproc_vring *rvring) int idx = rvring->rvdev->vring - rvring; struct fw_rsc_vdev *rsc; - dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma); + if (rvring->dma) + dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma); idr_remove(&rproc->notifyids, rvring->notifyid); /* reset resource entry info */