On Fri, 2023-02-10 at 15:02 +0100, AngeloGioacchino Del Regno wrote:
> Il 10/02/23 09:59, Tinghan Shen ha scritto:
> > This is the preparation for probing multi-core SCP. The remoteproc
> > initialization flow is similar on cores and is reuesd to avoid
> > redundant code.
> >
> > The registers of config and l1tcm are shared for multi-core
> > SCP. Reuse the mapped addresses for all cores.
> >
> > Signed-off-by: Tinghan Shen <tinghan.shen@xxxxxxxxxxxx>
> > ---
> > drivers/remoteproc/mtk_common.h | 7 +++++
> > drivers/remoteproc/mtk_scp.c | 55 +++++++++++++++++++++------------
> > 2 files changed, 42 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/remoteproc/mtk_common.h b/drivers/remoteproc/mtk_common.h
> > index 3778894c96f3..20c1a90be77d 100644
> > --- a/drivers/remoteproc/mtk_common.h
> > +++ b/drivers/remoteproc/mtk_common.h
> > @@ -112,6 +112,13 @@ struct mtk_scp_of_data {
> > size_t ipi_buf_offset;
> > };
> >
> > +struct mtk_scp_of_regs {
>
> In v4, I already commented on this one, saying that this structure is used
> only in mtk_scp.c as a commodity and *only* as a commodity for passing data
> between two functions, and I already asked to move this structure definition
> to mtk_scp.c.
I'm sorry. I missed this part.
I'll update this in next version.
>
> Thanks,
> Angelo
>
> > + void __iomem *reg_base;
> > + void __iomem *l1tcm_base;
> > + size_t l1tcm_size;
> > + phys_addr_t l1tcm_phys;
> > +};
> > +
> > struct mtk_scp {
> > struct device *dev;
> > struct rproc *rproc;
> > diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> > index b92274067522..898039879142 100644
> > --- a/drivers/remoteproc/mtk_scp.c
> > +++ b/drivers/remoteproc/mtk_scp.c
> > @@ -854,7 +854,8 @@ static void scp_remove_rpmsg_subdev(struct mtk_scp *scp)
> > }
> > }
> >
> > -static int scp_probe(struct platform_device *pdev)
> > +static int scp_rproc_init(struct platform_device *pdev,
> > + struct mtk_scp_of_regs *of_regs)
> > {
> > struct device *dev = &pdev->dev;
> > struct device_node *np = dev->of_node;
> > @@ -878,6 +879,11 @@ static int scp_probe(struct platform_device *pdev)
> > scp->data = of_device_get_match_data(dev);
> > platform_set_drvdata(pdev, scp);
> >
> > + scp->reg_base = of_regs->reg_base;
> > + scp->l1tcm_base = of_regs->l1tcm_base;
> > + scp->l1tcm_size = of_regs->l1tcm_size;
> > + scp->l1tcm_phys = of_regs->l1tcm_phys;
> > +
> > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sram");
> > scp->sram_base = devm_ioremap_resource(dev, res);
> > if (IS_ERR(scp->sram_base))
> > @@ -887,24 +893,6 @@ static int scp_probe(struct platform_device *pdev)
> > scp->sram_size = resource_size(res);
> > scp->sram_phys = res->start;
> >
> > - /* l1tcm is an optional memory region */
> > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm");
> > - scp->l1tcm_base = devm_ioremap_resource(dev, res);
> > - if (IS_ERR(scp->l1tcm_base)) {
> > - ret = PTR_ERR(scp->l1tcm_base);
> > - if (ret != -EINVAL) {
> > - return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n");
> > - }
> > - } else {
> > - scp->l1tcm_size = resource_size(res);
> > - scp->l1tcm_phys = res->start;
> > - }
> > -
> > - scp->reg_base = devm_platform_ioremap_resource_byname(pdev, "cfg");
> > - if (IS_ERR(scp->reg_base))
> > - return dev_err_probe(dev, PTR_ERR(scp->reg_base),
> > - "Failed to parse and map cfg memory\n");
> > -
> > ret = scp->data->scp_clk_get(scp);
> > if (ret)
> > return ret;
> > @@ -932,7 +920,6 @@ static int scp_probe(struct platform_device *pdev)
> > ret = devm_request_threaded_irq(dev, platform_get_irq(pdev, 0), NULL,
> > scp_irq_handler, IRQF_ONESHOT,
> > pdev->name, scp);
> > -
> > if (ret) {
> > dev_err(dev, "failed to request irq\n");
> > goto remove_subdev;
> > @@ -956,6 +943,34 @@ static int scp_probe(struct platform_device *pdev)
> > return ret;
> > }
> >
> > +static int scp_probe(struct platform_device *pdev)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct resource *res;
> > + struct mtk_scp_of_regs scp_regs;
> > + int ret;
> > +
> > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cfg");
> > + scp_regs.reg_base = devm_ioremap_resource(dev, res);
> > + if (IS_ERR(scp_regs.reg_base))
> > + return dev_err_probe(dev, PTR_ERR(scp_regs.reg_base),
> > + "Failed to parse and map cfg memory\n");
> > +
> > + /* l1tcm is an optional memory region */
> > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "l1tcm");
> > + scp_regs.l1tcm_base = devm_ioremap_resource(dev, res);
> > + if (IS_ERR(scp_regs.l1tcm_base)) {
> > + ret = PTR_ERR(scp_regs.l1tcm_base);
> > + if (ret != -EINVAL)
> > + return dev_err_probe(dev, ret, "Failed to map l1tcm memory\n");
> > + } else {
> > + scp_regs.l1tcm_size = resource_size(res);
> > + scp_regs.l1tcm_phys = res->start;
> > + }
> > +
> > + return scp_rproc_init(pdev, &scp_regs);
> > +}
> > +
> > static int scp_remove(struct platform_device *pdev)
> > {
> > struct mtk_scp *scp = platform_get_drvdata(pdev);
>
>
--
Best regards,
TingHan
