From patchwork Thu Nov 30 16:46: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: 120255 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp26068qgn; Thu, 30 Nov 2017 08:51:38 -0800 (PST) X-Google-Smtp-Source: AGs4zMY1xktAgK+gbQ0YQ+ZiYc3NQRLxQGa1XucpE6lah0Wgm7XnyQJsCNlFVR6oBv4Io7XNOxNl X-Received: by 10.84.252.4 with SMTP id x4mr3103564pll.99.1512060698905; Thu, 30 Nov 2017 08:51:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512060698; cv=none; d=google.com; s=arc-20160816; b=goCHamgzteeyEpm240RsWMINwfUGtpxjBFdubSQPsNJXF+dXuHAhiFXEqHW4h9F3uO JkodIolefDJ8u6NPg4QN6m9XAlz3Wkty5wb/eOeA5ZKzdllr2x5suvNOI9hWCFyiFiYv Bn0STs0q1nyRRNteYldWrTQEDlwvEA9zfBPMBrq4u48U7h/EJ2MdTTpPbwNwdoIz9oLk GMD3Ya+w6AUkh6tqWWDlkGGPUWbcdudVbChqL3fTYubz7txymLR2MCaijMOzpGOWPANd vPjzXe4HTT0E5C/gUdDEM8G+NvXR3ld8l3kq5TRGxBOaL2fxu32Sq0xmpqEhpOfadJdT Dqcg== 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=OkuJivHxzUISNOQmCOdTuRlfzn2S1thnoD8Aw4ookqA=; b=mD20R2HW0ZX1O7+OKtx1XZTXEZ7nvgDcgNjIRvtdq3ThRXvl3isa5vCmEbx1Pjg7rb aHManf37BSnxLLSKTWxbZIsubDSQhSAIoYCCn5F/upqObyNoBEmCwRG+XIC3JVAUCfmy Xo3HFeUrSJdWQqM6blGeuhRDaeXUNgCwlN+OAqIhTMb6+0qpgLek0Xukq54pEadV/fv4 iKLgxmduKr2FgFRyT9TjFPPolNj9dHHsiNvRouv7SOyLUUkeeFj1k5hHjuDBya6a+TBP RJj53aJJ3cZi/QKSIsEDF+WgijHCg5EEbWrRM4lwuIje+hxkarQyVkRq5SyA9qUmCsSj mkEA== 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 t134si3233867pgb.511.2017.11.30.08.51.38; Thu, 30 Nov 2017 08:51:38 -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 S1753796AbdK3Qvf (ORCPT + 28 others); Thu, 30 Nov 2017 11:51:35 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:41543 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753477AbdK3QrO (ORCPT ); Thu, 30 Nov 2017 11:47:14 -0500 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 vAUGiHCN001569; Thu, 30 Nov 2017 17:47:13 +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 2eexh9v2r7-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 30 Nov 2017 17:47:13 +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 4306931; Thu, 30 Nov 2017 16:47:12 +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 1D8C5537B; Thu, 30 Nov 2017 16:47:12 +0000 (GMT) Received: from localhost (10.75.127.51) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Thu, 30 Nov 2017 17:47:11 +0100 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v2 02/16] remoteproc: add release ops in rproc_mem_entry struct Date: Thu, 30 Nov 2017 17:46:37 +0100 Message-ID: <1512060411-729-3-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.51] X-ClientProxiedBy: SFHDAG3NODE2.st.com (10.75.127.8) 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 Memory entry could be allocated in different ways (ioremap, dma_alloc_coherent, internal RAM allocator...). This patch introduces a release ops in rproc_mem_entry structure to associate dedicated release mechanism to each memory entry descriptor in order to keep remoteproc core generic. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 26 ++++++++++++++++++++++---- include/linux/remoteproc.h | 6 ++++-- 2 files changed, 26 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index faa18a7..f23daf9 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -592,6 +592,25 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc, } /** + * rproc_release_carveout() - release acquired carveout + * @rproc: rproc handle + * @mem: the memory entry to release + * + * This function releases specified memory entry @mem allocated via + * dma_alloc_coherent() function by @rproc. + */ +static int rproc_release_carveout(struct rproc *rproc, struct rproc_mem_entry *mem) +{ + struct device *dev = &rproc->dev; + + /* clean up carveout allocations */ + dma_free_coherent(dev->parent, mem->len, mem->va, mem->dma); + list_del(&mem->node); + kfree(mem); + return 0; +} + +/** * rproc_handle_carveout() - handle phys contig memory allocation requests * @rproc: rproc handle * @rsc: the resource entry @@ -717,6 +736,7 @@ static int rproc_handle_carveout(struct rproc *rproc, carveout->len = rsc->len; carveout->dma = dma; carveout->da = rsc->da; + carveout->release = rproc_release_carveout; list_add_tail(&carveout->node, &rproc->carveouts); @@ -847,10 +867,8 @@ static void rproc_resource_cleanup(struct rproc *rproc) /* clean up carveout allocations */ list_for_each_entry_safe(entry, tmp, &rproc->carveouts, node) { - dma_free_coherent(dev->parent, entry->len, entry->va, - entry->dma); - list_del(&entry->node); - kfree(entry); + if (entry->release) + entry->release(rproc, entry); } /* clean up remote vdev entries */ diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 44e630e..8780f2e 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -305,12 +305,15 @@ struct fw_rsc_vdev { struct fw_rsc_vdev_vring vring[0]; } __packed; +struct rproc; + /** * struct rproc_mem_entry - memory entry descriptor * @va: virtual address * @dma: dma address * @len: length, in bytes * @da: device address + * @release: release associated memory * @priv: associated data * @node: list node */ @@ -319,12 +322,11 @@ struct rproc_mem_entry { dma_addr_t dma; int len; u32 da; + int (*release)(struct rproc *rproc, struct rproc_mem_entry *mem); void *priv; struct list_head node; }; -struct rproc; - /** * struct rproc_ops - platform-specific device handlers * @start: power on the device and boot it