2022-12-01 12:17:50

by Chen-Yu Tsai

Subject: Re: [PATCH v28 05/11] soc: mediatek: refine code to use mtk_mmsys_update_bits API

On Mon, Nov 7, 2022 at 3:23 PM Nancy.Lin <[email protected]> wrote:
>
> Simplify code for update mmsys reg.
>
> Signed-off-by: Nancy.Lin <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> Reviewed-by: CK Hu <[email protected]>
> Tested-by: AngeloGioacchino Del Regno <[email protected]>
> Tested-by: Bo-Chen Chen <[email protected]>
> Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
> ---
> drivers/soc/mediatek/mtk-mmsys.c | 45 ++++++++++++--------------------
> 1 file changed, 16 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index 9a327eb5d9d7..73c8bd27e6ae 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c

[...]

> @@ -124,27 +129,14 @@ void mtk_mmsys_ddp_disconnect(struct device *dev,
> {
> struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
> const struct mtk_mmsys_routes *routes = mmsys->data->routes;
> - u32 reg;
> int i;
>
> for (i = 0; i < mmsys->data->num_routes; i++)
> - if (cur == routes[i].from_comp && next == routes[i].to_comp) {
> - reg = readl_relaxed(mmsys->regs + routes[i].addr);
> - reg &= ~routes[i].mask;
> - writel_relaxed(reg, mmsys->regs + routes[i].addr);
> - }
> + if (cur == routes[i].from_comp && next == routes[i].to_comp)
> + mtk_mmsys_update_bits(mmsys, routes[i].addr, routes[i].mask, 0);
> }
> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect);
>
> -static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32 offset, u32 mask, u32 val)
> -{
> - u32 tmp;
> -
> - tmp = readl_relaxed(mmsys->regs + offset);
> - tmp = (tmp & ~mask) | val;
> - writel_relaxed(tmp, mmsys->regs + offset);
> -}
> -
> void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
> {
> if (val)

This hunk now doesn't apply due to

soc: mediatek: Add all settings to mtk_mmsys_ddp_dpi_fmt_config func

touching mtk_mmsys_ddp_dpi_fmt_config() as well. It's trivial to resolve
though.

ChenYu

2022-12-27 08:38:33

by Nancy Lin (林欣螢)

Subject: Re: [PATCH v28 05/11] soc: mediatek: refine code to use mtk_mmsys_update_bits API

Dear Chen-Yu,

Sorry for late response and thanks for the review.

On Thu, 2022-12-01 at 19:44 +0800, Chen-Yu Tsai wrote:
> On Mon, Nov 7, 2022 at 3:23 PM Nancy.Lin <[email protected]>
> wrote:
> >
> > Simplify code for update mmsys reg.
> >
> > Signed-off-by: Nancy.Lin <[email protected]>
> > Reviewed-by: AngeloGioacchino Del Regno <
> > [email protected]>
> > Reviewed-by: CK Hu <[email protected]>
> > Tested-by: AngeloGioacchino Del Regno <
> > [email protected]>
> > Tested-by: Bo-Chen Chen <[email protected]>
> > Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
> > ---
> > drivers/soc/mediatek/mtk-mmsys.c | 45 ++++++++++++--------------
> > ------
> > 1 file changed, 16 insertions(+), 29 deletions(-)
> >
> > diff --git a/drivers/soc/mediatek/mtk-mmsys.c
> > b/drivers/soc/mediatek/mtk-mmsys.c
> > index 9a327eb5d9d7..73c8bd27e6ae 100644
> > --- a/drivers/soc/mediatek/mtk-mmsys.c
> > +++ b/drivers/soc/mediatek/mtk-mmsys.c
>
> [...]
>
> > @@ -124,27 +129,14 @@ void mtk_mmsys_ddp_disconnect(struct device
> > *dev,
> > {
> > struct mtk_mmsys *mmsys = dev_get_drvdata(dev);
> > const struct mtk_mmsys_routes *routes = mmsys->data-
> > >routes;
> > - u32 reg;
> > int i;
> >
> > for (i = 0; i < mmsys->data->num_routes; i++)
> > - if (cur == routes[i].from_comp && next ==
> > routes[i].to_comp) {
> > - reg = readl_relaxed(mmsys->regs +
> > routes[i].addr);
> > - reg &= ~routes[i].mask;
> > - writel_relaxed(reg, mmsys->regs +
> > routes[i].addr);
> > - }
> > + if (cur == routes[i].from_comp && next ==
> > routes[i].to_comp)
> > + mtk_mmsys_update_bits(mmsys,
> > routes[i].addr, routes[i].mask, 0);
> > }
> > EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect);
> >
> > -static void mtk_mmsys_update_bits(struct mtk_mmsys *mmsys, u32
> > offset, u32 mask, u32 val)
> > -{
> > - u32 tmp;
> > -
> > - tmp = readl_relaxed(mmsys->regs + offset);
> > - tmp = (tmp & ~mask) | val;
> > - writel_relaxed(tmp, mmsys->regs + offset);
> > -}
> > -
> > void mtk_mmsys_ddp_dpi_fmt_config(struct device *dev, u32 val)
> > {
> > if (val)
>
> This hunk now doesn't apply due to
>
> soc: mediatek: Add all settings to mtk_mmsys_ddp_dpi_fmt_config
> func
>
> touching mtk_mmsys_ddp_dpi_fmt_config() as well. It's trivial to
> resolve
> though.
>
> ChenYu

I will update next revision base on next-20221226 which include the
patch you mentioned.

Regards,
Nancy