[PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[Noralf Trønnes]

Currently poweroff/halt results in a reboot on the Raspberry Pi.
The firmware uses the RSTS register to know which partiton to
boot from. The partiton value is spread into bits
0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
the firmware to indicate halt.

The firmware made this change in 19 Aug 2013 and was matched
by the downstream commit:
Changes for new NOOBS multi partition booting from gsh

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
---

v2: Fix typo in commit message

v3: Only Raspberry Pi is supported so it's ok to just modify
    the poweroff function (Stephen Warrren)

 drivers/watchdog/bcm2835_wdt.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 7116968..43dbf5b 100644
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -36,6 +36,13 @@
 #define PM_RSTC_WRCFG_FULL_RESET	0x00000020
 #define PM_RSTC_RESET			0x00000102

+/*
+ * The Raspberry Pi firmware uses the RSTS register to know which partiton
+ * to boot from. The partiton value is spread into bits 0, 2, 4, 6, 8, 10.
+ * Partiton 63 is a special partition used by the firmware to indicate halt.
+ */
+#define PM_RSTS_RASPBERRYPI_HALT	0x555
+
 #define SECS_TO_WDOG_TICKS(x) ((x) << 16)
 #define WDOG_TICKS_TO_SECS(x) ((x) >> 16)

@@ -151,8 +158,7 @@ static void bcm2835_power_off(void)
 	 * hard reset.
 	 */
 	val = readl_relaxed(wdt->base + PM_RSTS);
-	val &= PM_RSTC_WRCFG_CLR;
-	val |= PM_PASSWORD | PM_RSTS_HADWRH_SET;
+	val |= PM_PASSWORD | PM_RSTS_RASPBERRYPI_HALT;
 	writel_relaxed(val, wdt->base + PM_RSTS);

 	/* Continue with normal reset mechanism */
--
2.2.2

Re: [PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[Stephen Warren]

On 06/17/2015 08:04 AM, Noralf Trønnes wrote:
> Currently poweroff/halt results in a reboot on the Raspberry Pi.
> The firmware uses the RSTS register to know which partiton to
> boot from. The partiton value is spread into bits
> 0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
> the firmware to indicate halt.
> 
> The firmware made this change in 19 Aug 2013 and was matched
> by the downstream commit:
> Changes for new NOOBS multi partition booting from gsh

Tested-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>

I wonder if, sometime down the road, it's worth querying the firmware
version via the firmware driver and dynamically doing the right thing.
Still, the combination of a bleeding edge kernel and an ancient firmware
seems a bit unlikely, so perhaps not worth the bother.

Re: [PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[Guenter Roeck]

On 06/17/2015 07:04 AM, Noralf Trønnes wrote:
> Currently poweroff/halt results in a reboot on the Raspberry Pi.
> The firmware uses the RSTS register to know which partiton to
> boot from. The partiton value is spread into bits
> 0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
> the firmware to indicate halt.
>
> The firmware made this change in 19 Aug 2013 and was matched
> by the downstream commit:
> Changes for new NOOBS multi partition booting from gsh
>
> Signed-off-by: Noralf Trønnes <noralf@tronnes.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Re: [PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[Noralf Trønnes]

Den 18.06.2015 05:58, skrev Guenter Roeck:
> On 06/17/2015 07:04 AM, Noralf Trønnes wrote:
>> Currently poweroff/halt results in a reboot on the Raspberry Pi.
>> The firmware uses the RSTS register to know which partiton to
>> boot from. The partiton value is spread into bits
>> 0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
>> the firmware to indicate halt.
>>
>> The firmware made this change in 19 Aug 2013 and was matched
>> by the downstream commit:
>> Changes for new NOOBS multi partition booting from gsh
>>
>> Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>

It seems that this has slipped through the cracks, at least it didn't
enter in the 4.3 merge window.


Noralf.

Re: [PATCH v3] watchdog: bcm2835: Fix poweroff behaviour

[Guenter Roeck]

On 09/13/2015 12:26 PM, Noralf Trønnes wrote:
>
> Den 18.06.2015 05:58, skrev Guenter Roeck:
>> On 06/17/2015 07:04 AM, Noralf Trønnes wrote:
>>> Currently poweroff/halt results in a reboot on the Raspberry Pi.
>>> The firmware uses the RSTS register to know which partiton to
>>> boot from. The partiton value is spread into bits
>>> 0, 2, 4, 6, 8, 10. Partiton 63 is a special partition used by
>>> the firmware to indicate halt.
>>>
>>> The firmware made this change in 19 Aug 2013 and was matched
>>> by the downstream commit:
>>> Changes for new NOOBS multi partition booting from gsh
>>>
>>> Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
>>
>> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>>
>
> It seems that this has slipped through the cracks, at least it didn't
> enter in the 4.3 merge window.
>

Yes, completely. It slipped through my cracks as well :-(.

Guenter