xen/rpi4: implement watchdog-based reset
PATCH v3 1/1 xen/rpi4: implement watchdog-based reset
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
---
Changes in v3:
- fix typo in commit message
- dprintk -> printk
--- xen/arch/arm/platforms/brcm-raspberry-pi.c | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+)
xen/arch/arm/platforms/brcm-raspberry-pi.c +61 -0
@@ -17,6 +17,10 @@* GNU General Public License for more details. */ +#include <xen/delay.h> +#include <xen/mm.h> +#include <xen/vmap.h> +#include <asm/io.h> #include <asm/platform.h> static const char *const rpi4_dt_compat[] __initconst =
@@ -37,12 +41,69 @@ static const struct dt_device_match rpi4_blacklist_dev[] __initconst =* The aux peripheral also shares a page with the aux UART. */ DT_MATCH_COMPATIBLE ("brcm,bcm2835-aux" ), +/* Special device used for rebooting */ + DT_MATCH_COMPATIBLE("brcm,bcm2835-pm"), { /* sentinel */ }, }; + +#define PM_PASSWORD 0x5a000000 +#define PM_RSTC 0x1c +#define PM_WDOG 0x24 +#define PM_RSTC_WRCFG_FULL_RESET 0x00000020 +#define PM_RSTC_WRCFG_CLR 0xffffffcf + +static void __iomem *rpi4_map_watchdog (void ) +{ +void __iomem *base; +struct dt_device_node *node; +paddr_t start, len; +int ret; + + node =dt_find_compatible_node (NULL ,NULL ,"brcm,bcm2835-pm" ); +if ( !node ) +return NULL ; + + ret =dt_device_get_address (node,0 , &start, &len); +if ( ret ) + { +printk ("Cannot read watchdog register address\n" ); +return NULL ; + } + + base =ioremap_nocache (start &PAGE_MASK ,PAGE_SIZE ); +if ( !base ) + { +printk ("Unable to map watchdog register!\n" ); +return NULL ; + } + +return base; +} + +static void rpi4_reset (void ) +{ +uint32_t val; +void __iomem *base =rpi4_map_watchdog (); + +if ( !base ) +return ; + +/* use a timeout of 10 ticks (~150us) */ +writel (10 |PM_PASSWORD , base +PM_WDOG ); + val =readl (base +PM_RSTC ); + val &=PM_RSTC_WRCFG_CLR ; + val |=PM_PASSWORD |PM_RSTC_WRCFG_FULL_RESET ; +writel (val, base +PM_RSTC ); + +/* No sleeping, possibly atomic. */ +mdelay (1 ); +} +PLATFORM_START (rpi4,"Raspberry Pi 4" ) .compatible = rpi4_dt_compat, .blacklist_dev = rpi4_blacklist_dev, + .reset = rpi4_reset, .dma_bitsize =30 ,PLATFORM_END
Signature · 1 line
2.17.1
Quoted 12 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>
Maybe a printk if reset was not successful ?
Cheers
Bertrand
Quoted 98 lines
---
Changes in v3:
- fix typo in commit message
- dprintk -> printk
---xen/arch/arm/platforms/brcm-raspberry-pi.c| 61 ++++++++++++++++++++++1 file changed, 61 insertions(+)xen/arch/arm/platforms/brcm-raspberry-pi.c +4
-0@@ -17,6 +17,10 @@* GNU General Public License for more details. */ +#include <xen/delay.h> +#include <xen/mm.h> +#include <xen/vmap.h> +#include <asm/io.h> #include <asm/platform.h> static const char *const rpi4_dt_compat[]
__initconst=xen/arch/arm/platforms/brcm-raspberry-pi.c +57
-0@@ -37,12 +41,69 @@ static const struct dt_device_match rpi4_blacklist_dev[] __initconst =* The aux peripheral also shares a page with the aux UART. */ DT_MATCH_COMPATIBLE ("brcm,bcm2835-aux" ), +/* Special device used for rebooting */ + DT_MATCH_COMPATIBLE("brcm,bcm2835-pm"), { /* sentinel */ }, }; + +#define PM_PASSWORD 0x5a000000 +#define PM_RSTC 0x1c +#define PM_WDOG 0x24 +#define PM_RSTC_WRCFG_FULL_RESET 0x00000020 +#define PM_RSTC_WRCFG_CLR 0xffffffcf + +static void __iomem *rpi4_map_watchdog (void ) +{ +void __iomem *base; +struct dt_device_node *node; +paddr_t start, len; +int ret; + + node =dt_find_compatible_node (NULL ,NULL ,"brcm,bcm2835-pm" ); +if ( !node ) +return NULL ; + + ret =dt_device_get_address (node,0 , &start, &len); +if ( ret ) + { +printk ("Cannot read watchdog register address\n" ); +return NULL ; + } + + base =ioremap_nocache (start &PAGE_MASK ,PAGE_SIZE ); +if ( !base ) + { +printk ("Unable to map watchdog register!\n" ); +return NULL ; + } + +return base; +} + +static void rpi4_reset (void ) +{ +uint32_t val; +void __iomem *base =rpi4_map_watchdog (); + +if ( !base ) +return ; + +/* use a timeout of 10 ticks (~150us) */ +writel (10 |PM_PASSWORD , base +PM_WDOG ); + val =readl (base +PM_RSTC ); + val &=PM_RSTC_WRCFG_CLR ; + val |=PM_PASSWORD |PM_RSTC_WRCFG_FULL_RESET ; +writel (val, base +PM_RSTC ); + +/* No sleeping, possibly atomic. */ +mdelay (1 ); +} +PLATFORM_START (rpi4,"Raspberry Pi 4" ) .compatible = rpi4_dt_compat, .blacklist_dev = rpi4_blacklist_dev, + .reset = rpi4_reset, .dma_bitsize = 30,
PLATFORM_ENDSignature · 1 line
2.17.1
Quoted 8 lines · Bertrand Marquis
Quoted 8 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>Reviewed-by Bertrand Marquis <[email protected]>Maybe a printk if reset was not successful ?
That not quite platform specific but we could add a printk to xen/arch/arm/shutdown.c:machine_restart if we are still alive after 100ms.
I'll commit this patch as is and maybe send another one for machine_restart.
Quoted 99 lines
Quoted 98 lines
---
Changes in v3:
- fix typo in commit message
- dprintk -> printk
---xen/arch/arm/platforms/brcm-raspberry-pi.c| 61 ++++++++++++++++++++++1 file changed, 61 insertions(+)xen/arch/arm/platforms/brcm-raspberry-pi.c +4
-0@@ -17,6 +17,10 @@* GNU General Public License for more details. */ +#include <xen/delay.h> +#include <xen/mm.h> +#include <xen/vmap.h> +#include <asm/io.h> #include <asm/platform.h> static const char *const rpi4_dt_compat[]
__initconst=xen/arch/arm/platforms/brcm-raspberry-pi.c +57
-0@@ -37,12 +41,69 @@ static const struct dt_device_match rpi4_blacklist_dev[] __initconst =* The aux peripheral also shares a page with the aux UART. */ DT_MATCH_COMPATIBLE ("brcm,bcm2835-aux" ), +/* Special device used for rebooting */ + DT_MATCH_COMPATIBLE("brcm,bcm2835-pm"), { /* sentinel */ }, }; + +#define PM_PASSWORD 0x5a000000 +#define PM_RSTC 0x1c +#define PM_WDOG 0x24 +#define PM_RSTC_WRCFG_FULL_RESET 0x00000020 +#define PM_RSTC_WRCFG_CLR 0xffffffcf + +static void __iomem *rpi4_map_watchdog (void ) +{ +void __iomem *base; +struct dt_device_node *node; +paddr_t start, len; +int ret; + + node =dt_find_compatible_node (NULL ,NULL ,"brcm,bcm2835-pm" ); +if ( !node ) +return NULL ; + + ret =dt_device_get_address (node,0 , &start, &len); +if ( ret ) + { +printk ("Cannot read watchdog register address\n" ); +return NULL ; + } + + base =ioremap_nocache (start &PAGE_MASK ,PAGE_SIZE ); +if ( !base ) + { +printk ("Unable to map watchdog register!\n" ); +return NULL ; + } + +return base; +} + +static void rpi4_reset (void ) +{ +uint32_t val; +void __iomem *base =rpi4_map_watchdog (); + +if ( !base ) +return ; + +/* use a timeout of 10 ticks (~150us) */ +writel (10 |PM_PASSWORD , base +PM_WDOG ); + val =readl (base +PM_RSTC ); + val &=PM_RSTC_WRCFG_CLR ; + val |=PM_PASSWORD |PM_RSTC_WRCFG_FULL_RESET ; +writel (val, base +PM_RSTC ); + +/* No sleeping, possibly atomic. */ +mdelay (1 ); +} +PLATFORM_START (rpi4,"Raspberry Pi 4" ) .compatible = rpi4_dt_compat, .blacklist_dev = rpi4_blacklist_dev, + .reset = rpi4_reset, .dma_bitsize = 30,
PLATFORM_ENDSignature · 1 line
2.17.1
Roman Shaposhnik
Tested-byQuoted 8 lines · Bertrand Marquis
Quoted 8 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
Quoted 7 lines
Quoted 5 lines
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>Reviewed-by Bertrand Marquis <[email protected]>
FWIW:
Great to see it being merged -- one less custom patch for us to carry in EVE.
Thanks,
Roman.
Quoted 16 lines · Stefano Stabellini
Quoted 11 lines · Bertrand Marquis
Quoted 10 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>
Quoted 7 lines
Quoted 3 lines
Reviewed-by Bertrand Marquis <[email protected]>Maybe a printk if reset was not successful ?
That not quite platform specific but we could add a printk to xen/arch/arm/shutdown.c:machine_restart if we are still alive after 100ms.
Even nicer :-)
Definitely usefull to see something if for one reason reset/restart did not succeed for whatever reason.
Quoted 3 lines
I'll commit this patch as is and maybe send another one for
machine_restart.
Please tell me if you want me to handle that one (at the end I did request that so not really fare to ask you to do it:-) ).
Cheers
Bertrand
Quoted 27 lines · Bertrand Marquis
Quoted 14 lines · Stefano Stabellini
Quoted 11 lines · Bertrand Marquis
Quoted 10 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>Quoted 7 lines
Quoted 3 lines
Reviewed-by Bertrand Marquis <[email protected]>Maybe a printk if reset was not successful ?
That not quite platform specific but we could add a printk to xen/arch/arm/shutdown.c:machine_restart if we are still alive after 100ms.
Even nicer :-)
Definitely usefull to see something if for one reason reset/restart did not succeed for whatever reason.Quoted 1 line
Quoted 5 lines
Quoted 2 lines
I'll commit this patch as is and maybe send another one for
machine_restart.Please tell me if you want me to handle that one (at the end I did request that so not really fare to ask you to do it:-) ).
Since you are volunteering, yes please :-)
Hi Stefano,
Quoted 30 lines · Stefano Stabellini
Quoted 27 lines · Bertrand Marquis
Quoted 14 lines · Stefano Stabellini
Quoted 11 lines · Bertrand Marquis
Quoted 10 lines · Stefano Stabellini
The preferred method to reboot RPi4 is PSCI. If it is not available, touching the watchdog is required to be able to reboot the board.
The implementation is based on drivers/watchdog/bcm2835_wdt.c:__bcm2835_restart in Linux v5.9-rc7.
Signed-off-by Stefano Stabellini <[email protected]>Acked-by Julien Grall <[email protected]>Quoted 7 lines
Quoted 3 lines
Reviewed-by Bertrand Marquis <[email protected]>Maybe a printk if reset was not successful ?
That not quite platform specific but we could add a printk to xen/arch/arm/shutdown.c:machine_restart if we are still alive after 100ms.
Even nicer :-)
Definitely usefull to see something if for one reason reset/restart did not succeed for whatever reason.Quoted 1 line
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
I'll commit this patch as is and maybe send another one for
machine_restart.Please tell me if you want me to handle that one (at the end I did request that so not really fare to ask you to do it:-) ).
Since you are volunteering, yes please :-)
Fare enough
I will add this to my small fixes list :-)
Cheers
Bertrand