From patchwork Thu Mar 1 16:24:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 130323 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3004511edc; Thu, 1 Mar 2018 08:24:39 -0800 (PST) X-Google-Smtp-Source: AG47ELvsNOog5nX+C8aHgi6WbAw+21/08Q+aGlOv83ft3Sldvbtbc3L/V/Zn9pIje+3ny7tilwMZ X-Received: by 10.98.223.143 with SMTP id d15mr2515580pfl.208.1519921479212; Thu, 01 Mar 2018 08:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519921479; cv=none; d=google.com; s=arc-20160816; b=SzuMFP1yPmOIpW/6oVBwNG+P7ljV7KZCZqiPIFMFYQvfMYGqg60z6Qxn+bIib52PSG 8SNG2A7U7kFBVkW4b+/J2QEQJhgPl8nnrwHQbc5lp2TI72HBX3hxpvKwS2z+cWrd1G0Y s3IGO+VTRHqeYWUoF5bEpIxWgu4Ydtg64wyCqf6tvQAvwRisaj/i3mLw8TAJsv+mj8DZ lPAsrl91zoINz49r+3xwsADOgOatpYnp+WVkAFgA2RCC71XZU4yC7myCnuALQ98xXeAC gAzPi/GjQZLFpRBjPcX5dpWAeKF+Fc39g0f5NND+rKuFFMm2fQV9ab8Ihssc7sgCM1LI JR4A== 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=lFXJiyUOnOQp1YKrRJMNX3XrOZDofigCwSXFs5f7h5k=; b=DQ0ikGrkSYNlKKARlBeGurbd9Rt9cEX4e71vIwmjZah2xVKAJc2mQSGOlL/lCFRD7m 0LzVuxSUcCvRVvd4htJu2U2Xdovo4zBoJ50yZCLUEZElt001bHAFLmwI0sMODSrO04Mg d3CmykpgF7DYGoyJPuLK/zryX+7c8HOLpqVeWlILcBF84E1HTmGv7HCBURoI7v9NXmwz cs3Y5qnkm0YypGuhhGSVX5vE5X2SBOc0ZytzAZ01QrIXaIyR0KCQRqrXluH4MRZciaxZ fCNvVGgZMI9zJT0vjKdKQXXKUeYNNNUvnNQd/xICGP807fhONh3TAVvneE9qKONfMJS5 xhDw== 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 o4si2625645pgp.285.2018.03.01.08.24.38; Thu, 01 Mar 2018 08:24:39 -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 S1033039AbeCAQYf (ORCPT + 28 others); Thu, 1 Mar 2018 11:24:35 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:28834 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1033011AbeCAQYW (ORCPT ); Thu, 1 Mar 2018 11:24:22 -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 w21GJQYa025446; Thu, 1 Mar 2018 17:24:20 +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 2gax28ujks-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 01 Mar 2018 17:24:20 +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 1CD9031; Thu, 1 Mar 2018 16:24:20 +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 0928151FF; Thu, 1 Mar 2018 16:24:20 +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, 1 Mar 2018 17:24:19 +0100 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v3 13/13] remoteproc: st: add reserved memory support Date: Thu, 1 Mar 2018 17:24:00 +0100 Message-ID: <1519921440-21356-14-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1519921440-21356-1-git-send-email-loic.pallardy@st.com> References: <1519921440-21356-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.51] X-ClientProxiedBy: SFHDAG5NODE2.st.com (10.75.127.14) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-01_08:, , 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 before rproc_start. For this, st rproc driver implements prepare ops. Signed-off-by: Loic Pallardy --- drivers/remoteproc/st_remoteproc.c | 68 +++++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c index aacef0e..72a19a0 100644 --- a/drivers/remoteproc/st_remoteproc.c +++ b/drivers/remoteproc/st_remoteproc.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -91,6 +92,64 @@ static void st_rproc_kick(struct rproc *rproc, int vqid) dev_err(dev, "failed to send message via mbox: %d\n", ret); } +static int st_rproc_mem_release(struct rproc *rproc, + struct rproc_mem_entry *mem) +{ + struct device *dev = rproc->dev.parent; + + devm_iounmap(dev, mem->va); + + return 0; +} + +static int st_rproc_prepare(struct rproc *rproc) +{ + struct device *dev = rproc->dev.parent; + struct device_node *np = dev->of_node; + struct rproc_mem_entry *mem; + void *va; + struct reserved_mem *rmem; + struct of_phandle_iterator it; + int err; + + of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); + while ((err = of_phandle_iterator_next(&it)) == 0) { + va = NULL; + rmem = of_reserved_mem_lookup(it.node); + + /* No need to map vdev buffer */ + if (strcmp(it.node->name, "vdev0buffer")) { + va = devm_ioremap_wc(dev, rmem->base, rmem->size); + if (!va) { + dev_err(dev, "Unable to map memory region: %pa+%zx\n", + &rmem->base, rmem->size); + return -EBUSY; + } + + /* Register memory region */ + mem = rproc_mem_entry_init(dev, va, + (dma_addr_t)rmem->base, + rmem->size, rmem->base, + st_rproc_mem_release, + it.node->name); + } else { + /* Register vdev buffer */ + mem = rproc_mem_entry_init(dev, NULL, + (dma_addr_t)rmem->base, + rmem->size, rmem->base, + NULL, + it.node->name); + } + + if (!mem) + return -ENOMEM; + + rproc_add_carveout(rproc, mem); + } + + return 0; +} + static int st_rproc_start(struct rproc *rproc) { struct st_rproc *ddata = rproc->priv; @@ -161,6 +220,7 @@ static int st_rproc_stop(struct rproc *rproc) .kick = st_rproc_kick, .start = st_rproc_start, .stop = st_rproc_stop, + .prepare = st_rproc_prepare, }; /* @@ -254,12 +314,6 @@ 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; - } - err = clk_prepare(ddata->clk); if (err) dev_err(dev, "failed to get clock\n"); @@ -387,8 +441,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]);