On Fri, Feb 21, 2020 at 12:19:28PM +0200, Tero Kristo wrote:
> From: Suman Anna <s-anna@xxxxxx>
>
> 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 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.
>
> Signed-off-by: Suman Anna <s-anna@xxxxxx>
> [t-kristo@xxxxxx: moved address translation quirks to pdata]
> Signed-off-by: Tero Kristo <t-kristo@xxxxxx>
> ---
> drivers/remoteproc/Kconfig | 2 +-
> drivers/remoteproc/omap_remoteproc.c | 38 +++++++++++++++++++++++++++-
> 2 files changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig
> index de3862c15fcc..b52abc2268cc 100644
> --- a/drivers/remoteproc/Kconfig
> +++ b/drivers/remoteproc/Kconfig
> @@ -35,7 +35,7 @@ config MTK_SCP
>
> 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 872cd0df342b..8c3dc0edae95 100644
> --- a/drivers/remoteproc/omap_remoteproc.c
> +++ b/drivers/remoteproc/omap_remoteproc.c
> @@ -34,10 +34,13 @@
> * 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;
> };
>
> /**
> @@ -161,6 +164,8 @@ 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;
> + u32 value;
> + u32 mask;
>
> if (rproc->bootaddr & (SZ_1K - 1)) {
> dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n",
> @@ -168,7 +173,10 @@ static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc)
> return -EINVAL;
> }
>
> - regmap_write(bdata->syscon, offset, rproc->bootaddr);
> + value = rproc->bootaddr >> bdata->boot_reg_shift;
> + mask = ~(SZ_1K - 1) >> bdata->boot_reg_shift;
> +
> + regmap_update_bits(bdata->syscon, offset, mask, value);
Please handle the return value. We can either do it now or in 3 months when
someone with an automated tools sends a patch. Besides, omap_rproc_start() is
already expecting an error from omap_rproc_write_dsp_boot_addr() so it's even
easier.
With the above:
Acked-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
>
> return 0;
> }
> @@ -299,6 +307,13 @@ static const struct omap_rproc_mem_data ipu_mems[] = {
> { },
> };
>
> +static const struct omap_rproc_mem_data dra7_dsp_mems[] = {
> + { .name = "l2ram", .dev_addr = 0x800000 },
> + { .name = "l1pram", .dev_addr = 0xe00000 },
> + { .name = "l1dram", .dev_addr = 0xf00000 },
> + { },
> +};
> +
> static const struct omap_rproc_dev_data omap4_dsp_dev_data = {
> .device_name = "dsp",
> };
> @@ -317,6 +332,16 @@ static const struct omap_rproc_dev_data omap5_ipu_dev_data = {
> .mems = ipu_mems,
> };
>
> +static const struct omap_rproc_dev_data dra7_dsp_dev_data = {
> + .device_name = "dsp",
> + .mems = dra7_dsp_mems,
> +};
> +
> +static const struct omap_rproc_dev_data dra7_ipu_dev_data = {
> + .device_name = "ipu",
> + .mems = ipu_mems,
> +};
> +
> static const struct of_device_id omap_rproc_of_match[] = {
> {
> .compatible = "ti,omap4-dsp",
> @@ -334,6 +359,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_dsp_dev_data,
> + },
> + {
> + .compatible = "ti,dra7-ipu",
> + .data = &dra7_ipu_dev_data,
> + },
> {
> /* end */
> },
> @@ -386,6 +419,9 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev,
> return -EINVAL;
> }
>
> + of_property_read_u32_index(np, "ti,bootreg", 2,
> + &oproc->boot_data->boot_reg_shift);
> +
> return 0;
> }
>
> --
> 2.17.1
>
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
