From patchwork Mon Oct 28 12:42:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 177925 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp3340315ill; Mon, 28 Oct 2019 05:44:15 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgVmySynou8VUtzUqrtjbDqKJUHpGNSnmi925mVURvXZR6KQOfBYJjiCQaHdWW/mVTETmy X-Received: by 2002:a17:906:5ac5:: with SMTP id x5mr14439892ejs.257.1572266655476; Mon, 28 Oct 2019 05:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572266655; cv=none; d=google.com; s=arc-20160816; b=KgKShT0+joeZPmXStsU+ijVEtgpS7D1wVBDJIQ0Xm/esmCkzb7Gh1PL72jHoneIqW8 G0c+e3HmSzyDrf6p9USukoXFcMXVsRF02+yBcwG7YwN8rn6abiHcX+qEYf3AZxoglepC VNBy4RxXrrL16p0REHrqilLSrXnXmnhb1UEI/3P5qpihi/wtU+tziD3kAXR46uJa118E vmb2qXXmmAjIA3Nh65eWrVvX6fHmyv+ysh2GCyrGLTrsEsP1BeRt6WZzfgnbC2A41bIb O4N0LG8WAr43xNQ2cY/ZIvoPJrTqJr965rZCkaLsTq5+edkyXUkx0fAG3Wf7+hYpitm9 vKvg== 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:dkim-signature; bh=x/1ShyHw3DHIb91zMf5BuVBlWyo7PisYhvGSZymjxI8=; b=WQH4V7yoS3klGj4cCtdo4bZFzq4Q6PTZG8SW+stfmA53JEPPZrVV5Xmeo1ldZ3s7UZ ApgCPQxQd+dPSGXHSrGqXmxn81fLNA9lqx+TOYXzs5OAayIRJH8MG/IVqDRh9KlAk97c ANg71M+rOUMGA8ZeyOY+KNQHVbtZwc7SCupMuJjxoA7zqj64Y9cDKMkbYEIa61ez1KPS qiDnl3pXRoa1QipTW/9MqvhsuIpx90rKo+r1MFaDWAY3Qf9g8DqjcPaQhAxDdYZQnGxG HXP3Q7hZ3X8jiJQKbHnirsoTQpA/RdE2RQyZemk5OsOt88yIM6dp8lm0HEnNjRflJ9CM oiCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ONDhbt7X; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n26si6249791ejy.153.2019.10.28.05.44.15; Mon, 28 Oct 2019 05:44:15 -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; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=ONDhbt7X; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389351AbfJ1MnP (ORCPT + 26 others); Mon, 28 Oct 2019 08:43:15 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:37268 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389320AbfJ1MnM (ORCPT ); Mon, 28 Oct 2019 08:43:12 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id x9SChADk033937; Mon, 28 Oct 2019 07:43:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1572266590; bh=x/1ShyHw3DHIb91zMf5BuVBlWyo7PisYhvGSZymjxI8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ONDhbt7XTx98Ac7dGPshObPYP14+jRzrfTJoTtDs+qDe5HUdWL9wMvt6iAknmiX4u wNXBs/mtgHa64WgDzM+lP/MqrInVelZqo7SSFO12y0SAPi3v8wVZcmRU3ROVNPtocN f5Pj/J+foA0H+oWkGCW7n+JaNcPI5Zb07gVJ5m6I= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x9SChAe4075265 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 28 Oct 2019 07:43:10 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Mon, 28 Oct 2019 07:43:10 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Mon, 28 Oct 2019 07:42:58 -0500 Received: from sokoban.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x9SCgoh0063574; Mon, 28 Oct 2019 07:43:08 -0500 From: Tero Kristo To: , , CC: , , , Tero Kristo Subject: [PATCH 08/17] remoteproc/omap: Add support for DRA7xx remote processors Date: Mon, 28 Oct 2019 14:42:29 +0200 Message-ID: <20191028124238.19224-9-t-kristo@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191028124238.19224-1-t-kristo@ti.com> References: <20191028124238.19224-1-t-kristo@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Suman Anna DRA7xx/AM57xx SoCs have two IPU and up to two DSP processor subsystems for offloading different computation algorithms. The IPU processor subsystem contains dual-core ARM Cortex-M4 processors, and is very similar to those on OMAP5. The DSP processor subsystem is based on the TI's standard TMS320C66x DSP CorePac core. Support has been added to the OMAP remoteproc driver through new DRA7xx specific compatibles for properly probing and booting the all the different processor subsystem instances on DRA7xx/AM57xx SoCs - IPU1, IPU2, DSP1 & DSP2. A build dependency with SOC_DRA7XX is added to enable the driver to be built in DRA7xx-only configuration. The DSP boot address programming needed enhancement for DRA7xx as the boot register fields are different on DRA7 compared to OMAP4 and OMAP5 SoCs. The register on DRA7xx contains additional fields within the register and the boot address bit-field is right-shifted by 10 bits. The internal memory parsing logic has also been updated to compute the device addresses for the L2 RAM for DSP devices using relative addressing logic, and to parse two additional RAMs at L1 level - L1P and L1D. This allows the remoteproc driver to support loading into these regions for a small subset of firmware images requiring as such. The most common usage would be to use the L1 programmable RAMs as L1 Caches. The firmware lookup logic also has to be adjusted for DRA7xx as there are (can be) more than one instance of both the IPU and DSP remote processors for the first time in OMAP4+ SoCs. The names for the firmware images are fixed for each processor and are expected to be as follows: IPU1: dra7-ipu1-fw.xem4 IPU2: dra7-ipu2-fw.xem4 DSP1: dra7-dsp1-fw.xe66 DSP2: dra7-dsp2-fw.xe66 Signed-off-by: Suman Anna [t-kristo@ti.com: fixed l4_offset calculation logic] Signed-off-by: Tero Kristo --- drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/omap_remoteproc.c | 103 ++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 9 deletions(-) -- 2.17.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 94afdde4bc9f..d6450d7fcf92 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -25,7 +25,7 @@ config IMX_REMOTEPROC config OMAP_REMOTEPROC tristate "OMAP remoteproc support" - depends on ARCH_OMAP4 || SOC_OMAP5 + depends on ARCH_OMAP4 || SOC_OMAP5 || SOC_DRA7XX depends on OMAP_IOMMU select MAILBOX select OMAP2PLUS_MBOX diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 0b80570effee..e46bb4c790d7 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,16 +31,20 @@ #include "omap_remoteproc.h" #include "remoteproc_internal.h" +#define OMAP_RPROC_DSP_LOCAL_MEM_OFFSET (0x00800000) #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 * @boot_reg: boot register offset within the @syscon regmap + * @boot_reg_shift: bit-field shift required for the boot address value in + * @boot_reg */ struct omap_rproc_boot_data { struct regmap *syscon; unsigned int boot_reg; + unsigned int boot_reg_shift; }; /* @@ -151,14 +156,19 @@ static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc) struct omap_rproc *oproc = rproc->priv; struct omap_rproc_boot_data *bdata = oproc->boot_data; u32 offset = bdata->boot_reg; + unsigned int value = rproc->bootaddr; + unsigned int mask = ~(SZ_1K - 1); - if (rproc->bootaddr & (SZ_1K - 1)) { + if (value & (SZ_1K - 1)) { dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n", - rproc->bootaddr); + value); return -EINVAL; } - regmap_write(bdata->syscon, offset, rproc->bootaddr); + value >>= bdata->boot_reg_shift; + mask >>= bdata->boot_reg_shift; + + regmap_update_bits(bdata->syscon, offset, mask, value); return 0; } @@ -292,6 +302,28 @@ static const struct omap_rproc_dev_data omap5_ipu_dev_data = { .fw_name = "omap5-ipu-fw.xem4", }; +static const struct omap_rproc_dev_data dra7_rproc_dev_data[] = { + { + .device_name = "40800000.dsp", + .fw_name = "dra7-dsp1-fw.xe66", + }, + { + .device_name = "41000000.dsp", + .fw_name = "dra7-dsp2-fw.xe66", + }, + { + .device_name = "55020000.ipu", + .fw_name = "dra7-ipu2-fw.xem4", + }, + { + .device_name = "58820000.ipu", + .fw_name = "dra7-ipu1-fw.xem4", + }, + { + /* sentinel */ + }, +}; + static const struct of_device_id omap_rproc_of_match[] = { { .compatible = "ti,omap4-dsp", @@ -309,6 +341,14 @@ static const struct of_device_id omap_rproc_of_match[] = { .compatible = "ti,omap5-ipu", .data = &omap5_ipu_dev_data, }, + { + .compatible = "ti,dra7-dsp", + .data = dra7_rproc_dev_data, + }, + { + .compatible = "ti,dra7-ipu", + .data = dra7_rproc_dev_data, + }, { /* end */ }, @@ -317,13 +357,23 @@ MODULE_DEVICE_TABLE(of, omap_rproc_of_match); static const char *omap_rproc_get_firmware(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; const struct omap_rproc_dev_data *data; data = of_device_get_match_data(&pdev->dev); if (!data) return ERR_PTR(-ENODEV); - return data->fw_name; + if (!of_device_is_compatible(np, "ti,dra7-dsp") && + !of_device_is_compatible(np, "ti,dra7-ipu")) + return data->fw_name; + + for (; data && data->device_name; data++) { + if (!strcmp(dev_name(&pdev->dev), data->device_name)) + return data->fw_name; + } + + return ERR_PTR(-ENOENT); } static int omap_rproc_get_boot_data(struct platform_device *pdev, @@ -334,7 +384,8 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev, int ret; if (!of_device_is_compatible(np, "ti,omap4-dsp") && - !of_device_is_compatible(np, "ti,omap5-dsp")) + !of_device_is_compatible(np, "ti,omap5-dsp") && + !of_device_is_compatible(np, "ti,dra7-dsp")) return 0; oproc->boot_data = devm_kzalloc(&pdev->dev, sizeof(*oproc->boot_data), @@ -360,18 +411,27 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev, return -EINVAL; } + if (of_device_is_compatible(np, "ti,dra7-dsp")) + oproc->boot_data->boot_reg_shift = 10; + return 0; } static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, struct rproc *rproc) { - static const char * const mem_names[] = {"l2ram"}; + static const char * const ipu_mem_names[] = {"l2ram"}; + static const char * const dra7_dsp_mem_names[] = {"l2ram", "l1pram", + "l1dram"}; struct device_node *np = pdev->dev.of_node; struct omap_rproc *oproc = rproc->priv; struct device *dev = &pdev->dev; + const char * const *mem_names; struct resource *res; int num_mems; + const __be32 *addrp; + u32 l4_offset = 0; + u64 size; int i; /* OMAP4 and OMAP5 DSPs do not have support for flat SRAM */ @@ -379,7 +439,15 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, of_device_is_compatible(np, "ti,omap5-dsp")) return 0; - num_mems = ARRAY_SIZE(mem_names); + /* DRA7 DSPs have two additional SRAMs at L1 level */ + if (of_device_is_compatible(np, "ti,dra7-dsp")) { + mem_names = dra7_dsp_mem_names; + num_mems = ARRAY_SIZE(dra7_dsp_mem_names); + } else { + mem_names = ipu_mem_names; + num_mems = ARRAY_SIZE(ipu_mem_names); + } + oproc->mem = devm_kcalloc(dev, num_mems, sizeof(*oproc->mem), GFP_KERNEL); if (!oproc->mem) @@ -395,7 +463,26 @@ static int omap_rproc_of_get_internal_memories(struct platform_device *pdev, 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; + + /* + * The DSPs have the internal memories starting at a fixed + * offset of 0x800000 from address 0, and this corresponds to + * L2RAM. The L3 address view has the L2RAM bus address as the + * starting address for the IP, so the L2RAM memory region needs + * to be processed first, and the device addresses for each + * memory region can be computed using the relative offset + * from this base address. + */ + if (of_device_is_compatible(np, "ti,dra7-dsp") && + !strcmp(mem_names[i], "l2ram")) { + addrp = of_get_address(dev->of_node, i, &size, NULL); + l4_offset = of_translate_address(dev->of_node, addrp); + } + oproc->mem[i].dev_addr = + of_device_is_compatible(np, "ti,dra7-dsp") ? + res->start - l4_offset + + OMAP_RPROC_DSP_LOCAL_MEM_OFFSET : + 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",