From: Lokesh Vutla Date: Fri, 7 Jun 2019 13:55:59 +0000 (+0530) Subject: remoteproc: k3_rproc: Rename to ti_k3_arm64_rproc X-Git-Tag: v2019.10-rc1~8^2~35 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54e4311fa1c75549e391ac7e6717959031855d58;p=oweals%2Fu-boot.git remoteproc: k3_rproc: Rename to ti_k3_arm64_rproc k3_rproc driver is specifically meant for controlling an arm64 core using TISCI protocol. So rename the driver, Kconfig symbol, compatible and functions accordingly. While at it drop this remoteproc selection for a53 defconfig. Signed-off-by: Lokesh Vutla --- diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig index 9d4c6a205c..2cf3a693fc 100644 --- a/configs/am65x_evm_a53_defconfig +++ b/configs/am65x_evm_a53_defconfig @@ -80,7 +80,6 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig index 7e81a98454..c59b7d98dc 100644 --- a/configs/am65x_evm_r5_defconfig +++ b/configs/am65x_evm_r5_defconfig @@ -86,7 +86,7 @@ CONFIG_SPL_DM_REGULATOR_GPIO=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y +CONFIG_REMOTEPROC_TI_K3_ARM64=y CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig index 56052f73f3..48b28b390e 100644 --- a/configs/am65x_hs_evm_a53_defconfig +++ b/configs/am65x_hs_evm_a53_defconfig @@ -77,7 +77,6 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_POWER_DOMAIN=y CONFIG_TI_SCI_POWER_DOMAIN=y CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig index d378d1e9ee..2f962b0e82 100644 --- a/configs/am65x_hs_evm_r5_defconfig +++ b/configs/am65x_hs_evm_r5_defconfig @@ -86,7 +86,7 @@ CONFIG_SPL_DM_REGULATOR_GPIO=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_K3_SYSTEM_CONTROLLER=y -CONFIG_REMOTEPROC_K3=y +CONFIG_REMOTEPROC_TI_K3_ARM64=y CONFIG_DM_RESET=y CONFIG_RESET_TI_SCI=y CONFIG_DM_SERIAL=y diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index fa6f1113e1..f54a245424 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -22,15 +22,6 @@ config K3_SYSTEM_CONTROLLER help Say 'y' here to add support for TI' K3 System Controller. -config REMOTEPROC_K3 - bool "Support for TI's K3 based remoteproc driver" - select REMOTEPROC - depends on DM - depends on ARCH_K3 - depends on OF_CONTROL - help - Say 'y' here to add support for TI' K3 remoteproc driver. - config REMOTEPROC_SANDBOX bool "Support for Test processor for Sandbox" select REMOTEPROC @@ -50,6 +41,17 @@ config REMOTEPROC_STM32_COPRO Say 'y' here to add support for STM32 Cortex-M4 coprocessors via the remoteproc framework. +config REMOTEPROC_TI_K3_ARM64 + bool "Support for TI's K3 based ARM64 remoteproc driver" + select REMOTEPROC + depends on DM + depends on ARCH_K3 + depends on OF_CONTROL + help + Say y here to support TI's ARM64 processor subsystems + on various TI K3 family of SoCs through the remote processor + framework. + config REMOTEPROC_TI_POWER bool "Support for TI Power processor" select REMOTEPROC diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index b9a06acdef..271ba55b09 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_$(SPL_)REMOTEPROC) += rproc-uclass.o rproc-elf-loader.o # Remote proc drivers - Please keep this list alphabetically sorted. obj-$(CONFIG_K3_SYSTEM_CONTROLLER) += k3_system_controller.o -obj-$(CONFIG_REMOTEPROC_K3) += k3_rproc.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_POWER) += ti_power_proc.o diff --git a/drivers/remoteproc/k3_rproc.c b/drivers/remoteproc/k3_rproc.c deleted file mode 100644 index 4f9567c924..0000000000 --- a/drivers/remoteproc/k3_rproc.c +++ /dev/null @@ -1,227 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Texas Instruments' K3 Remoteproc driver - * - * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ - * Lokesh Vutla - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "ti_sci_proc.h" - -#define INVALID_ID 0xffff - -#define GTC_CNTCR_REG 0x0 -#define GTC_CNTR_EN 0x3 - -/** - * struct k3_rproc_privdata - Structure representing Remote processor data. - * @rproc_pwrdmn: rproc power domain data - * @rproc_rst: rproc reset control data - * @sci: Pointer to TISCI handle - * @tsp: TISCI processor control helper structure - * @gtc_base: Timer base address. - */ -struct k3_rproc_privdata { - struct power_domain rproc_pwrdmn; - struct power_domain gtc_pwrdmn; - struct reset_ctl rproc_rst; - struct ti_sci_proc tsp; - void *gtc_base; -}; - -/** - * k3_rproc_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_rproc_load(struct udevice *dev, ulong addr, ulong size) -{ - struct k3_rproc_privdata *rproc = dev_get_priv(dev); - int ret; - - dev_dbg(dev, "%s addr = 0x%lx, size = 0x%lx\n", __func__, addr, size); - - /* request for the processor */ - ret = ti_sci_proc_request(&rproc->tsp); - if (ret) - return ret; - - return ti_sci_proc_set_config(&rproc->tsp, addr, 0, 0); -} - -/** - * k3_rproc_start() - Start the remote processor - * @dev: rproc device pointer - * - * Return: 0 if all went ok, else return appropriate error - */ -static int k3_rproc_start(struct udevice *dev) -{ - struct k3_rproc_privdata *rproc = dev_get_priv(dev); - int ret; - - dev_dbg(dev, "%s\n", __func__); - - ret = power_domain_on(&rproc->gtc_pwrdmn); - if (ret) { - dev_err(dev, "power_domain_on() failed: %d\n", ret); - return ret; - } - - /* Enable the timer before starting remote core */ - writel(GTC_CNTR_EN, rproc->gtc_base + GTC_CNTCR_REG); - - /* - * 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 = power_domain_on(&rproc->rproc_pwrdmn); - if (ret) { - dev_err(dev, "power_domain_on() failed: %d\n", ret); - return ret; - } - - return ti_sci_proc_release(&rproc->tsp); -} - -/** - * k3_rproc_init() - Initialize the remote processor - * @dev: rproc device pointer - * - * Return: 0 if all went ok, else return appropriate error - */ -static int k3_rproc_init(struct udevice *dev) -{ - dev_dbg(dev, "%s\n", __func__); - - /* Enable the module */ - dev_dbg(dev, "%s: rproc successfully initialized\n", __func__); - - return 0; -} - -static const struct dm_rproc_ops k3_rproc_ops = { - .init = k3_rproc_init, - .load = k3_rproc_load, - .start = k3_rproc_start, -}; - -static int ti_sci_proc_of_to_priv(struct udevice *dev, struct ti_sci_proc *tsp) -{ - 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); - } - - tsp->proc_id = dev_read_u32_default(dev, "ti,sci-proc-id", INVALID_ID); - if (tsp->proc_id == INVALID_ID) { - dev_err(dev, "proc id not populated\n"); - return -ENOENT; - } - tsp->host_id = dev_read_u32_default(dev, "ti,sci-host-id", INVALID_ID); - tsp->ops = &tsp->sci->ops.proc_ops; - - return 0; -} - -/** - * k3_of_to_priv() - generate private data from device tree - * @dev: corresponding k3 remote processor device - * @priv: pointer to driver specific private data - * - * Return: 0 if all goes good, else appropriate error message. - */ -static int k3_rproc_of_to_priv(struct udevice *dev, - struct k3_rproc_privdata *rproc) -{ - int ret; - - dev_dbg(dev, "%s\n", __func__); - - ret = power_domain_get_by_index(dev, &rproc->rproc_pwrdmn, 1); - if (ret) { - dev_err(dev, "power_domain_get() failed: %d\n", ret); - return ret; - } - - ret = power_domain_get_by_index(dev, &rproc->gtc_pwrdmn, 0); - if (ret) { - dev_err(dev, "power_domain_get() failed: %d\n", ret); - return ret; - } - - ret = reset_get_by_index(dev, 0, &rproc->rproc_rst); - if (ret) { - dev_err(dev, "reset_get() failed: %d\n", ret); - return ret; - } - - ret = ti_sci_proc_of_to_priv(dev, &rproc->tsp); - if (ret) - return ret; - - rproc->gtc_base = dev_read_addr_ptr(dev); - if (!rproc->gtc_base) { - dev_err(dev, "Get address failed\n"); - return -ENODEV; - } - - return 0; -} - -/** - * k3_rproc_probe() - Basic probe - * @dev: corresponding k3 remote processor device - * - * Return: 0 if all goes good, else appropriate error message. - */ -static int k3_rproc_probe(struct udevice *dev) -{ - struct k3_rproc_privdata *priv; - int ret; - - dev_dbg(dev, "%s\n", __func__); - - priv = dev_get_priv(dev); - - ret = k3_rproc_of_to_priv(dev, priv); - 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 const struct udevice_id k3_rproc_ids[] = { - { .compatible = "ti,am654-rproc"}, - {} -}; - -U_BOOT_DRIVER(k3_rproc) = { - .name = "k3_rproc", - .of_match = k3_rproc_ids, - .id = UCLASS_REMOTEPROC, - .ops = &k3_rproc_ops, - .probe = k3_rproc_probe, - .priv_auto_alloc_size = sizeof(struct k3_rproc_privdata), -}; diff --git a/drivers/remoteproc/ti_k3_arm64_rproc.c b/drivers/remoteproc/ti_k3_arm64_rproc.c new file mode 100644 index 0000000000..9676a96f98 --- /dev/null +++ b/drivers/remoteproc/ti_k3_arm64_rproc.c @@ -0,0 +1,228 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Texas Instruments' K3 ARM64 Remoteproc driver + * + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * Lokesh Vutla + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "ti_sci_proc.h" + +#define INVALID_ID 0xffff + +#define GTC_CNTCR_REG 0x0 +#define GTC_CNTR_EN 0x3 + +/** + * struct k3_arm64_privdata - Structure representing Remote processor data. + * @rproc_pwrdmn: rproc power domain data + * @rproc_rst: rproc reset control data + * @sci: Pointer to TISCI handle + * @tsp: TISCI processor control helper structure + * @gtc_base: Timer base address. + */ +struct k3_arm64_privdata { + struct power_domain rproc_pwrdmn; + struct power_domain gtc_pwrdmn; + struct reset_ctl rproc_rst; + struct ti_sci_proc tsp; + void *gtc_base; +}; + +/** + * k3_arm64_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_arm64_load(struct udevice *dev, ulong addr, ulong size) +{ + struct k3_arm64_privdata *rproc = dev_get_priv(dev); + int ret; + + dev_dbg(dev, "%s addr = 0x%lx, size = 0x%lx\n", __func__, addr, size); + + /* request for the processor */ + ret = ti_sci_proc_request(&rproc->tsp); + if (ret) + return ret; + + return ti_sci_proc_set_config(&rproc->tsp, addr, 0, 0); +} + +/** + * k3_arm64_start() - Start the remote processor + * @dev: rproc device pointer + * + * Return: 0 if all went ok, else return appropriate error + */ +static int k3_arm64_start(struct udevice *dev) +{ + struct k3_arm64_privdata *rproc = dev_get_priv(dev); + int ret; + + dev_dbg(dev, "%s\n", __func__); + + ret = power_domain_on(&rproc->gtc_pwrdmn); + if (ret) { + dev_err(dev, "power_domain_on() failed: %d\n", ret); + return ret; + } + + /* Enable the timer before starting remote core */ + writel(GTC_CNTR_EN, rproc->gtc_base + GTC_CNTCR_REG); + + /* + * 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 = power_domain_on(&rproc->rproc_pwrdmn); + if (ret) { + dev_err(dev, "power_domain_on() failed: %d\n", ret); + return ret; + } + + return ti_sci_proc_release(&rproc->tsp); +} + +/** + * k3_arm64_init() - Initialize the remote processor + * @dev: rproc device pointer + * + * Return: 0 if all went ok, else return appropriate error + */ +static int k3_arm64_init(struct udevice *dev) +{ + dev_dbg(dev, "%s\n", __func__); + + /* Enable the module */ + dev_dbg(dev, "%s: rproc successfully initialized\n", __func__); + + return 0; +} + +static const struct dm_rproc_ops k3_arm64_ops = { + .init = k3_arm64_init, + .load = k3_arm64_load, + .start = k3_arm64_start, +}; + +static int ti_sci_proc_of_to_priv(struct udevice *dev, struct ti_sci_proc *tsp) +{ + 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); + } + + tsp->proc_id = dev_read_u32_default(dev, "ti,sci-proc-id", INVALID_ID); + if (tsp->proc_id == INVALID_ID) { + dev_err(dev, "proc id not populated\n"); + return -ENOENT; + } + tsp->host_id = dev_read_u32_default(dev, "ti,sci-host-id", INVALID_ID); + tsp->ops = &tsp->sci->ops.proc_ops; + + return 0; +} + +/** + * k3_of_to_priv() - generate private data from device tree + * @dev: corresponding k3 remote processor device + * @priv: pointer to driver specific private data + * + * Return: 0 if all goes good, else appropriate error message. + */ +static int k3_arm64_of_to_priv(struct udevice *dev, + struct k3_arm64_privdata *rproc) +{ + int ret; + + dev_dbg(dev, "%s\n", __func__); + + ret = power_domain_get_by_index(dev, &rproc->rproc_pwrdmn, 1); + if (ret) { + dev_err(dev, "power_domain_get() failed: %d\n", ret); + return ret; + } + + ret = power_domain_get_by_index(dev, &rproc->gtc_pwrdmn, 0); + if (ret) { + dev_err(dev, "power_domain_get() failed: %d\n", ret); + return ret; + } + + ret = reset_get_by_index(dev, 0, &rproc->rproc_rst); + if (ret) { + dev_err(dev, "reset_get() failed: %d\n", ret); + return ret; + } + + ret = ti_sci_proc_of_to_priv(dev, &rproc->tsp); + if (ret) + return ret; + + rproc->gtc_base = dev_read_addr_ptr(dev); + if (!rproc->gtc_base) { + dev_err(dev, "Get address failed\n"); + return -ENODEV; + } + + return 0; +} + +/** + * k3_arm64_probe() - Basic probe + * @dev: corresponding k3 remote processor device + * + * Return: 0 if all goes good, else appropriate error message. + */ +static int k3_arm64_probe(struct udevice *dev) +{ + struct k3_arm64_privdata *priv; + int ret; + + dev_dbg(dev, "%s\n", __func__); + + priv = dev_get_priv(dev); + + ret = k3_arm64_of_to_priv(dev, priv); + 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 const struct udevice_id k3_arm64_ids[] = { + { .compatible = "ti,am654-arm64"}, + { .compatible = "ti,am654-rproc"}, + {} +}; + +U_BOOT_DRIVER(k3_arm64) = { + .name = "k3_arm64", + .of_match = k3_arm64_ids, + .id = UCLASS_REMOTEPROC, + .ops = &k3_arm64_ops, + .probe = k3_arm64_probe, + .priv_auto_alloc_size = sizeof(struct k3_arm64_privdata), +};