From: Enric Balletbo Serra <eballetbo@gmail.com>
To: "Nancy.Lin" <nancy.lin@mediatek.com>
Cc: CK Hu <ck.hu@mediatek.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
srv_heupstream <srv_heupstream@mediatek.com>,
devicetree <devicetree@vger.kernel.org>,
David Airlie <airlied@linux.ie>,
"jason-jh . lin" <jason-jh.lin@mediatek.com>,
singo.chang@mediatek.com,
linux-kernel <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Yongqiang Niu <yongqiang.niu@mediatek.com>,
Rob Herring <robh+dt@kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Linux ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 09/14] soc: mediatek: mmsys: Add reset controller support for MT8195 vdosys1
Date: Fri, 23 Jul 2021 12:57:31 +0200 [thread overview]
Message-ID: <CAFqH_53bnNvjGjZ2S8oyAx2t0if-YpQyZcb9sRapG2q21X4fGw@mail.gmail.com> (raw)
In-Reply-To: <20210722094551.15255-10-nancy.lin@mediatek.com>
Hi Nancy,
Thank you for your patch.
Missatge de Nancy.Lin <nancy.lin@mediatek.com> del dia dj., 22 de jul.
2021 a les 11:46:
>
> Among other features the mmsys driver should implement a reset
> controller to be able to reset different bits from their space.
>
I'm working on a series that does the same, it should be nice if we
can coordinate [1]
[1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=515355
> Signed-off-by: Nancy.Lin <nancy.lin@mediatek.com>
> ---
> drivers/soc/mediatek/mt8195-mmsys.h | 1 +
> drivers/soc/mediatek/mtk-mmsys.c | 77 +++++++++++++++++++++++++++++
> drivers/soc/mediatek/mtk-mmsys.h | 1 +
> 3 files changed, 79 insertions(+)
>
> diff --git a/drivers/soc/mediatek/mt8195-mmsys.h b/drivers/soc/mediatek/mt8195-mmsys.h
> index 4bdb2087250c..a7f6e275bfe5 100644
> --- a/drivers/soc/mediatek/mt8195-mmsys.h
> +++ b/drivers/soc/mediatek/mt8195-mmsys.h
> @@ -154,6 +154,7 @@
> #define DISP_DP_INTF0_SEL_IN_FROM_VDO0_MERGE_DL_ASYNC_MOUT (1 << 0)
> #define DISP_DP_INTF0_SEL_IN_FROM_VDO0_DSC_DL_ASYNC_MOUT (2 << 0)
>
> +#define MT8195_VDO1_SW0_RST_B 0x1d0
> #define MT8195_VDO1_MERGE0_ASYNC_CFG_WD 0xe30
> #define MT8195_VDO1_MERGE1_ASYNC_CFG_WD 0xe40
> #define MT8195_VDO1_MERGE2_ASYNC_CFG_WD 0xe50
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index d0f4a407f8f8..1ae04efeadab 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -4,10 +4,12 @@
> * Author: James Liao <jamesjj.liao@mediatek.com>
> */
>
> +#include <linux/delay.h>
> #include <linux/device.h>
> #include <linux/io.h>
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> +#include <linux/reset-controller.h>
> #include <linux/soc/mediatek/mtk-mmsys.h>
>
> #include "mtk-mmsys.h"
> @@ -15,6 +17,8 @@
> #include "mt8183-mmsys.h"
> #include "mt8195-mmsys.h"
>
> +#define MMSYS_SW_RESET_PER_REG 32
> +
> static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
> .clk_driver = "clk-mt2701-mm",
> .routes = mmsys_default_routing_table,
> @@ -65,12 +69,15 @@ static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = {
> .num_routes = ARRAY_SIZE(mmsys_mt8195_routing_table),
> .config = mmsys_mt8195_config_table,
> .num_configs = ARRAY_SIZE(mmsys_mt8195_config_table),
> + .sw_reset_start = MT8195_VDO1_SW0_RST_B,
That change is interesting and I think I should also take it into
consideration with my series.
> };
>
> struct mtk_mmsys {
> void __iomem *regs;
> struct cmdq_client_reg cmdq_base;
> const struct mtk_mmsys_driver_data *data;
> + spinlock_t lock; /* protects mmsys_sw_rst_b reg */
Seems that mmsys_sw_rst_b reg has different names for different SoCs?
I mean I know that for MT8173 and MT8183 the register is called
mmsys_sw0_rst_b but looks like for MT8195 the name is vdo1_sw0_rst_b?
So maybe we should update this comment to be more generic.
> + struct reset_controller_dev rcdev;
> };
>
> void mtk_mmsys_ddp_connect(struct device *dev,
> @@ -148,6 +155,63 @@ void mtk_mmsys_ddp_config(struct device *dev, enum mtk_mmsys_config_type config,
> }
> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_config);
>
> +static int mtk_mmsys_reset_update(struct reset_controller_dev *rcdev, unsigned long id,
> + bool assert)
> +{
> + struct mtk_mmsys *mmsys = container_of(rcdev, struct mtk_mmsys, rcdev);
> + unsigned long flags;
> + u32 reg;
> + int i;
> + u32 offset;
> +
> + offset = (id / MMSYS_SW_RESET_PER_REG) * sizeof(u32);
> + id = 1 << (id % MMSYS_SW_RESET_PER_REG);
> +
> + spin_lock_irqsave(&mmsys->lock, flags);
> +
> + reg = readl_relaxed(mmsys->regs + mmsys->data->sw_reset_start + offset);
> +
> + if (assert)
> + reg &= ~BIT(id);
> + else
> + reg |= BIT(id);
> +
> + writel_relaxed(reg, mmsys->regs + mmsys->data->sw_reset_start + offset);
> +
> + spin_unlock_irqrestore(&mmsys->lock, flags);
> +
> + return 0;
> +}
> +
> +static int mtk_mmsys_reset_assert(struct reset_controller_dev *rcdev, unsigned long id)
> +{
> + return mtk_mmsys_reset_update(rcdev, id, true);
> +}
> +
> +static int mtk_mmsys_reset_deassert(struct reset_controller_dev *rcdev, unsigned long id)
> +{
> + return mtk_mmsys_reset_update(rcdev, id, false);
> +}
> +
> +static int mtk_mmsys_reset(struct reset_controller_dev *rcdev, unsigned long id)
> +{
> + int ret;
> +
> + ret = mtk_mmsys_reset_assert(rcdev, id);
> + if (ret)
> + return ret;
> +
> + usleep_range(1000, 1100);
> +
One question that I received in my series, and I couldn't answer
because I don't have the datasheet, is if
is this known to be enough for all IP cores that can be reset by this
controller? Is this time specified in the datasheet?
> + return mtk_mmsys_reset_deassert(rcdev, id);
> +}
> +
> +static const struct reset_control_ops mtk_mmsys_reset_ops = {
> + .assert = mtk_mmsys_reset_assert,
> + .deassert = mtk_mmsys_reset_deassert,
> + .reset = mtk_mmsys_reset,
> +};
> +
> static int mtk_mmsys_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -174,6 +238,19 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
> if (ret)
> dev_dbg(dev, "No mediatek,gce-client-reg!\n");
> #endif
> +
> + spin_lock_init(&mmsys->lock);
> +
> + mmsys->rcdev.owner = THIS_MODULE;
> + mmsys->rcdev.nr_resets = 64;
Is the number of resets 64 for MT8195? I think is 32 for MT8173 and
MT8183. Can you confirm?
Thanks,
Enric
> + mmsys->rcdev.ops = &mtk_mmsys_reset_ops;
> + mmsys->rcdev.of_node = pdev->dev.of_node;
> + ret = devm_reset_controller_register(&pdev->dev, &mmsys->rcdev);
> + if (ret) {
> + dev_err(&pdev->dev, "Couldn't register mmsys reset controller: %d\n", ret);
> + return ret;
> + }
> +
> platform_set_drvdata(pdev, mmsys);
>
> clks = platform_device_register_data(&pdev->dev, mmsys->data->clk_driver,
> diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h
> index 084b1f5f3c88..cc57c3895c51 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.h
> +++ b/drivers/soc/mediatek/mtk-mmsys.h
> @@ -87,6 +87,7 @@ struct mtk_mmsys_driver_data {
> const unsigned int num_routes;
> const struct mtk_mmsys_config *config;
> const unsigned int num_configs;
> + u32 sw_reset_start;
> };
>
> /*
> --
> 2.18.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-07-23 10:59 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 9:45 [PATCH v2 00/14] Add MediaTek SoC DRM (vdosys1) support for mt8195 Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 01/14] dt-bindings: mediatek: add vdosys1 RDMA/MERGE definition " Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 02/14] dt-bindings: mediatek: add ethdr " Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 03/14] dt-bindings: mediatek: Add #reset-cells to mmsys system controller Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 04/14] dt-bindings: reset: mt8195: Move reset controller constants into common location Nancy.Lin
2021-07-23 11:10 ` Enric Balletbo Serra
2021-07-28 5:21 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 05/14] dt-bindings: reset: mt8195: add vdosys1 reset control bit Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 06/14] arm64: dts: mt8195: add display node for vdosys1 Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 07/14] soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 Nancy.Lin
2021-07-23 11:05 ` Enric Balletbo Serra
2021-07-28 5:34 ` Nancy.Lin
2021-08-06 12:20 ` Matthias Brugger
2021-08-16 2:05 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 08/14] soc: mediatek: add mtk-mmsys config API " Nancy.Lin
2021-08-06 15:30 ` Matthias Brugger
2021-08-16 2:59 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 09/14] soc: mediatek: mmsys: Add reset controller support for MT8195 vdosys1 Nancy.Lin
2021-07-23 10:57 ` Enric Balletbo Serra [this message]
2021-07-28 6:00 ` Nancy.Lin
2021-07-28 10:31 ` Enric Balletbo Serra
2021-07-30 3:47 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 10/14] soc: mediatek: mmsys: add new mtk_mmsys struct member to store drm data Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 11/14] soc: mediatek: add mtk-mutex support for mt8195 vdosys1 Nancy.Lin
2021-07-22 9:45 ` [PATCH 13/14] drm/mediatek: add pseudo ovl support for MT8195 Nancy.Lin
2021-07-25 1:57 ` Chun-Kuang Hu
2021-07-30 3:28 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 13/14] drm/mediatek: add ETHDR " Nancy.Lin
2021-07-27 23:39 ` Chun-Kuang Hu
2021-07-29 5:28 ` Nancy.Lin
2021-07-22 9:45 ` [PATCH v2 14/14] drm/mediatek: add mediatek-drm of vdosys1 " Nancy.Lin
2021-08-02 3:34 ` CK Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFqH_53bnNvjGjZ2S8oyAx2t0if-YpQyZcb9sRapG2q21X4fGw@mail.gmail.com \
--to=eballetbo@gmail.com \
--cc=airlied@linux.ie \
--cc=chunkuang.hu@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jason-jh.lin@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=nancy.lin@mediatek.com \
--cc=robh+dt@kernel.org \
--cc=singo.chang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
--cc=yongqiang.niu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).