From patchwork Tue Jan 31 12:35:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 9547109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C6B5A6016C for ; Tue, 31 Jan 2017 12:37:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6CF628307 for ; Tue, 31 Jan 2017 12:37:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA15428384; Tue, 31 Jan 2017 12:37:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17EA728307 for ; Tue, 31 Jan 2017 12:37:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752154AbdAaMhb (ORCPT ); Tue, 31 Jan 2017 07:37:31 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:16921 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752011AbdAaMgY (ORCPT ); Tue, 31 Jan 2017 07:36:24 -0500 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id v0VCWLGq003995; Tue, 31 Jan 2017 13:36:21 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-.pphosted.com with ESMTP id 288hn1pmcx-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 31 Jan 2017 13:36:21 +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 3FBE034; Tue, 31 Jan 2017 12:36:20 +0000 (GMT) Received: from Webmail-eu.st.com (safex1hubcas4.st.com [10.75.90.69]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1AE742AC8; Tue, 31 Jan 2017 12:36:20 +0000 (GMT) Received: from localhost (10.201.23.23) by webmail-eu.st.com (10.75.90.13) with Microsoft SMTP Server (TLS) id 8.3.444.0; Tue, 31 Jan 2017 13:36:19 +0100 From: Loic Pallardy To: , , CC: , , , , , , Subject: [PATCH v3 3/4] remoteproc: st: add da to va support Date: Tue, 31 Jan 2017 13:35:55 +0100 Message-ID: <1485866156-6364-4-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1485866156-6364-1-git-send-email-loic.pallardy@st.com> References: <1485866156-6364-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-01-31_05:, , signatures=0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ST remoteproc driver needs to provide information about carveout memory region to allow remoteproc core to load firmware and access trace buffer. Signed-off-by: Loic Pallardy --- Changes since V2: - fix checkpatch --strict warning --- drivers/remoteproc/st_remoteproc.c | 43 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c index f1e9339..80f8118 100644 --- a/drivers/remoteproc/st_remoteproc.c +++ b/drivers/remoteproc/st_remoteproc.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +54,10 @@ struct st_rproc { struct mbox_chan *mbox_chan[ST_RPROC_MAX_VRING * MBOX_MAX]; struct mbox_client mbox_client_vq0; struct mbox_client mbox_client_vq1; + phys_addr_t mem_phys; + phys_addr_t mem_reloc; + void *mem_region; + size_t mem_size; }; static void st_rproc_mbox_callback(struct device *dev, u32 msg) @@ -157,10 +162,23 @@ static int st_rproc_stop(struct rproc *rproc) return sw_err ?: pwr_err; } +static void *st_proc_da_to_va(struct rproc *rproc, u64 da, int len) +{ + struct st_rproc *ddata = rproc->priv; + int offset; + + offset = da - ddata->mem_reloc; + if (offset < 0 || offset + len > ddata->mem_size) + return NULL; + + return ddata->mem_region + offset; +} + static struct rproc_ops st_rproc_ops = { .kick = st_rproc_kick, .start = st_rproc_start, .stop = st_rproc_stop, + .da_to_va = st_proc_da_to_va, }; /* @@ -208,7 +226,8 @@ 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; + struct device_node *np = dev->of_node, *node; + struct resource res; int err; if (ddata->config->sw_reset) { @@ -252,10 +271,24 @@ 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"); + node = of_parse_phandle(np, "memory-region", 0); + if (!node) { + dev_err(dev, "No memory-region specified\n"); + return -EINVAL; + } + + err = of_address_to_resource(node, 0, &res); + if (err) return err; + + ddata->mem_phys = res.start; + ddata->mem_reloc = res.start; + ddata->mem_size = resource_size(&res); + ddata->mem_region = devm_ioremap_wc(dev, ddata->mem_phys, ddata->mem_size); + if (!ddata->mem_region) { + dev_err(dev, "Unable to map memory region: %pa+%zx\n", + &res.start, ddata->mem_size); + return -EBUSY; } err = clk_prepare(ddata->clk); @@ -385,8 +418,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]);