remoteproc: Introduce K3 C66 and C71 remoteproc driver
authorLokesh Vutla <lokeshvutla@ti.com>
Wed, 4 Sep 2019 10:31:36 +0000 (16:01 +0530)
committerTom Rini <trini@konsulko.com>
Fri, 11 Oct 2019 14:07:34 +0000 (10:07 -0400)
Certain SoCs with K3 architecture have integrated a C66 Corepac DSP
subsystem and an advanced C71 DSPs. Introduce a remoteproc driver
that that does take care of loading an elf to any of the specified
DSPs and start it.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
drivers/remoteproc/Kconfig
drivers/remoteproc/Makefile
drivers/remoteproc/ti_k3_dsp_rproc.c [new file with mode: 0644]

index c2d59ba0007eee453140ebbb7371da413f0251cc..7c2e4804b5d0d648f9d3cf63e6b6ac38969bc7b9 100644 (file)
@@ -52,6 +52,16 @@ config REMOTEPROC_TI_K3_ARM64
          on various TI K3 family of SoCs through the remote processor
          framework.
 
+config REMOTEPROC_TI_K3_DSP
+       bool "TI K3 C66 and C71 remoteproc support"
+       select REMOTEPROC
+       depends on ARCH_K3
+       depends on TI_SCI_PROTOCOL
+       help
+         Say y here to support TI's C66/C71 remote processor subsystems
+         on various TI K3 family of SoCs through the remote processor
+         framework.
+
 config REMOTEPROC_TI_K3_R5F
        bool "TI K3 R5F remoteproc support"
        select REMOTEPROC
index 9d247ba5e7aedec671ff9dbe9927a2ef62653791..69ae7bd1e89cfd7354e5ff117d1fbc416d1f6c5f 100644 (file)
@@ -11,5 +11,6 @@ obj-$(CONFIG_K3_SYSTEM_CONTROLLER) += k3_system_controller.o
 obj-$(CONFIG_REMOTEPROC_SANDBOX) += sandbox_testproc.o
 obj-$(CONFIG_REMOTEPROC_STM32_COPRO) += stm32_copro.o
 obj-$(CONFIG_REMOTEPROC_TI_K3_ARM64) += ti_k3_arm64_rproc.o
+obj-$(CONFIG_REMOTEPROC_TI_K3_DSP) += ti_k3_dsp_rproc.o
 obj-$(CONFIG_REMOTEPROC_TI_K3_R5F) += ti_k3_r5f_rproc.o
 obj-$(CONFIG_REMOTEPROC_TI_POWER) += ti_power_proc.o
diff --git a/drivers/remoteproc/ti_k3_dsp_rproc.c b/drivers/remoteproc/ti_k3_dsp_rproc.c
new file mode 100644 (file)
index 0000000..c5dc6b2
--- /dev/null
@@ -0,0 +1,354 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Texas Instruments' K3 DSP Remoteproc driver
+ *
+ * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/
+ *     Lokesh Vutla <lokeshvutla@ti.com>
+ *
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <remoteproc.h>
+#include <errno.h>
+#include <clk.h>
+#include <reset.h>
+#include <asm/io.h>
+#include <power-domain.h>
+#include <linux/soc/ti/ti_sci_protocol.h>
+#include "ti_sci_proc.h"
+
+#define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK      (SZ_16M - 1)
+
+/**
+ * struct k3_dsp_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 from remoteproc view
+ * @size: Size of the memory region
+ */
+struct k3_dsp_mem {
+       void __iomem *cpu_addr;
+       phys_addr_t bus_addr;
+       phys_addr_t dev_addr;
+       size_t size;
+};
+
+/**
+ * struct k3_dsp_privdata - Structure representing Remote processor data.
+ * @rproc_rst:         rproc reset control data
+ * @tsp:               Pointer to TISCI proc contrl handle
+ * @mem:               Array of available memories
+ * @num_mem:           Number of available memories
+ */
+struct k3_dsp_privdata {
+       struct reset_ctl dsp_rst;
+       struct ti_sci_proc tsp;
+       struct k3_dsp_mem *mem;
+       int num_mems;
+};
+
+/**
+ * k3_dsp_load() - Load up the Remote processor image
+ * @dev:       rproc device pointer
+ * @addr:      Address at which image is available
+ * @size:      size of the image
+ *
+ * Return: 0 if all goes good, else appropriate error message.
+ */
+static int k3_dsp_load(struct udevice *dev, ulong addr, ulong size)
+{
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+       u32 boot_vector;
+       int ret;
+
+       dev_dbg(dev, "%s addr = 0x%lx, size = 0x%lx\n", __func__, addr, size);
+       ret = ti_sci_proc_request(&dsp->tsp);
+       if (ret)
+               return ret;
+
+       ret = rproc_elf_load_image(dev, addr, size);
+       if (ret < 0) {
+               dev_err(dev, "Loading elf failed %d\n", ret);
+               goto proc_release;
+       }
+
+       boot_vector = rproc_elf_get_boot_addr(dev, addr);
+
+       dev_dbg(dev, "%s: Boot vector = 0x%x\n", __func__, boot_vector);
+
+       ret = ti_sci_proc_set_config(&dsp->tsp, boot_vector, 0, 0);
+proc_release:
+       ti_sci_proc_release(&dsp->tsp);
+       return ret;
+}
+
+/**
+ * k3_dsp_start() - Start the remote processor
+ * @dev:       rproc device pointer
+ *
+ * Return: 0 if all went ok, else return appropriate error
+ */
+static int k3_dsp_start(struct udevice *dev)
+{
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+       int ret;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       ret = ti_sci_proc_request(&dsp->tsp);
+       if (ret)
+               return ret;
+       /*
+        * Setting the right clock frequency would have taken care by
+        * assigned-clock-rates during the device probe. So no need to
+        * set the frequency again here.
+        */
+       ret = ti_sci_proc_power_domain_on(&dsp->tsp);
+       if (ret)
+               goto proc_release;
+
+       ret = reset_deassert(&dsp->dsp_rst);
+
+proc_release:
+       ti_sci_proc_release(&dsp->tsp);
+
+       return ret;
+}
+
+static int k3_dsp_stop(struct udevice *dev)
+{
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       ti_sci_proc_request(&dsp->tsp);
+       reset_assert(&dsp->dsp_rst);
+       ti_sci_proc_power_domain_off(&dsp->tsp);
+       ti_sci_proc_release(&dsp->tsp);
+
+       return 0;
+}
+
+/**
+ * k3_dsp_init() - Initialize the remote processor
+ * @dev:       rproc device pointer
+ *
+ * Return: 0 if all went ok, else return appropriate error
+ */
+static int k3_dsp_init(struct udevice *dev)
+{
+       dev_dbg(dev, "%s\n", __func__);
+
+       return 0;
+}
+
+static int k3_dsp_reset(struct udevice *dev)
+{
+       dev_dbg(dev, "%s\n", __func__);
+
+       return 0;
+}
+
+static void *k3_dsp_da_to_va(struct udevice *dev, ulong da, ulong len)
+{
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+       phys_addr_t bus_addr, dev_addr;
+       void __iomem *va = NULL;
+       size_t size;
+       u32 offset;
+       int i;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       if (len <= 0)
+               return NULL;
+
+       for (i = 0; i < dsp->num_mems; i++) {
+               bus_addr = dsp->mem[i].bus_addr;
+               dev_addr = dsp->mem[i].dev_addr;
+               size = dsp->mem[i].size;
+
+               if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {
+                       offset = da - dev_addr;
+                       va = dsp->mem[i].cpu_addr + offset;
+                       return (__force void *)va;
+               }
+
+               if (da >= bus_addr && (da + len) <= (bus_addr + size)) {
+                       offset = da - bus_addr;
+                       va = dsp->mem[i].cpu_addr + offset;
+                       return (__force void *)va;
+               }
+       }
+
+       /* Assume it is DDR region and return da */
+       return map_physmem(da, len, MAP_NOCACHE);
+}
+
+static const struct dm_rproc_ops k3_dsp_ops = {
+       .init = k3_dsp_init,
+       .load = k3_dsp_load,
+       .start = k3_dsp_start,
+       .stop = k3_dsp_stop,
+       .reset = k3_dsp_reset,
+       .device_to_virt = k3_dsp_da_to_va,
+};
+
+static int ti_sci_proc_of_to_priv(struct udevice *dev, struct ti_sci_proc *tsp)
+{
+       u32 ids[2];
+       int ret;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       tsp->sci = ti_sci_get_by_phandle(dev, "ti,sci");
+       if (IS_ERR(tsp->sci)) {
+               dev_err(dev, "ti_sci get failed: %ld\n", PTR_ERR(tsp->sci));
+               return PTR_ERR(tsp->sci);
+       }
+
+       ret = dev_read_u32_array(dev, "ti,sci-proc-ids", ids, 2);
+       if (ret) {
+               dev_err(dev, "Proc IDs not populated %d\n", ret);
+               return ret;
+       }
+
+       tsp->ops = &tsp->sci->ops.proc_ops;
+       tsp->proc_id = ids[0];
+       tsp->host_id = ids[1];
+       tsp->dev_id = dev_read_u32_default(dev, "ti,sci-dev-id",
+                                          TI_SCI_RESOURCE_NULL);
+       if (tsp->dev_id == TI_SCI_RESOURCE_NULL) {
+               dev_err(dev, "Device ID not populated %d\n", ret);
+               return -ENODEV;
+       }
+
+       return 0;
+}
+
+static int k3_dsp_of_get_memories(struct udevice *dev)
+{
+       static const char * const mem_names[] = {"l2sram", "l1pram", "l1dram"};
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+       int i;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       dsp->num_mems = ARRAY_SIZE(mem_names);
+       dsp->mem = calloc(dsp->num_mems, sizeof(*dsp->mem));
+       if (!dsp->mem)
+               return -ENOMEM;
+
+       for (i = 0; i < dsp->num_mems; i++) {
+               /* C71 cores only have a L1P Cache, there are no L1P SRAMs */
+               if (device_is_compatible(dev, "ti,j721e-c71-dsp") &&
+                   !strcmp(mem_names[i], "l1pram")) {
+                       dsp->mem[i].bus_addr = FDT_ADDR_T_NONE;
+                       dsp->mem[i].dev_addr = FDT_ADDR_T_NONE;
+                       dsp->mem[i].cpu_addr = NULL;
+                       dsp->mem[i].size = 0;
+                       continue;
+               }
+
+               dsp->mem[i].bus_addr = dev_read_addr_size_name(dev, mem_names[i],
+                                         (fdt_addr_t *)&dsp->mem[i].size);
+               if (dsp->mem[i].bus_addr == FDT_ADDR_T_NONE) {
+                       dev_err(dev, "%s bus address not found\n", mem_names[i]);
+                       return -EINVAL;
+               }
+               dsp->mem[i].cpu_addr = map_physmem(dsp->mem[i].bus_addr,
+                                                  dsp->mem[i].size,
+                                                  MAP_NOCACHE);
+               dsp->mem[i].dev_addr = dsp->mem[i].bus_addr &
+                                       KEYSTONE_RPROC_LOCAL_ADDRESS_MASK;
+
+               dev_dbg(dev, "memory %8s: bus addr %pa size 0x%zx va %p da %pa\n",
+                       mem_names[i], &dsp->mem[i].bus_addr,
+                       dsp->mem[i].size, dsp->mem[i].cpu_addr,
+                       &dsp->mem[i].dev_addr);
+       }
+
+       return 0;
+}
+
+/**
+ * k3_of_to_priv() - generate private data from device tree
+ * @dev:       corresponding k3 dsp processor device
+ * @dsp:       pointer to driver specific private data
+ *
+ * Return: 0 if all goes good, else appropriate error message.
+ */
+static int k3_dsp_of_to_priv(struct udevice *dev, struct k3_dsp_privdata *dsp)
+{
+       int ret;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       ret = reset_get_by_index(dev, 0, &dsp->dsp_rst);
+       if (ret) {
+               dev_err(dev, "reset_get() failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = ti_sci_proc_of_to_priv(dev, &dsp->tsp);
+       if (ret)
+               return ret;
+
+       ret =  k3_dsp_of_get_memories(dev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
+/**
+ * k3_dsp_probe() - Basic probe
+ * @dev:       corresponding k3 remote processor device
+ *
+ * Return: 0 if all goes good, else appropriate error message.
+ */
+static int k3_dsp_probe(struct udevice *dev)
+{
+       struct k3_dsp_privdata *dsp;
+       int ret;
+
+       dev_dbg(dev, "%s\n", __func__);
+
+       dsp = dev_get_priv(dev);
+
+       ret = k3_dsp_of_to_priv(dev, dsp);
+       if (ret) {
+               dev_dbg(dev, "%s: Probe failed with error %d\n", __func__, ret);
+               return ret;
+       }
+
+       dev_dbg(dev, "Remoteproc successfully probed\n");
+
+       return 0;
+}
+
+static int k3_dsp_remove(struct udevice *dev)
+{
+       struct k3_dsp_privdata *dsp = dev_get_priv(dev);
+
+       free(dsp->mem);
+
+       return 0;
+}
+
+static const struct udevice_id k3_dsp_ids[] = {
+       { .compatible = "ti,j721e-c66-dsp"},
+       { .compatible = "ti,j721e-c71-dsp"},
+       {}
+};
+
+U_BOOT_DRIVER(k3_dsp) = {
+       .name = "k3_dsp",
+       .of_match = k3_dsp_ids,
+       .id = UCLASS_REMOTEPROC,
+       .ops = &k3_dsp_ops,
+       .probe = k3_dsp_probe,
+       .remove = k3_dsp_remove,
+       .priv_auto_alloc_size = sizeof(struct k3_dsp_privdata),
+};