| Message ID | 20191213125537.11509-8-t-kristo@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | remoteproc: updates for omap remoteproc support | expand |
On 18/12/2019 23:31, Mathieu Poirier wrote: > On Fri, Dec 13, 2019 at 02:55:29PM +0200, Tero Kristo wrote: >> From: Suman Anna <s-anna@ti.com> >> >> 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@ti.com> >> [t-kristo@ti.com: moved address translation quirks to pdata] >> Signed-off-by: Tero Kristo <t-kristo@ti.com> >> --- >> drivers/remoteproc/Kconfig | 2 +- >> drivers/remoteproc/omap_remoteproc.c | 44 +++++++++++++++++++++++++++- >> 2 files changed, 44 insertions(+), 2 deletions(-) >> >> 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 3ad74c4b4071..6cf7f0a9ba9a 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; >> }; >> >> /* >> @@ -78,12 +81,14 @@ struct omap_rproc { >> * struct omap_rproc_dev_data - device data for the omap remote processor >> * @device_name: device name of the remote processor >> * @has_bootreg: true if this remote processor has boot register >> + * @boot_reg_shift: bit shift for the boot register mask >> * @mem_names: memory names for this remote processor >> * @dev_addrs: device addresses corresponding to the memory names >> */ >> struct omap_rproc_dev_data { >> const char *device_name; >> bool has_bootreg; >> + int boot_reg_shift; >> const char * const *mem_names; >> const u32 *dev_addrs; >> }; >> @@ -153,6 +158,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", >> @@ -160,7 +167,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); >> >> return 0; >> } >> @@ -286,6 +296,14 @@ static const u32 ipu_dev_addrs[] = { >> 0x20000000, >> }; >> >> +static const char * const dra7_dsp_mem_names[] = { >> + "l2ram", "l1pram", "l1dram", NULL >> +}; >> + >> +static const u32 dra7_dsp_dev_addrs[] = { >> + 0x800000, 0xe00000, 0xf00000, >> +}; >> + >> static const struct omap_rproc_dev_data omap4_dsp_dev_data = { >> .device_name = "dsp", >> .has_bootreg = true, >> @@ -308,6 +326,20 @@ static const struct omap_rproc_dev_data omap5_ipu_dev_data = { >> .dev_addrs = ipu_dev_addrs, >> }; >> >> +static const struct omap_rproc_dev_data dra7_dsp_dev_data = { >> + .device_name = "dsp", >> + .has_bootreg = true, > > Shouldn't this be solely driven from the DT? If the "ti,bootreg" is specified > then we can count on omap_rproc::boot_data to provide the same functionality. > > >> + .boot_reg_shift = 10, > > I also think this should be driven from the DT. Otherwise some information is > from the DT and other is hard coded in the omap_rproc_dev_data. Hmm right I believe this is a fair point. Let me fix that for next rev. -Tero > >> + .mem_names = dra7_dsp_mem_names, >> + .dev_addrs = dra7_dsp_dev_addrs, >> +}; >> + >> +static const struct omap_rproc_dev_data dra7_ipu_dev_data = { >> + .device_name = "ipu", >> + .mem_names = ipu_mem_names, >> + .dev_addrs = ipu_dev_addrs, >> +}; >> + >> static const struct of_device_id omap_rproc_of_match[] = { >> { >> .compatible = "ti,omap4-dsp", >> @@ -325,6 +357,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 */ >> }, >> @@ -382,6 +422,8 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev, >> return -EINVAL; >> } >> >> + oproc->boot_data->boot_reg_shift = 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
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 3ad74c4b4071..6cf7f0a9ba9a 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; }; /* @@ -78,12 +81,14 @@ struct omap_rproc { * struct omap_rproc_dev_data - device data for the omap remote processor * @device_name: device name of the remote processor * @has_bootreg: true if this remote processor has boot register + * @boot_reg_shift: bit shift for the boot register mask * @mem_names: memory names for this remote processor * @dev_addrs: device addresses corresponding to the memory names */ struct omap_rproc_dev_data { const char *device_name; bool has_bootreg; + int boot_reg_shift; const char * const *mem_names; const u32 *dev_addrs; }; @@ -153,6 +158,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", @@ -160,7 +167,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); return 0; } @@ -286,6 +296,14 @@ static const u32 ipu_dev_addrs[] = { 0x20000000, }; +static const char * const dra7_dsp_mem_names[] = { + "l2ram", "l1pram", "l1dram", NULL +}; + +static const u32 dra7_dsp_dev_addrs[] = { + 0x800000, 0xe00000, 0xf00000, +}; + static const struct omap_rproc_dev_data omap4_dsp_dev_data = { .device_name = "dsp", .has_bootreg = true, @@ -308,6 +326,20 @@ static const struct omap_rproc_dev_data omap5_ipu_dev_data = { .dev_addrs = ipu_dev_addrs, }; +static const struct omap_rproc_dev_data dra7_dsp_dev_data = { + .device_name = "dsp", + .has_bootreg = true, + .boot_reg_shift = 10, + .mem_names = dra7_dsp_mem_names, + .dev_addrs = dra7_dsp_dev_addrs, +}; + +static const struct omap_rproc_dev_data dra7_ipu_dev_data = { + .device_name = "ipu", + .mem_names = ipu_mem_names, + .dev_addrs = ipu_dev_addrs, +}; + static const struct of_device_id omap_rproc_of_match[] = { { .compatible = "ti,omap4-dsp", @@ -325,6 +357,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 */ }, @@ -382,6 +422,8 @@ static int omap_rproc_get_boot_data(struct platform_device *pdev, return -EINVAL; } + oproc->boot_data->boot_reg_shift = data->boot_reg_shift; + return 0; }