Skip to contentSkip to conversation

Support MTK reboot mode driver

PATCH In review [email protected] 3 participants 7 messages Nov 26, 2019 – Dec 5, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Support MTK reboot mode driver

This driver parses the reboot commands like "reboot bootloader"
and "reboot recovery" to get a boot mode described in the device tree , then call the write interfae to store the boot mode in mtk RGU (reset generation unit) non-volatile register, which can be read by the bootloader after system reboot, then the bootloader can take different action according to the mode stored.

Freddy Hsin (4):
power: reset: add reboot mode driver
watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset
Generation Unit)
soc: mediatek: add reboot-mode header
dt-binding: power: reset: Add documentation for MTK RGU (Reset
Gernation Unit) reboot driver

 .../devicetree/bindings/power/reset/mtk-reboot.txt |   30 +++++
 drivers/power/reset/Kconfig                        |   11 ++
 drivers/power/reset/Makefile                       |    1 +
 drivers/power/reset/mtk-reboot.c                   |  116 ++++++++++++++++++++
 drivers/watchdog/mtk_wdt.c                         |    3 +
 include/dt-bindings/soc/mediatek,boot-mode.h       |   17 +++
 6 files changed, 178 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
 create mode 100644 drivers/power/reset/mtk-reboot.c
 create mode 100644 include/dt-bindings/soc/mediatek,boot-mode.h
#1 lore raw

PATCH 1/4 power: reset: add reboot mode driver

From: Freddy Hsin <[email protected]>

This driver parses the reboot commands like "reboot bootloader" and "reboot recovery" to get a boot mode described in the device tree , then call the write interfae to store the boot mode in mtk RGU (reset generation unit) non-volatile register, which can be read by the bootloader after system reboot, then the bootloader can take different action according to the mode stored.

---
 drivers/power/reset/Kconfig      |   11 ++++
 drivers/power/reset/Makefile     |    1 +
 drivers/power/reset/mtk-reboot.c |  116 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 128 insertions(+)
 create mode 100644 drivers/power/reset/mtk-reboot.c
drivers/power/reset/Kconfig +11 -0
index a564237..31fedb8 100644
@@ -256,5 +256,16 @@ config NVMEM_REBOOT_MODE
 	  then the bootloader can read it and take different
 	  action according to the mode.
 
+config MTK_REBOOT_MODE
+	tristate "Mediatek SoCs reset driver"
+	depends on OF
+	depends on REGMAP
+	select REBOOT_MODE
+	help
+	  Say y here will enable reboot mode driver. This will
+	  get reboot mode arguments and store it in RGU mapped
+	  register, then the bootloader can read it to take different
+	  action according to the mode.
+
 endif
 
drivers/power/reset/Makefile +1 -0
index 85da3198..2c64104 100644
@@ -30,3 +30,4 @@ obj-$(CONFIG_REBOOT_MODE) += reboot-mode.o
 obj-$(CONFIG_SYSCON_REBOOT_MODE) += syscon-reboot-mode.o
 obj-$(CONFIG_POWER_RESET_SC27XX) += sc27xx-poweroff.o
 obj-$(CONFIG_NVMEM_REBOOT_MODE) += nvmem-reboot-mode.o
+obj-$(CONFIG_MTK_REBOOT_MODE) += mtk-reboot.o
drivers/power/reset/mtk-reboot.c new file +116 -0

116 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/4 watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit)

In reply to [email protected]

From: Freddy Hsin <[email protected]>

of_platform_population should be added in the probe function of toprgu driver, or the reboot mode driver will not be probed

---
 drivers/watchdog/mtk_wdt.c |    3 +++
 1 file changed, 3 insertions(+)
drivers/watchdog/mtk_wdt.c +3 -0
index 9c3d003..2fb2614 100644
@@ -20,6 +20,7 @@
 #include <linux/types.h>
 #include <linux/watchdog.h>
 #include <linux/delay.h>
+#include <linux/of_platform.h>
 
 #define WDT_MAX_TIMEOUT		31
 #define WDT_MIN_TIMEOUT		1
@@ -167,6 +168,8 @@ static int mtk_wdt_probe(struct platform_device *pdev)
 	if (IS_ERR(mtk_wdt->wdt_base))
 		return PTR_ERR(mtk_wdt->wdt_base);
 
+	of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+
 	mtk_wdt->wdt_dev.info = &mtk_wdt_info;
 	mtk_wdt->wdt_dev.ops = &mtk_wdt_ops;
 	mtk_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;
Signature · 1 line
1.7.9.5
maintainer
#3 lore raw

Re: [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit)

Quoted 23 lines · On 11/25/19 9:34 PM, [email protected] wrote:

From: Freddy Hsin <[email protected]>

of_platform_population should be added in the probe function of toprgu driver, or the reboot mode driver will not be probed

---
  drivers/watchdog/mtk_wdt.c |    3 +++
  1 file changed, 3 insertions(+)
drivers/watchdog/mtk_wdt.c +1 -0
index 9c3d003..2fb2614 100644
@@ -20,6 +20,7 @@
  #include <linux/types.h>
  #include <linux/watchdog.h>
  #include <linux/delay.h>
+#include <linux/of_platform.h>
 
  #define WDT_MAX_TIMEOUT		31
  #define WDT_MIN_TIMEOUT		1

drivers/watchdog/mtk_wdt.c static int mtk_wdt_probe(struct platform_device *pdev) · line 172

Quoted 5 lines
drivers/watchdog/mtk_wdt.c +2 -0
@@ -167,6 +168,8 @@ static int mtk_wdt_probe(struct platform_device *pdev)
  	if (IS_ERR(mtk_wdt->wdt_base))
  		return PTR_ERR(mtk_wdt->wdt_base);
 
+	of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
+

This seems just wrong. Such a driver should not be a child of the watchdog driver.

Guenter

Quoted 4 lines
drivers/watchdog/mtk_wdt.c +0 -0
  	mtk_wdt->wdt_dev.info = &mtk_wdt_info;
  	mtk_wdt->wdt_dev.ops = &mtk_wdt_ops;
  	mtk_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;
#4 lore raw

PATCH 3/4 soc: mediatek: add reboot-mode header

In reply to [email protected]

From: Freddy Hsin <[email protected]>

Mediatek platform use a RGU (Reset Generation Unit) mapped register store the reboot mode magic value for bootloader to use when system reboot.

Add the shared header describing the values firmware expects for different boot modes.

---
 include/dt-bindings/soc/mediatek,boot-mode.h |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 include/dt-bindings/soc/mediatek,boot-mode.h
include/dt-bindings/soc/mediatek,boot-mode.h new file +17 -0
new file mode 100644
index 0000000..f7d5107
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2019 MediaTek Inc.
+ */
+#ifndef __MEDIATEK_BOOT_MODE_H
+#define __MEDIATEK_BOOT_MODE_H
+
+#define BOOT_CHARGER	1
+#define BOOT_RECOVERY	2
+#define BOOT_BOOTLOADER	3
+#define BOOT_DM_VERITY	4
+#define BOOT_KPOC	5
+#define BOOT_DDR_RSVD	6
+#define BOOT_META	7
+#define BOOT_RPMBPK	8
+
+#endif
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 4/4 dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver

In reply to [email protected]

From: Freddy Hsin <[email protected]>

Add documentation for MTK RGU (Reset Generation Unit) reboot driver.

---
 .../devicetree/bindings/power/reset/mtk-reboot.txt |   30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
Documentation/devicetree/bindings/power/reset/mtk-reboot.txt new file +30 -0
new file mode 100644
index 0000000..708d351
@@ -0,0 +1,30 @@
+Generic MTK RGU mapped register reset driver
+
+This is a reset driver using toprgu to map its non-volatile register.
+The reset is generally performed with a write to the non-volatile register
+defined by the register map pointed by toprgu reference plus the offset
+with the mask defined in the reboot-mode node.
+
+Required properties:
+- compatible: should contain "toprgu-reboot-mode"
+- regmap: this is phandle to the register map node
+- offset: offset in the register map for the reboot-mode register (in bytes)
+- mask: the reset value written to the reboot register (32 bit access)
+
+Examples:
+	reboot-mode {
+	   compatible = "toprgu-reboot-mode";
+	   regmap = <&toprgu>;
+	   offset = <0x24>;
+	   mask = <0xF>;
+	};
+
+Optional properties - reboot mode value that will keep in toprgu nonrst RG:
+- mode-charger = <BOOT_CHARGER>;
+- mode-recovery = <BOOT_RECOVERY>;
+- mode-bootloader = <BOOT_BOOTLOADER>;
+- mode-dm-verity-dev-corrupt = <BOOT_DM_VERITY>;
+- mode-kpoc = <BOOT_KPOC>;
+- mode-ddr-reserve = <BOOT_DDR_RSVD>;
+- mode-meta = <BOOT_META>;
+- mode-rpmbpk = <BOOT_RPMBPK>;
Signature · 1 line
1.7.9.5
maintainer
#6 lore raw

Re: [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver

Quoted 16 lines · On Tue, Nov 26, 2019 at 01:34:50PM +0800, [email protected] wrote:

From: Freddy Hsin <[email protected]>

Add documentation for MTK RGU (Reset Generation Unit) reboot driver.

---
 .../devicetree/bindings/power/reset/mtk-reboot.txt |   30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
Documentation/devicetree/bindings/power/reset/mtk-reboot.txt new file +0 -0
new file mode 100644
index 0000000..708d351

Documentation/devicetree/bindings/power/reset/mtk-reboot.txt line 9

Quoted 9 lines
Documentation/devicetree/bindings/power/reset/mtk-reboot.txt new file +9 -0
@@ -0,0 +1,30 @@
+Generic MTK RGU mapped register reset driver
+
+This is a reset driver using toprgu to map its non-volatile register.
+The reset is generally performed with a write to the non-volatile register
+defined by the register map pointed by toprgu reference plus the offset
+with the mask defined in the reboot-mode node.
+
+Required properties:
+- compatible: should contain "toprgu-reboot-mode"

What's wrong with syscon-reboot-mode?

Documentation/devicetree/bindings/power/reset/mtk-reboot.txt line 10

Quoted 1 line
Documentation/devicetree/bindings/power/reset/mtk-reboot.txt new file +1 -0
+- regmap: this is phandle to the register map node

Make this node a child node of the phandle and get rid of this.

Quoted 22 lines
Documentation/devicetree/bindings/power/reset/mtk-reboot.txt new file +20 -0
+- offset: offset in the register map for the reboot-mode register (in bytes)
+- mask: the reset value written to the reboot register (32 bit access)
+
+Examples:
+	reboot-mode {
+	   compatible = "toprgu-reboot-mode";
+	   regmap = <&toprgu>;
+	   offset = <0x24>;
+	   mask = <0xF>;
+	};
+
+Optional properties - reboot mode value that will keep in toprgu nonrst RG:
+- mode-charger = <BOOT_CHARGER>;
+- mode-recovery = <BOOT_RECOVERY>;
+- mode-bootloader = <BOOT_BOOTLOADER>;
+- mode-dm-verity-dev-corrupt = <BOOT_DM_VERITY>;
+- mode-kpoc = <BOOT_KPOC>;
+- mode-ddr-reserve = <BOOT_DDR_RSVD>;
+- mode-meta = <BOOT_META>;
+- mode-rpmbpk = <BOOT_RPMBPK>;
Signature · 1 line
1.7.9.5