From patchwork Thu Nov 30 16:46:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 120250 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp24375qgn; Thu, 30 Nov 2017 08:49:56 -0800 (PST) X-Google-Smtp-Source: AGs4zMbOA/i5IEyGAPoi+EMHv+E2bygPU7m3NANJTyLsgqm0k1fuLOVjDSAwkUDle5FMXuO75nTk X-Received: by 10.99.117.87 with SMTP id f23mr1797295pgn.133.1512060596215; Thu, 30 Nov 2017 08:49:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512060596; cv=none; d=google.com; s=arc-20160816; b=MrCeTSCb5hJOjCwN0vDChvAIymsti3MsIpcFZoOb5VPyHV124R0C2x+Ij1F0uY/+xq jQd2ny47VB5D2GTMIyxeMbUMm+3F9DGDfp0oyoyILefxkgmpk51fDTTHnejkGth5gP7W yeBjenCAckO2ouhOcjk9So0VCD4IfspCmpvS9yATZ4OgSR3IpNDnKm5dTyhkN+p4JhtD M8u5YzkCYNaqW6UlIFsmcVF6lBDKRQR9L5TH/nKAfsUoH9tDBpgA72ezSkBn/f0ub4Dp yVT5ex3CwRYyMJrtRgVyffb145UmthgjUySz6xNO6Z347/LnbVaj1eQYDdva1rulBVRz p+pw== 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=WJ/qcxZevF9kjlPWWVZ5naLNJjrDiVIIg9g6nGcsOhw=; b=lTL3KA7myfwrRbaA3rqjDhIytZr60K1ditrX+2wVbpe6dV15mYBOW4Uy/xfpgFUZsr ldhgpMsZGXLvsN86PxxGVyGSakodx7wVx8repFyoi5rvXjepSCl2ETd6uC97JFSaIUrX 3TuLgbvzy0CJSn3sVIMrVJZBg7tlUG+EDY3mQ59y9fEzW/jRzOjdZwEqsbSROl9wXTZy IKrU4EcqPNY6/e2UURIQB6v1A0EO/v5qs9xbjPKkoAAuX1+3UxwFFrN4wlUkSVbkj8Uh kuvee6zZ05igqbY8cA+sUZvy1twN+a21dd47Wx/VJbrUd0MtP/qCeWbDJzTG5I3b9M/X AAoQ== 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 m3si3437611pld.71.2017.11.30.08.49.55; Thu, 30 Nov 2017 08:49:56 -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 S1753724AbdK3Qtx (ORCPT + 28 others); Thu, 30 Nov 2017 11:49:53 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:40975 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753643AbdK3QrS (ORCPT ); Thu, 30 Nov 2017 11:47:18 -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 vAUGiJ7m017787; Thu, 30 Nov 2017 17:47:17 +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 2ef09hkt55-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 30 Nov 2017 17:47:17 +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 5A8A034; Thu, 30 Nov 2017 16:47:16 +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 34FAA537A; Thu, 30 Nov 2017 16:47:16 +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; Thu, 30 Nov 2017 17:47:15 +0100 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v2 07/16] remoteproc: st: add reserved memory support Date: Thu, 30 Nov 2017 17:46:42 +0100 Message-ID: <1512060411-729-8-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.48] 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 ST remote processor needs some specified memory regions for firmware and IPC. Memory regions are defined as reserved memory and should be registered in remoteproc core thanks to rproc_add_carveout function. Memory region release is handled by ST driver itself on remove operation. Signed-off-by: Loic Pallardy --- drivers/remoteproc/st_remoteproc.c | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c index aacef0e..1549ce8 100644 --- a/drivers/remoteproc/st_remoteproc.c +++ b/drivers/remoteproc/st_remoteproc.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -208,8 +209,10 @@ static int st_rproc_parse_dt(struct platform_device *pdev) struct device *dev = &pdev->dev; struct rproc *rproc = platform_get_drvdata(pdev); struct st_rproc *ddata = rproc->priv; - struct device_node *np = dev->of_node; - int err; + struct device_node *node, *np = dev->of_node; + struct resource res; + struct rproc_mem_entry *mem; + int err, count, i; if (ddata->config->sw_reset) { ddata->sw_reset = devm_reset_control_get_exclusive(dev, @@ -254,10 +257,36 @@ static int st_rproc_parse_dt(struct platform_device *pdev) return -EINVAL; } - err = of_reserved_mem_device_init(dev); - if (err) { - dev_err(dev, "Failed to obtain shared memory\n"); - return err; + count = of_count_phandle_with_args(np, "memory-region", NULL); + + for (i = 0; i < count; i++) { + node = of_parse_phandle(np, "memory-region", i); + if (!node) { + dev_err(dev, "No memory-region specified\n"); + return -EINVAL; + } + + err = of_address_to_resource(node, 0, &res); + if (err) { + dev_err(dev, "Bad memory-region definition\n"); + return err; + } + + mem = devm_kzalloc(dev, sizeof(*mem), GFP_KERNEL); + if (!mem) + return -ENOMEM; + + mem->dma = res.start; + mem->da = res.start; + mem->len = resource_size(&res); + mem->va = devm_ioremap_wc(dev, mem->dma, mem->len); + if (!mem->va) { + dev_err(dev, "Unable to map memory region: %pa+%zx\n", + &res.start, mem->len); + return -EBUSY; + } + + rproc_add_carveout(rproc, mem); } err = clk_prepare(ddata->clk); @@ -387,8 +416,6 @@ static int st_rproc_remove(struct platform_device *pdev) clk_disable_unprepare(ddata->clk); - of_reserved_mem_device_release(&pdev->dev); - for (i = 0; i < ST_RPROC_MAX_VRING * MBOX_MAX; i++) mbox_free_channel(ddata->mbox_chan[i]);