From patchwork Thu Nov 30 16:46:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 120244 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp23006qgn; Thu, 30 Nov 2017 08:48:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMaIcNPSsrNLPYZk7f/7zc97K1sOK02f/Z+se4Ww+icji/vczYkJehVZSVlOrDwIkPOZ2ZqR X-Received: by 10.84.248.148 with SMTP id q20mr3320224pll.110.1512060517098; Thu, 30 Nov 2017 08:48:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512060517; cv=none; d=google.com; s=arc-20160816; b=mjxrzxPXoTtephbiTFxhClJkWqRxR+r4d0/Q4Z8Kl+wTHQhMHy5dek1VoK6l3MWA/S Jr4ETHJl4Q1DZWIhCjh/hlLbWoQlilDvohcyrKuftY/j6RU0hBHt1PWpg0mqQkep+/IX zzrMlzEar2kOGUCe5+xcq41LSXKeXZeHV9UR79rdJcauUYJ4dkw3trnkaMsXTtOpKIah pOcTRhJXRXhXERVSYuct7bIEEapfZZ6Ixl7AWvBlaknHsnNslqeXaRiYw4sH/AprHNW7 VBfuuu2YOnX1R1IPdwlMviD0X/n7TqMYH8UZZbuIfIA14rBoAAbni5ea6Ahvk0XpK/xF E/eg== 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=7mc6C/YT71dJnllfNBdE1bnwtkxLKqah2RqySk7dg5w=; b=kb0oFSnVTOPW+qLycUKfI6/xbrecFrayXCYATjBonp0+aCbZfQdasdY8DD+orSqM4Q n6peS7EKrcbf9NI9M7caNrVOIitEVhJVZ2VigajRFX7I9xIgcZa8pw81rqm4M8b/yAQs FtudMLTL64WWR8Muks3lHGyHomwuWPqLMYUejglOpckPNygnDhB0Cx7n1fXQrvXXdhS6 F63pUcRlWeNxmiuUhZfwPpuAApeSGjAKpipEWQ8WzZdPqXi7e+vhXKxtKcZDq3M8By5O 3L9rmxb3IHCp1FCqBolaTpxK7Ji6KpZZCV0bfClh6fTQTJql/U54yM1Qp05apWvswra3 gZPA== 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 k14si3228247pgp.518.2017.11.30.08.48.36; Thu, 30 Nov 2017 08:48:37 -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 S1753623AbdK3Qsf (ORCPT + 28 others); Thu, 30 Nov 2017 11:48:35 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:41006 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753789AbdK3QrY (ORCPT ); Thu, 30 Nov 2017 11:47:24 -0500 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vAUGiJ7s017787; Thu, 30 Nov 2017 17:47:22 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2ef09hkt5s-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 30 Nov 2017 17:47:22 +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 C48CA34; Thu, 30 Nov 2017 16:47:21 +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 B12EE537A; Thu, 30 Nov 2017 16:47:21 +0000 (GMT) Received: from localhost (10.75.127.44) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Thu, 30 Nov 2017 17:47:21 +0100 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v2 14/16] remoteproc: look-up pre-registered carveout by name for carveout allocation Date: Thu, 30 Nov 2017 17:46:49 +0100 Message-ID: <1512060411-729-15-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512060411-729-1-git-send-email-loic.pallardy@st.com> References: <1512060411-729-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.44] X-ClientProxiedBy: SFHDAG3NODE3.st.com (10.75.127.9) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-30_05:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Look-up for a pre-registred carveout having the same name as requested one. If match found, pre-registed carevout is used and resource table updated. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 9c12319..8436185 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -873,7 +873,7 @@ static int rproc_handle_carveout(struct rproc *rproc, struct fw_rsc_carveout *rsc, int offset, int avail) { - struct rproc_mem_entry *carveout, *mapping; + struct rproc_mem_entry *carveout, *mapping, *mem; struct device *dev = &rproc->dev; dma_addr_t dma; phys_addr_t pa; @@ -899,6 +899,7 @@ static int rproc_handle_carveout(struct rproc *rproc, return -ENOMEM; /* Check carveout rsc already part of a registered carveout */ + /* By device address if any */ if (rsc->da != FW_RSC_ADDR_ANY) { va = rproc_find_carveout_by_da(rproc, rsc->da, rsc->len); @@ -933,6 +934,20 @@ static int rproc_handle_carveout(struct rproc *rproc, } } + /* By name */ + mem = rproc_find_carveout_by_name(rproc, rsc->name); + if (mem) { + /* + * Update resource table with registered carevout information + */ + rsc->len = mem->len; + rsc->da = mem->da; + rsc->pa = rproc_va_to_pa(mem->va); + /* no need to register as already match one for one */ + return 0; + } + + /* No registered carveout found, allocate a new one */ va = dma_alloc_coherent(dev->parent, rsc->len, &dma, GFP_KERNEL); if (!va) { dev_err(dev->parent,