From: Guenter Roeck <linux@roeck-us.net>
To: Yong Liang <yong.liang@mediatek.com>,
Philipp Zabel <p.zabel@pengutronix.de>
Cc: "mark.rutland@arm.com" <mark.rutland@arm.com>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"lgirdwood@gmail.com" <lgirdwood@gmail.com>,
"Jiaxin Yu (俞家鑫)" <Jiaxin.Yu@mediatek.com>,
"perex@perex.cz" <perex@perex.cz>,
"tzungbi@google.com" <tzungbi@google.com>,
"broonie@kernel.org" <broonie@kernel.org>,
"linux-mediatek@lists.infradead.org"
<linux-mediatek@lists.infradead.org>,
"Eason Yen (顏廷任)" <Eason.Yen@mediatek.com>,
"Yingjoe Chen (陳英洲)" <Yingjoe.Chen@mediatek.com>,
"wim@linux-watchdog.org" <wim@linux-watchdog.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v5 2/2] watchdog: mtk_wdt: mt8183: Add reset controller
Date: Mon, 2 Dec 2019 21:05:36 -0800 [thread overview]
Message-ID: <f9628c90-4c9b-ff4b-b3dd-887dbc987d46@roeck-us.net> (raw)
In-Reply-To: <1575342124.7013.13.camel@mhfsdcap03>
On 12/2/19 7:02 PM, Yong Liang wrote:
> On Mon, 2019-12-02 at 21:02 +0800, Philipp Zabel wrote:
>> On Fri, 2019-11-29 at 16:36 +0800, Yong Liang wrote:
>>> On Mon, 2019-11-25 at 17:51 +0800, Philipp Zabel wrote:
>>>> On Sun, 2019-11-24 at 22:16 -0800, Guenter Roeck wrote:
>>>>> On Mon, Nov 25, 2019 at 11:03:50AM +0800, Jiaxin Yu wrote:
>>>>>> From: "yong.liang" <yong.liang@mediatek.com>
>>>>>>
>>>>>> Add reset controller API in watchdog driver.
>>>>>> Besides watchdog, MTK toprgu module also provide sub-system (eg, audio,
>>>>>> camera, codec and connectivity) software reset functionality.
>>>>>>
>>>>>> Signed-off-by: yong.liang <yong.liang@mediatek.com>
>>>>>> Signed-off-by: jiaxin.yu <jiaxin.yu@mediatek.com>
>>>>>> Reviewed-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
>>>>>> ---
>>>>>> drivers/watchdog/Kconfig | 1 +
>>>>>> drivers/watchdog/mtk_wdt.c | 111 ++++++++++++++++++++++++++++++++++++-
>>>>>> 2 files changed, 111 insertions(+), 1 deletion(-)
>>>>>>
>>>>>> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
>>>>>> index 2e07caab9db2..629249fe5305 100644
>>>>>> --- a/drivers/watchdog/Kconfig
>>>>>> +++ b/drivers/watchdog/Kconfig
>>>>>> @@ -717,6 +717,7 @@ config MEDIATEK_WATCHDOG
>>>>>> tristate "Mediatek SoCs watchdog support"
>>>>>> depends on ARCH_MEDIATEK || COMPILE_TEST
>>>>>> select WATCHDOG_CORE
>>>>>> + select RESET_CONTROLLER
>>>>>> help
>>>>>> Say Y here to include support for the watchdog timer
>>>>>> in Mediatek SoCs.
>>>>>> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
>>>>>> index 9c3d0033260d..d29484c7940a 100644
>>>>>> --- a/drivers/watchdog/mtk_wdt.c
>>>>>> +++ b/drivers/watchdog/mtk_wdt.c
>>>>>> @@ -9,6 +9,9 @@
>>>>>> * Based on sunxi_wdt.c
>>>>>> */
>>>>>>
>>>>>> +#include <dt-bindings/reset-controller/mt2712-resets.h>
>>>>>> +#include <dt-bindings/reset-controller/mt8183-resets.h>
>>>>>> +#include <linux/delay.h>
>>>>>> #include <linux/err.h>
>>>>>> #include <linux/init.h>
>>>>>> #include <linux/io.h>
>>>>>> @@ -16,10 +19,12 @@
>>>>>> #include <linux/module.h>
>>>>>> #include <linux/moduleparam.h>
>>>>>> #include <linux/of.h>
>>>>>> +#include <linux/of_device.h>
>>>>>> #include <linux/platform_device.h>
>>>>>> +#include <linux/reset-controller.h>
>>>>>> +#include <linux/slab.h>
>>>>>> #include <linux/types.h>
>>>>>> #include <linux/watchdog.h>
>>>>>> -#include <linux/delay.h>
>>>>>>
>>>>>> #define WDT_MAX_TIMEOUT 31
>>>>>> #define WDT_MIN_TIMEOUT 1
>>>>>> @@ -44,6 +49,9 @@
>>>>>> #define WDT_SWRST 0x14
>>>>>> #define WDT_SWRST_KEY 0x1209
>>>>>>
>>>>>> +#define WDT_SWSYSRST 0x18U
>>>>>> +#define WDT_SWSYS_RST_KEY 0x88000000
>>>>>> +
>>>>>> #define DRV_NAME "mtk-wdt"
>>>>>> #define DRV_VERSION "1.0"
>>>>>>
>>>>>> @@ -53,8 +61,99 @@ static unsigned int timeout;
>>>>>> struct mtk_wdt_dev {
>>>>>> struct watchdog_device wdt_dev;
>>>>>> void __iomem *wdt_base;
>>>>>> + spinlock_t lock; /* protects WDT_SWSYSRST reg */
>>>>>> + struct reset_controller_dev rcdev;
>>>>>> +};
>>>>>> +
>>>>>> +struct mtk_wdt_data {
>>>>>> + int sw_rst_num;
>>>>>> };
>>>>>>
>>>>>> +static const struct mtk_wdt_data mt2712_data = {
>>>>>> + .sw_rst_num = MT2712_TOPRGU_SW_RST_NUM,
>>>>>> +};
>>>>>> +
>>>>>> +static const struct mtk_wdt_data mt8183_data = {
>>>>>> + .sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
>>>>>> +};
>>>>>
>>>>> The number of resets can be set in .data directly; there is no need
>>>>> for the structures.
>>>
>>> We want to put all properities in mtxxxx-resets.h and it easy to
>>> manager. If there are new properity in the feture, we can put it in
>>> mtk_wdt_data mtxxxx_data
>>
>> Do you expect there will be more properties in the future?
>
> Yes, We may put some infra reset bit and max number in mtxxxx-resets.h
Please either do that now or introduce the complexity when needed.
Thanks,
Guenter
>>
>>>>>> +static int toprgu_reset_deassert(struct reset_controller_dev *rcdev,
>>>>>> + unsigned long id)
>>>>>> +{
>>>>>> + unsigned int tmp;
>>>>>> + unsigned long flags;
>>>>>> + struct mtk_wdt_dev *data =
>>>>>> + container_of(rcdev, struct mtk_wdt_dev, rcdev);
>>>>>> +
>>>>>> + spin_lock_irqsave(&data->lock, flags);
>>>>>> +
>>>>>> + tmp = __raw_readl(data->wdt_base + WDT_SWSYSRST);
>>>>>> + tmp &= ~BIT(id);
>>>>>> + tmp |= WDT_SWSYS_RST_KEY;
>>>>>> + writel(tmp, data->wdt_base + WDT_SWSYSRST);
>>>>>> +
>>>>>> + spin_unlock_irqrestore(&data->lock, flags);
>>>>>> +
>>>>>> + return 0;
>>>>>> +}
>>>>>
>>>>> There is a lot of duplication in those functions. Only one line
>>>>> is different. I think this is a good example where a helper function
>>>>> with an additional argument indicating set or reset would be helpful.
>>>>>
>>> .assert and .dessert are two numbers of struct reset_control_ops.
>>> I think it's better to define both of them.
>>
>> The suggestion was to have two very short _assert and _deassert
>> functions that only contain a single call to a common helper function.
>> See the reset-a10sr.c driver for an example.
>
> OK. I will modify it as reset-a10sr.c do.
>>
>> regards
>> Philipp
>>
>>
>> _______________________________________________
>> Linux-mediatek mailing list
>> Linux-mediatek@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-mediatek
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2019-12-03 5:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-25 6:16 [PATCH v5 2/2] watchdog: mtk_wdt: mt8183: Add reset controller Guenter Roeck
2019-11-25 9:51 ` Philipp Zabel
2019-11-29 8:36 ` Yong Liang
2019-12-02 13:02 ` Philipp Zabel
2019-12-03 3:02 ` Yong Liang
2019-12-03 5:05 ` Guenter Roeck [this message]
2019-11-29 10:39 ` Yong Liang
-- strict thread matches above, loose matches on Subject: below --
2019-11-25 3:03 [PATCH v5 0/2] ASoC: mt8183: fix audio playback slowly after playback Jiaxin Yu
2019-11-25 3:03 ` [PATCH v5 2/2] watchdog: mtk_wdt: mt8183: Add reset controller Jiaxin Yu
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=f9628c90-4c9b-ff4b-b3dd-887dbc987d46@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Eason.Yen@mediatek.com \
--cc=Jiaxin.Yu@mediatek.com \
--cc=Yingjoe.Chen@mediatek.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=p.zabel@pengutronix.de \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=tzungbi@google.com \
--cc=wim@linux-watchdog.org \
--cc=yong.liang@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).