[PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[David Lechner]

This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
option. Since the reset function has been moved out of the mach code in
commit 0808d3260456 ("ARM: davinci: remove watchdog reset") and into the
watchdog driver, devices cannot reboot unless the watchdog driver is
loaded, so make it a compiled-in option so that we can always reboot, even
when modules are not loaded.

Cc: Sekhar Nori <nsekhar@ti.com>
Suggested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: David Lechner <david@lechnology.com>
---
 arch/arm/configs/davinci_all_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 62f853f..b400670 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -138,7 +138,7 @@ CONFIG_POWER_RESET_GPIO=y
 CONFIG_SYSCON_REBOOT_MODE=m
 CONFIG_BATTERY_LEGO_EV3=m
 CONFIG_WATCHDOG=y
-CONFIG_DAVINCI_WATCHDOG=m
+CONFIG_DAVINCI_WATCHDOG=y
 CONFIG_MFD_DM355EVM_MSP=y
 CONFIG_TPS6507X=y
 CONFIG_REGULATOR=y
-- 
2.7.4

Re: [PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[Sekhar Nori]

On Monday 15 January 2018 10:59 PM, David Lechner wrote:
> This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
> option. Since the reset function has been moved out of the mach code in
> commit 0808d3260456 ("ARM: davinci: remove watchdog reset") and into the
> watchdog driver, devices cannot reboot unless the watchdog driver is
> loaded, so make it a compiled-in option so that we can always reboot, even
> when modules are not loaded.
> 
> Cc: Sekhar Nori <nsekhar@ti.com>
> Suggested-by: Adam Ford <aford173@gmail.com>
> Signed-off-by: David Lechner <david@lechnology.com>

Hmm, we already depend on modules to load correctly for a lot of
functionality. Why should reboot be an exception? In general, unless the
driver is needed for loading rootfile system, I would keep it as a module.

Thanks,
Sekhar

Re: [PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[Adam Ford]

On Mon, Jan 15, 2018 at 11:59 PM, Sekhar Nori <nsekhar@ti.com> wrote:
> On Monday 15 January 2018 10:59 PM, David Lechner wrote:
>> This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
>> option. Since the reset function has been moved out of the mach code in
>> commit 0808d3260456 ("ARM: davinci: remove watchdog reset") and into the
>> watchdog driver, devices cannot reboot unless the watchdog driver is
>> loaded, so make it a compiled-in option so that we can always reboot, even
>> when modules are not loaded.
>>
>> Cc: Sekhar Nori <nsekhar@ti.com>
>> Suggested-by: Adam Ford <aford173@gmail.com>
>> Signed-off-by: David Lechner <david@lechnology.com>
>
> Hmm, we already depend on modules to load correctly for a lot of
> functionality. Why should reboot be an exception? In general, unless the
> driver is needed for loading rootfile system, I would keep it as a module.

I would argue that his patch corrects a regression introduced by the
patch series.  Before the series, 'reboot' worked properly without the
watchdog being loaded as a module.  With this patch series 'reboot'
stops functioning which I would argue is a regression.  Making the
watchdog part of the kernel fixes the broken reboot regression.  I
would request it be accepted.

>
> Thanks,
> Sekhar

adam

Re: [PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[Sekhar Nori]

On Tuesday 16 January 2018 05:47 PM, Adam Ford wrote:
> On Mon, Jan 15, 2018 at 11:59 PM, Sekhar Nori <nsekhar@ti.com> wrote:
>> On Monday 15 January 2018 10:59 PM, David Lechner wrote:
>>> This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
>>> option. Since the reset function has been moved out of the mach code in
>>> commit 0808d3260456 ("ARM: davinci: remove watchdog reset") and into the
>>> watchdog driver, devices cannot reboot unless the watchdog driver is
>>> loaded, so make it a compiled-in option so that we can always reboot, even
>>> when modules are not loaded.
>>>
>>> Cc: Sekhar Nori <nsekhar@ti.com>
>>> Suggested-by: Adam Ford <aford173@gmail.com>
>>> Signed-off-by: David Lechner <david@lechnology.com>
>>
>> Hmm, we already depend on modules to load correctly for a lot of
>> functionality. Why should reboot be an exception? In general, unless the
>> driver is needed for loading rootfile system, I would keep it as a module.
> 
> I would argue that his patch corrects a regression introduced by the
> patch series.  Before the series, 'reboot' worked properly without the
> watchdog being loaded as a module.  With this patch series 'reboot'
> stops functioning which I would argue is a regression.  Making the
> watchdog part of the kernel fixes the broken reboot regression.  I
> would request it be accepted.

Okay, thats a convincing argument. We are going to shift to watchdog
driver for reboot only with v4.17, so will add it to my queue.

Thanks,
Sekhar

Re: [PATCH] ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y

[Sekhar Nori]

On Monday 15 January 2018 10:59 PM, David Lechner wrote:
> This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in
> option. Since the reset function has been moved out of the mach code in
> commit 0808d3260456 ("ARM: davinci: remove watchdog reset") and into the

commit id adjusted since the said patch did not make it to v4.16

> watchdog driver, devices cannot reboot unless the watchdog driver is
> loaded, so make it a compiled-in option so that we can always reboot, even
> when modules are not loaded.
> 
> Cc: Sekhar Nori <nsekhar@ti.com>
> Suggested-by: Adam Ford <aford173@gmail.com>
> Signed-off-by: David Lechner <david@lechnology.com>

Applied to v4.17/defconfig

Thanks,
Sekhar