From patchwork Fri Oct 27 12:44:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 117312 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp727242qgn; Fri, 27 Oct 2017 05:44:46 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TDXDL8rtFSLqEeh9vehlrpcgikY78j1LpMF0hVrCYiv0hwTuqS9Opdjmofg8ay0jW8v3PL X-Received: by 10.98.16.149 with SMTP id 21mr390710pfq.182.1509108286207; Fri, 27 Oct 2017 05:44:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509108286; cv=none; d=google.com; s=arc-20160816; b=SO6sSTPXDEkrrOgOkN8CMEbrZhP4N0a34IzVLMAgyRsnjKwYgwvqNKRPgKf7zV46DR pe7ECj5xcqHPm05pS1Y6YH6PdD7gxGjJkYS/4rfVe+YZBAKLrNvMNnaDGduGX5IoJXQj NRc2js39lZsKFxD6OJBjhcLc9a39CiGUSK+k1QCTglPAcWW3ydckbtHWvalJV3tkd9xk 5eKfzYkoSOnWoLuxcp3bQssiHRekRNJsU2RI5yC+Ib34Wpv6YvytwAaVimRRB0zoRa5P Guhj2FBCXl9EN9hyjfv0k5ovKmYFikHcLapQWb668eFAB9dyHHXAoqvbRpbZaSAaIuse t9vA== 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=quS435V5H9VfepJRI4WzNul2j2e6UmBcENtL+cDYdWjkVYfZxdwPFCmAnZCCxH2AJe RHHaJM4DTR5d6DaEl6bq4Hl4jRD7qxpjPEhygIndETz6NbVISYs44Slrz8JI6v450K/J t2tm76WPOjxM6E63nbI6fjeYPgDtYltnspm0sEOTWlIVubA4DIELE9lAea8No+iT8UE8 h3s85uH4Civc3hQE/VPoYxWRgJrhpjWKXhuh/gbZ3/zQCokmdlzgdlstdegqIJXQCUWI n4zPUGigvcB22m9YniY+7o81iE//hfg4LRnzoLT0RiO1+5QKPGIH7wFjY1/4yLbzKMPE nRxw== 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 m66si5333968pfb.72.2017.10.27.05.44.45; Fri, 27 Oct 2017 05:44:46 -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 S1752695AbdJ0Moo (ORCPT + 27 others); Fri, 27 Oct 2017 08:44:44 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:19591 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752544AbdJ0Moe (ORCPT ); Fri, 27 Oct 2017 08:44:34 -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 v9RCi2oO004813; Fri, 27 Oct 2017 14:44:32 +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 2dtg42ywk9-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 27 Oct 2017 14:44:32 +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 09CDF31; Fri, 27 Oct 2017 12:44:32 +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 D634C26E0; Fri, 27 Oct 2017 12:44:31 +0000 (GMT) Received: from localhost (10.75.127.48) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 27 Oct 2017 14:44:31 +0200 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH 2/7] remoteproc: add release ops in rproc_mem_entry struct Date: Fri, 27 Oct 2017 14:44:09 +0200 Message-ID: <1509108254-22296-3-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.48] X-ClientProxiedBy: SFHDAG7NODE2.st.com (10.75.127.20) 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 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