| Message ID | 20200417170040.174319-4-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6,1/5] dt-bindings: Document JZ47xx VPU auxiliary processor | expand |
On Fri 17 Apr 10:00 PDT 2020, Paul Cercueil wrote: > This driver is used to boot, communicate with and load firmwares to the > MIPS co-processor found in the VPU hardware of the JZ47xx SoCs from > Ingenic. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Signed-off-by: kbuild test robot <lkp@intel.com> > Signed-off-by: Julia Lawall <julia.lawall@lip6.fr> Please read Documentation/process/submitting-patches.rst about "Developer's Certificate of Origin". I suspect that you incorporated review feedback on previous revisions from kbuild and Julia, this is generally omitted from the actual commit message. > Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> > --- > > Notes: > v2: Remove exception for always-mapped memories > v3: - Use clk_bulk API > - Move device-managed code to its own patch [3/4] > - Move devicetree table right above ingenic_rproc_driver > - Removed #ifdef CONFIG_OF around devicetree table > - Removed .owner = THIS_MODULE in ingenic_rproc_driver > - Removed useless platform_set_drvdata() > v4: - Add fix reported by Julia > - Change Kconfig symbol to INGENIC_VPU_RPROC > - Add documentation to struct vpu > - disable_irq_nosync() -> disable_irq() > v5: No change > v6: Instead of prepare/unprepare callbacks, use PM runtime callbacks > > drivers/remoteproc/Kconfig | 8 + > drivers/remoteproc/Makefile | 1 + > drivers/remoteproc/ingenic_rproc.c | 282 +++++++++++++++++++++++++++++ > 3 files changed, 291 insertions(+) > create mode 100644 drivers/remoteproc/ingenic_rproc.c > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index fbaed079b299..31da3e6c6281 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -240,6 +240,14 @@ config STM32_RPROC > > This can be either built-in or a loadable module. > > +config INGENIC_VPU_RPROC Please try to keep things alphabetically ordered. > + tristate "Ingenic JZ47xx VPU remoteproc support" > + depends on MIPS || COMPILE_TEST > + help > + Say y or m here to support the VPU in the JZ47xx SoCs from Ingenic. > + This can be either built-in or a loadable module. > + If unsure say N. > + > endif # REMOTEPROC > > endmenu [..] > diff --git a/drivers/remoteproc/ingenic_rproc.c b/drivers/remoteproc/ingenic_rproc.c [..] > +/** > + * struct vpu - Ingenic VPU remoteproc private structure > + * @irq: interrupt number > + * @clks: pointers to the VPU and AUX clocks aux_base is missing > + * @mem_info: array of struct vpu_mem_info, which contain the mapping info of > + * each of the external memories > + * @dev: private pointer to the device > + */ > +struct vpu { > + int irq; > + struct clk_bulk_data clks[2]; > + void __iomem *aux_base; > + struct vpu_mem_info mem_info[ARRAY_SIZE(vpu_mem_map)]; > + struct device *dev; > +}; [..] > +static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len) > +{ > + struct vpu *vpu = rproc->priv; > + void __iomem *va = NULL; > + unsigned int i; > + > + if (len <= 0) len can't be negative (also, does it add value to check for and fail len == 0?) > + return NULL; > + > + for (i = 0; i < ARRAY_SIZE(vpu_mem_map); i++) { > + const struct vpu_mem_info *info = &vpu->mem_info[i]; > + const struct vpu_mem_map *map = info->map; > + > + if (da >= map->da && (da + len) < (map->da + info->len)) { > + va = info->base + (da - map->da); > + break; > + } > + } > + > + return (__force void *)va; > +} [..] > +static struct platform_driver ingenic_rproc_driver = { > + .probe = ingenic_rproc_probe, > + .driver = { > + .name = "ingenic-vpu", > +#ifdef CONFIG_PM Please omit the #ifdef here. > + .pm = &ingenic_rproc_pm, > +#endif > + .of_match_table = of_match_ptr(ingenic_rproc_of_matches), Please omit the of_match_ptr() Regards, Bjorn > + }, > +}; > +module_platform_driver(ingenic_rproc_driver); > + > +MODULE_LICENSE("GPL"); > +MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); > +MODULE_DESCRIPTION("Ingenic JZ47xx Remote Processor control driver"); > -- > 2.25.1 >
Hi Bjorn, Le dim. 19 avril 2020 à 23:37, Bjorn Andersson <bjorn.andersson@linaro.org> a écrit : > On Fri 17 Apr 10:00 PDT 2020, Paul Cercueil wrote: > >> This driver is used to boot, communicate with and load firmwares to >> the >> MIPS co-processor found in the VPU hardware of the JZ47xx SoCs from >> Ingenic. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> Signed-off-by: kbuild test robot <lkp@intel.com> >> Signed-off-by: Julia Lawall <julia.lawall@lip6.fr> > > Please read Documentation/process/submitting-patches.rst about > "Developer's Certificate of Origin". > > I suspect that you incorporated review feedback on previous revisions > from kbuild and Julia, this is generally omitted from the actual > commit > message. Julia / kbuild sent a patch to fix an error in the driver, so my patch now has code from Julia / kbuild. That document clearly says that I should add their signed-off-by. Or what do you mean? >> Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> >> --- >> >> Notes: >> v2: Remove exception for always-mapped memories >> v3: - Use clk_bulk API >> - Move device-managed code to its own patch [3/4] >> - Move devicetree table right above ingenic_rproc_driver >> - Removed #ifdef CONFIG_OF around devicetree table >> - Removed .owner = THIS_MODULE in ingenic_rproc_driver >> - Removed useless platform_set_drvdata() >> v4: - Add fix reported by Julia >> - Change Kconfig symbol to INGENIC_VPU_RPROC >> - Add documentation to struct vpu >> - disable_irq_nosync() -> disable_irq() >> v5: No change >> v6: Instead of prepare/unprepare callbacks, use PM runtime >> callbacks >> >> drivers/remoteproc/Kconfig | 8 + >> drivers/remoteproc/Makefile | 1 + >> drivers/remoteproc/ingenic_rproc.c | 282 >> +++++++++++++++++++++++++++++ >> 3 files changed, 291 insertions(+) >> create mode 100644 drivers/remoteproc/ingenic_rproc.c >> >> diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig >> index fbaed079b299..31da3e6c6281 100644 >> --- a/drivers/remoteproc/Kconfig >> +++ b/drivers/remoteproc/Kconfig >> @@ -240,6 +240,14 @@ config STM32_RPROC >> >> This can be either built-in or a loadable module. >> >> +config INGENIC_VPU_RPROC > > Please try to keep things alphabetically ordered. > >> + tristate "Ingenic JZ47xx VPU remoteproc support" >> + depends on MIPS || COMPILE_TEST >> + help >> + Say y or m here to support the VPU in the JZ47xx SoCs from >> Ingenic. >> + This can be either built-in or a loadable module. >> + If unsure say N. >> + >> endif # REMOTEPROC >> >> endmenu > [..] >> diff --git a/drivers/remoteproc/ingenic_rproc.c >> b/drivers/remoteproc/ingenic_rproc.c > [..] >> +/** >> + * struct vpu - Ingenic VPU remoteproc private structure >> + * @irq: interrupt number >> + * @clks: pointers to the VPU and AUX clocks > > aux_base is missing > >> + * @mem_info: array of struct vpu_mem_info, which contain the >> mapping info of >> + * each of the external memories >> + * @dev: private pointer to the device >> + */ >> +struct vpu { >> + int irq; >> + struct clk_bulk_data clks[2]; >> + void __iomem *aux_base; >> + struct vpu_mem_info mem_info[ARRAY_SIZE(vpu_mem_map)]; >> + struct device *dev; >> +}; > [..] >> +static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, >> size_t len) >> +{ >> + struct vpu *vpu = rproc->priv; >> + void __iomem *va = NULL; >> + unsigned int i; >> + >> + if (len <= 0) > > len can't be negative (also, does it add value to check for and fail > len > == 0?) > >> + return NULL; >> + >> + for (i = 0; i < ARRAY_SIZE(vpu_mem_map); i++) { >> + const struct vpu_mem_info *info = &vpu->mem_info[i]; >> + const struct vpu_mem_map *map = info->map; >> + >> + if (da >= map->da && (da + len) < (map->da + info->len)) { >> + va = info->base + (da - map->da); >> + break; >> + } >> + } >> + >> + return (__force void *)va; >> +} > [..] >> +static struct platform_driver ingenic_rproc_driver = { >> + .probe = ingenic_rproc_probe, >> + .driver = { >> + .name = "ingenic-vpu", >> +#ifdef CONFIG_PM > > Please omit the #ifdef here. If I do, then the PM callbacks will be compiled in even if CONFIG_PM is disabled. That means dead code and I see no reason why you would want that. If you don't mind, I'd like to keep the #ifdef CONFIG_PM for now, until this patchset is merged: https://lkml.org/lkml/2020/4/13/582 Then it would become a one-liner: .pm = pm_ptr(&ingenic_rproc_pm), Cheers, -Paul >> + .pm = &ingenic_rproc_pm, >> +#endif >> + .of_match_table = of_match_ptr(ingenic_rproc_of_matches), > > Please omit the of_match_ptr() > > Regards, > Bjorn > >> + }, >> +}; >> +module_platform_driver(ingenic_rproc_driver); >> + >> +MODULE_LICENSE("GPL"); >> +MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); >> +MODULE_DESCRIPTION("Ingenic JZ47xx Remote Processor control >> driver"); >> -- >> 2.25.1 >>
On Tue 21 Apr 08:43 PDT 2020, Paul Cercueil wrote: > Hi Bjorn, > > Le dim. 19 avril 2020 à 23:37, Bjorn Andersson <bjorn.andersson@linaro.org> > a écrit : > > On Fri 17 Apr 10:00 PDT 2020, Paul Cercueil wrote: > > > > > This driver is used to boot, communicate with and load firmwares to > > > the > > > MIPS co-processor found in the VPU hardware of the JZ47xx SoCs from > > > Ingenic. > > > > > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > > > Signed-off-by: kbuild test robot <lkp@intel.com> > > > Signed-off-by: Julia Lawall <julia.lawall@lip6.fr> > > > > Please read Documentation/process/submitting-patches.rst about > > "Developer's Certificate of Origin". > > > > I suspect that you incorporated review feedback on previous revisions > > from kbuild and Julia, this is generally omitted from the actual commit > > message. > > Julia / kbuild sent a patch to fix an error in the driver, so my patch now > has code from Julia / kbuild. That document clearly says that I should add > their signed-off-by. Or what do you mean? > We generally don't attribute people whom through code review affected the outcome, unless perhaps it's significant. But a bigger problem is that per "Developer's Certificate of Origin 1.1" in submitting-patches.rst, what this says is: 1) You wrote the patch, in whole or in part and have the right to submit it to the public kernel. I.e. (a) and (d) 2) Then "kbuild test robot" claims that either it based it's contribution on your work, or that it forwards the unmodified work ((b) or (c)) and (d). 3) Then Julia again took the contribution from "kbuild test robot" and is claiming to follow either (b) or (c) - and (d). Then somehow, after Julia stated that she dealt with the patch you emailed it to me. In order to claim that the three of you developed the patch together you should add all three as "Co-developed-by:", in addition to the signed off by. But again, my recommendation is that you consider their input as "review feedback" and just incorporate it in the patch without any additional tags. You're still fulfilling the certificate of origin. Regards, Bjorn > > > Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> > > > --- > > > > > > Notes: > > > v2: Remove exception for always-mapped memories > > > v3: - Use clk_bulk API > > > - Move device-managed code to its own patch [3/4] > > > - Move devicetree table right above ingenic_rproc_driver > > > - Removed #ifdef CONFIG_OF around devicetree table > > > - Removed .owner = THIS_MODULE in ingenic_rproc_driver > > > - Removed useless platform_set_drvdata() > > > v4: - Add fix reported by Julia > > > - Change Kconfig symbol to INGENIC_VPU_RPROC > > > - Add documentation to struct vpu > > > - disable_irq_nosync() -> disable_irq() > > > v5: No change > > > v6: Instead of prepare/unprepare callbacks, use PM runtime > > > callbacks > > > > > > drivers/remoteproc/Kconfig | 8 + > > > drivers/remoteproc/Makefile | 1 + > > > drivers/remoteproc/ingenic_rproc.c | 282 > > > +++++++++++++++++++++++++++++ > > > 3 files changed, 291 insertions(+) > > > create mode 100644 drivers/remoteproc/ingenic_rproc.c > > > > > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > > > index fbaed079b299..31da3e6c6281 100644 > > > --- a/drivers/remoteproc/Kconfig > > > +++ b/drivers/remoteproc/Kconfig > > > @@ -240,6 +240,14 @@ config STM32_RPROC > > > > > > This can be either built-in or a loadable module. > > > > > > +config INGENIC_VPU_RPROC > > > > Please try to keep things alphabetically ordered. > > > > > + tristate "Ingenic JZ47xx VPU remoteproc support" > > > + depends on MIPS || COMPILE_TEST > > > + help > > > + Say y or m here to support the VPU in the JZ47xx SoCs from > > > Ingenic. > > > + This can be either built-in or a loadable module. > > > + If unsure say N. > > > + > > > endif # REMOTEPROC > > > > > > endmenu > > [..] > > > diff --git a/drivers/remoteproc/ingenic_rproc.c > > > b/drivers/remoteproc/ingenic_rproc.c > > [..] > > > +/** > > > + * struct vpu - Ingenic VPU remoteproc private structure > > > + * @irq: interrupt number > > > + * @clks: pointers to the VPU and AUX clocks > > > > aux_base is missing > > > > > + * @mem_info: array of struct vpu_mem_info, which contain the > > > mapping info of > > > + * each of the external memories > > > + * @dev: private pointer to the device > > > + */ > > > +struct vpu { > > > + int irq; > > > + struct clk_bulk_data clks[2]; > > > + void __iomem *aux_base; > > > + struct vpu_mem_info mem_info[ARRAY_SIZE(vpu_mem_map)]; > > > + struct device *dev; > > > +}; > > [..] > > > +static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, > > > size_t len) > > > +{ > > > + struct vpu *vpu = rproc->priv; > > > + void __iomem *va = NULL; > > > + unsigned int i; > > > + > > > + if (len <= 0) > > > > len can't be negative (also, does it add value to check for and fail len > > == 0?) > > > > > + return NULL; > > > + > > > + for (i = 0; i < ARRAY_SIZE(vpu_mem_map); i++) { > > > + const struct vpu_mem_info *info = &vpu->mem_info[i]; > > > + const struct vpu_mem_map *map = info->map; > > > + > > > + if (da >= map->da && (da + len) < (map->da + info->len)) { > > > + va = info->base + (da - map->da); > > > + break; > > > + } > > > + } > > > + > > > + return (__force void *)va; > > > +} > > [..] > > > +static struct platform_driver ingenic_rproc_driver = { > > > + .probe = ingenic_rproc_probe, > > > + .driver = { > > > + .name = "ingenic-vpu", > > > +#ifdef CONFIG_PM > > > > Please omit the #ifdef here. > > If I do, then the PM callbacks will be compiled in even if CONFIG_PM is > disabled. That means dead code and I see no reason why you would want that. > > If you don't mind, I'd like to keep the #ifdef CONFIG_PM for now, until this > patchset is merged: https://lkml.org/lkml/2020/4/13/582 > > Then it would become a one-liner: > .pm = pm_ptr(&ingenic_rproc_pm), > > Cheers, > -Paul > > > > + .pm = &ingenic_rproc_pm, > > > +#endif > > > + .of_match_table = of_match_ptr(ingenic_rproc_of_matches), > > > > Please omit the of_match_ptr() > > > > Regards, > > Bjorn > > > > > + }, > > > +}; > > > +module_platform_driver(ingenic_rproc_driver); > > > + > > > +MODULE_LICENSE("GPL"); > > > +MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); > > > +MODULE_DESCRIPTION("Ingenic JZ47xx Remote Processor control > > > driver"); > > > -- > > > 2.25.1 > > > > >
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index fbaed079b299..31da3e6c6281 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -240,6 +240,14 @@ config STM32_RPROC This can be either built-in or a loadable module. +config INGENIC_VPU_RPROC + tristate "Ingenic JZ47xx VPU remoteproc support" + depends on MIPS || COMPILE_TEST + help + Say y or m here to support the VPU in the JZ47xx SoCs from Ingenic. + This can be either built-in or a loadable module. + If unsure say N. + endif # REMOTEPROC endmenu diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 0effd3825035..e8b886e511f0 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -10,6 +10,7 @@ remoteproc-y += remoteproc_sysfs.o remoteproc-y += remoteproc_virtio.o remoteproc-y += remoteproc_elf_loader.o obj-$(CONFIG_IMX_REMOTEPROC) += imx_rproc.o +obj-$(CONFIG_INGENIC_VPU_RPROC) += ingenic_rproc.o obj-$(CONFIG_MTK_SCP) += mtk_scp.o mtk_scp_ipi.o obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o diff --git a/drivers/remoteproc/ingenic_rproc.c b/drivers/remoteproc/ingenic_rproc.c new file mode 100644 index 000000000000..bb14fe1c11f8 --- /dev/null +++ b/drivers/remoteproc/ingenic_rproc.c @@ -0,0 +1,282 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Ingenic JZ47xx remoteproc driver + * Copyright 2019, Paul Cercueil <paul@crapouillou.net> + */ + +#include <linux/bitops.h> +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/remoteproc.h> + +#include "remoteproc_internal.h" + +#define REG_AUX_CTRL 0x0 +#define REG_AUX_MSG_ACK 0x10 +#define REG_AUX_MSG 0x14 +#define REG_CORE_MSG_ACK 0x18 +#define REG_CORE_MSG 0x1C + +#define AUX_CTRL_SLEEP BIT(31) +#define AUX_CTRL_MSG_IRQ_EN BIT(3) +#define AUX_CTRL_NMI_RESETS BIT(2) +#define AUX_CTRL_NMI BIT(1) +#define AUX_CTRL_SW_RESET BIT(0) + +struct vpu_mem_map { + const char *name; + unsigned int da; +}; + +struct vpu_mem_info { + const struct vpu_mem_map *map; + unsigned long len; + void __iomem *base; +}; + +static const struct vpu_mem_map vpu_mem_map[] = { + { "tcsm0", 0x132b0000 }, + { "tcsm1", 0xf4000000 }, + { "sram", 0x132f0000 }, +}; + +/** + * struct vpu - Ingenic VPU remoteproc private structure + * @irq: interrupt number + * @clks: pointers to the VPU and AUX clocks + * @mem_info: array of struct vpu_mem_info, which contain the mapping info of + * each of the external memories + * @dev: private pointer to the device + */ +struct vpu { + int irq; + struct clk_bulk_data clks[2]; + void __iomem *aux_base; + struct vpu_mem_info mem_info[ARRAY_SIZE(vpu_mem_map)]; + struct device *dev; +}; + +static int ingenic_rproc_start(struct rproc *rproc) +{ + struct vpu *vpu = rproc->priv; + u32 ctrl; + + enable_irq(vpu->irq); + + /* Reset the AUX and enable message IRQ */ + ctrl = AUX_CTRL_NMI_RESETS | AUX_CTRL_NMI | AUX_CTRL_MSG_IRQ_EN; + writel(ctrl, vpu->aux_base + REG_AUX_CTRL); + + return 0; +} + +static int ingenic_rproc_stop(struct rproc *rproc) +{ + struct vpu *vpu = rproc->priv; + + disable_irq(vpu->irq); + + /* Keep AUX in reset mode */ + writel(AUX_CTRL_SW_RESET, vpu->aux_base + REG_AUX_CTRL); + + return 0; +} + +static void ingenic_rproc_kick(struct rproc *rproc, int vqid) +{ + struct vpu *vpu = rproc->priv; + + writel(vqid, vpu->aux_base + REG_CORE_MSG); +} + +static void *ingenic_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len) +{ + struct vpu *vpu = rproc->priv; + void __iomem *va = NULL; + unsigned int i; + + if (len <= 0) + return NULL; + + for (i = 0; i < ARRAY_SIZE(vpu_mem_map); i++) { + const struct vpu_mem_info *info = &vpu->mem_info[i]; + const struct vpu_mem_map *map = info->map; + + if (da >= map->da && (da + len) < (map->da + info->len)) { + va = info->base + (da - map->da); + break; + } + } + + return (__force void *)va; +} + +static struct rproc_ops ingenic_rproc_ops = { + .start = ingenic_rproc_start, + .stop = ingenic_rproc_stop, + .kick = ingenic_rproc_kick, + .da_to_va = ingenic_rproc_da_to_va, +}; + +static irqreturn_t vpu_interrupt(int irq, void *data) +{ + struct rproc *rproc = data; + struct vpu *vpu = rproc->priv; + u32 vring; + + vring = readl(vpu->aux_base + REG_AUX_MSG); + + /* Ack the interrupt */ + writel(0, vpu->aux_base + REG_AUX_MSG_ACK); + + return rproc_vq_interrupt(rproc, vring); +} + +static void ingenic_rproc_disable_clks(void *data) +{ + struct vpu *vpu = data; + + pm_runtime_resume(vpu->dev); + pm_runtime_disable(vpu->dev); + + clk_bulk_disable_unprepare(ARRAY_SIZE(vpu->clks), vpu->clks); +} + +static int ingenic_rproc_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct resource *mem; + struct rproc *rproc; + struct vpu *vpu; + unsigned int i; + int ret; + + rproc = devm_rproc_alloc(dev, "ingenic-vpu", + &ingenic_rproc_ops, NULL, sizeof(*vpu)); + if (!rproc) + return -ENOMEM; + + vpu = rproc->priv; + vpu->dev = &pdev->dev; + platform_set_drvdata(pdev, vpu); + + mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aux"); + vpu->aux_base = devm_ioremap_resource(dev, mem); + if (IS_ERR(vpu->aux_base)) { + dev_err(dev, "Failed to ioremap"); + return PTR_ERR(vpu->aux_base); + } + + for (i = 0; i < ARRAY_SIZE(vpu_mem_map); i++) { + mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, + vpu_mem_map[i].name); + + vpu->mem_info[i].base = devm_ioremap_resource(dev, mem); + if (IS_ERR(vpu->mem_info[i].base)) { + ret = PTR_ERR(vpu->mem_info[i].base); + dev_err(dev, "Failed to ioremap"); + return ret; + } + + vpu->mem_info[i].len = resource_size(mem); + vpu->mem_info[i].map = &vpu_mem_map[i]; + } + + vpu->clks[0].id = "vpu"; + vpu->clks[1].id = "aux"; + + ret = devm_clk_bulk_get(dev, ARRAY_SIZE(vpu->clks), vpu->clks); + if (ret) { + dev_err(dev, "Failed to get clocks"); + return ret; + } + + vpu->irq = platform_get_irq(pdev, 0); + if (vpu->irq < 0) + return vpu->irq; + + ret = devm_request_irq(dev, vpu->irq, vpu_interrupt, 0, "VPU", rproc); + if (ret < 0) { + dev_err(dev, "Failed to request IRQ"); + return ret; + } + + disable_irq(vpu->irq); + + /* The clocks must be enabled for the firmware to be loaded in TCSM */ + ret = clk_bulk_prepare_enable(ARRAY_SIZE(vpu->clks), vpu->clks); + if (ret) { + dev_err(dev, "Unable to start clocks"); + return ret; + } + + pm_runtime_irq_safe(dev); + pm_runtime_set_active(dev); + pm_runtime_enable(dev); + pm_runtime_get_sync(dev); + pm_runtime_use_autosuspend(dev); + + ret = devm_add_action_or_reset(dev, ingenic_rproc_disable_clks, vpu); + if (ret) { + dev_err(dev, "Unable to register action"); + goto out_pm_put; + } + + ret = devm_rproc_add(dev, rproc); + if (ret) { + dev_err(dev, "Failed to register remote processor"); + goto out_pm_put; + } + +out_pm_put: + pm_runtime_put_autosuspend(dev); + + return ret; +} + +static const struct of_device_id ingenic_rproc_of_matches[] = { + { .compatible = "ingenic,jz4770-vpu-rproc", }, + {} +}; +MODULE_DEVICE_TABLE(of, ingenic_rproc_of_matches); + +static int __maybe_unused ingenic_rproc_suspend(struct device *dev) +{ + struct vpu *vpu = dev_get_drvdata(dev); + + clk_bulk_disable(ARRAY_SIZE(vpu->clks), vpu->clks); + + return 0; +} + +static int __maybe_unused ingenic_rproc_resume(struct device *dev) +{ + struct vpu *vpu = dev_get_drvdata(dev); + + return clk_bulk_enable(ARRAY_SIZE(vpu->clks), vpu->clks); +} + +static const struct dev_pm_ops __maybe_unused ingenic_rproc_pm = { + SET_RUNTIME_PM_OPS(ingenic_rproc_suspend, ingenic_rproc_resume, NULL) +}; + +static struct platform_driver ingenic_rproc_driver = { + .probe = ingenic_rproc_probe, + .driver = { + .name = "ingenic-vpu", +#ifdef CONFIG_PM + .pm = &ingenic_rproc_pm, +#endif + .of_match_table = of_match_ptr(ingenic_rproc_of_matches), + }, +}; +module_platform_driver(ingenic_rproc_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>"); +MODULE_DESCRIPTION("Ingenic JZ47xx Remote Processor control driver");