linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>,
	<linux-remoteproc@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
	<s-anna@ti.com>, Tero Kristo <t-kristo@ti.com>
Subject: [PATCH 05/17] remoteproc/omap: Add support to parse internal memories from DT
Date: Mon, 28 Oct 2019 14:42:26 +0200	[thread overview]
Message-ID: <20191028124238.19224-6-t-kristo@ti.com> (raw)
In-Reply-To: <20191028124238.19224-1-t-kristo@ti.com>

From: Suman Anna <s-anna@ti.com>

The OMAP remoteproc driver has been enhanced to parse and store
the kernel mappings for different internal RAM memories that may
be present within each remote processor IP subsystem. Different
devices have varying memories present on current SoCs. The current
support handles the L2RAM for all IPU devices on OMAP4+ SoCs. The
DSPs on OMAP4/OMAP5 only have Unicaches and do not have any L1 or
L2 RAM memories.

IPUs are expected to have the L2RAM at a fixed device address of
0x20000000, based on the current limitations on Attribute MMU
configurations.

NOTE:
The current logic doesn't handle the parsing of memories for DRA7
remoteproc devices, and will be added alongside the DRA7 support.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tero Kristo <t-kristo@ti.com>
---
 drivers/remoteproc/omap_remoteproc.c | 69 ++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index a10377547533..bbd6ff360e10 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -29,6 +29,8 @@
 #include "omap_remoteproc.h"
 #include "remoteproc_internal.h"
 
+#define OMAP_RPROC_IPU_L2RAM_DEV_ADDR		(0x20000000)
+
 /**
  * struct omap_rproc_boot_data - boot data structure for the DSP omap rprocs
  * @syscon: regmap handle for the system control configuration module
@@ -39,11 +41,27 @@ struct omap_rproc_boot_data {
 	unsigned int boot_reg;
 };
 
+/*
+ * struct omap_rproc_mem - internal memory structure
+ * @cpu_addr: MPU virtual address of the memory region
+ * @bus_addr: bus address used to access the memory region
+ * @dev_addr: device address of the memory region from DSP view
+ * @size: size of the memory region
+ */
+struct omap_rproc_mem {
+	void __iomem *cpu_addr;
+	phys_addr_t bus_addr;
+	u32 dev_addr;
+	size_t size;
+};
+
 /**
  * struct omap_rproc - omap remote processor state
  * @mbox: mailbox channel handle
  * @client: mailbox client to request the mailbox channel
  * @boot_data: boot data structure for setting processor boot address
+ * @mem: internal memory regions data
+ * @num_mems: number of internal memory regions
  * @rproc: rproc handle
  * @reset: reset handle
  */
@@ -51,6 +69,8 @@ struct omap_rproc {
 	struct mbox_chan *mbox;
 	struct mbox_client client;
 	struct omap_rproc_boot_data *boot_data;
+	struct omap_rproc_mem *mem;
+	int num_mems;
 	struct rproc *rproc;
 	struct reset_control *reset;
 };
@@ -307,6 +327,51 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev,
 	return 0;
 }
 
+static int omap_rproc_of_get_internal_memories(struct platform_device *pdev,
+					       struct rproc *rproc)
+{
+	static const char * const mem_names[] = {"l2ram"};
+	struct device_node *np = pdev->dev.of_node;
+	struct omap_rproc *oproc = rproc->priv;
+	struct device *dev = &pdev->dev;
+	struct resource *res;
+	int num_mems;
+	int i;
+
+	/* OMAP4 and OMAP5 DSPs do not have support for flat SRAM */
+	if (of_device_is_compatible(np, "ti,omap4-dsp") ||
+	    of_device_is_compatible(np, "ti,omap5-dsp"))
+		return 0;
+
+	num_mems = ARRAY_SIZE(mem_names);
+	oproc->mem = devm_kcalloc(dev, num_mems, sizeof(*oproc->mem),
+				  GFP_KERNEL);
+	if (!oproc->mem)
+		return -ENOMEM;
+
+	for (i = 0; i < num_mems; i++) {
+		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+						   mem_names[i]);
+		oproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res);
+		if (IS_ERR(oproc->mem[i].cpu_addr)) {
+			dev_err(dev, "failed to parse and map %s memory\n",
+				mem_names[i]);
+			return PTR_ERR(oproc->mem[i].cpu_addr);
+		}
+		oproc->mem[i].bus_addr = res->start;
+		oproc->mem[i].dev_addr = OMAP_RPROC_IPU_L2RAM_DEV_ADDR;
+		oproc->mem[i].size = resource_size(res);
+
+		dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n",
+			mem_names[i], &oproc->mem[i].bus_addr,
+			oproc->mem[i].size, oproc->mem[i].cpu_addr,
+			oproc->mem[i].dev_addr);
+	}
+	oproc->num_mems = num_mems;
+
+	return 0;
+}
+
 static int omap_rproc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -346,6 +411,10 @@ static int omap_rproc_probe(struct platform_device *pdev)
 	/* All existing OMAP IPU and DSP processors have an MMU */
 	rproc->has_iommu = true;
 
+	ret = omap_rproc_of_get_internal_memories(pdev, rproc);
+	if (ret)
+		goto free_rproc;
+
 	ret = omap_rproc_get_boot_data(pdev, rproc);
 	if (ret)
 		goto free_rproc;
-- 
2.17.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

  parent reply	other threads:[~2019-10-28 12:43 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-28 12:42 [PATCH 00/17] remoteproc: omap changes on top of v5.4-rc1 Tero Kristo
2019-10-28 12:42 ` [PATCH 01/17] dt-bindings: remoteproc: Add OMAP remoteproc bindings Tero Kristo
2019-11-06  3:27   ` Rob Herring
2019-11-06 12:44     ` Tero Kristo
2019-11-06 13:27       ` Rob Herring
2019-11-06 13:50         ` Tero Kristo
2019-11-07 14:05   ` [PATCHv2 " Tero Kristo
2019-11-13 14:25     ` Rob Herring
2019-10-28 12:42 ` [PATCH 02/17] remoteproc/omap: Switch to SPDX license identifiers Tero Kristo
2019-11-09  1:03   ` Bjorn Andersson
2019-11-12  8:16     ` Tero Kristo
2019-12-20  3:30       ` Suman Anna
2019-10-28 12:42 ` [PATCH 03/17] remoteproc/omap: Add device tree support Tero Kristo
2019-11-11 23:16   ` Bjorn Andersson
2019-11-12  8:14     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 04/17] remoteproc/omap: Add a sanity check for DSP boot address alignment Tero Kristo
2019-11-11 23:18   ` Bjorn Andersson
2019-10-28 12:42 ` Tero Kristo [this message]
2019-11-11 23:21   ` [PATCH 05/17] remoteproc/omap: Add support to parse internal memories from DT Bjorn Andersson
2019-11-12  8:21     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 06/17] remoteproc/omap: Add the rproc ops .da_to_va() implementation Tero Kristo
2019-11-11 23:22   ` Bjorn Andersson
2019-11-12  8:22     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 07/17] remoteproc/omap: Initialize and assign reserved memory node Tero Kristo
2019-11-11 23:23   ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 08/17] remoteproc/omap: Add support for DRA7xx remote processors Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-11-12  8:37     ` Tero Kristo
2019-11-12 18:13       ` Bjorn Andersson
2019-11-13  8:08         ` Tero Kristo
2019-10-28 12:42 ` [PATCH 09/17] remoteproc/omap: Remove the unused fields from platform data Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 10/17] remoteproc/omap: Remove the omap_rproc_reserve_cma declaration Tero Kristo
2019-11-11 23:37   ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 11/17] remoteproc/omap: Check for undefined mailbox messages Tero Kristo
2019-11-11 23:39   ` Bjorn Andersson
2019-11-12  8:38     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 12/17] remoteproc/omap: Request a timer(s) for remoteproc usage Tero Kristo
2019-11-12  4:13   ` Bjorn Andersson
2019-11-12  8:42     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 13/17] remoteproc/omap: add support for system suspend/resume Tero Kristo
2019-11-12  6:15   ` Bjorn Andersson
2019-11-12  8:45     ` Tero Kristo
2019-11-12 18:06       ` Bjorn Andersson
2019-10-28 12:42 ` [PATCH 14/17] remoteproc/omap: add support for runtime auto-suspend/resume Tero Kristo
2019-10-28 12:42 ` [PATCH 15/17] remoteproc/omap: report device exceptions and trigger recovery Tero Kristo
2019-11-12  6:26   ` Bjorn Andersson
2019-11-12  8:46     ` Tero Kristo
2019-10-28 12:42 ` [PATCH 16/17] remoteproc/omap: add watchdog functionality for remote processors Tero Kristo
2019-10-28 12:42 ` [PATCH 17/17] remoteproc/omap: fix auto-suspend failure warning during crashed state Tero Kristo
2019-11-12  6:28   ` Bjorn Andersson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191028124238.19224-6-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-remoteproc@vger.kernel.org \
    --cc=ohad@wizery.com \
    --cc=s-anna@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).