* [PATCH v1 1/4] power: reset: add reboot mode driver
2019-11-26 5:34 [PATCH v1 0/4] Support MTK reboot mode driver freddy.hsin
@ 2019-11-26 5:34 ` freddy.hsin
2019-11-26 5:34 ` [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit) freddy.hsin
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: freddy.hsin @ 2019-11-26 5:34 UTC (permalink / raw)
To: sre, linux-pm, linux-kernel, wim, linux, matthias.bgg,
linux-watchdog, linux-arm-kernel, linux-mediatek, robh+dt,
mark.rutland, devicetree
Cc: Freddy Hsin, Chang-An.Chen, wsd_upstream
From: Freddy Hsin <freddy.hsin@mediatek.com>
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.
Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
---
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
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index a564237..31fedb8 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -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
diff --git a/drivers/power/reset/Makefile b/drivers/power/reset/Makefile
index 85da3198..2c64104 100644
--- a/drivers/power/reset/Makefile
+++ b/drivers/power/reset/Makefile
@@ -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
diff --git a/drivers/power/reset/mtk-reboot.c b/drivers/power/reset/mtk-reboot.c
new file mode 100644
index 0000000..545c427
--- /dev/null
+++ b/drivers/power/reset/mtk-reboot.c
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 MediaTek Inc.
+ * Author Freddy Hsin <freddy.hsin@mediatek.com>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/reboot.h>
+#include <linux/regmap.h>
+#include <linux/of_address.h>
+#include <linux/reboot-mode.h>
+
+static const struct regmap_config mtk_regmap_config = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+};
+
+struct mtk_reboot_mode {
+ struct regmap *map;
+ struct reboot_mode_driver reboot;
+ u32 offset;
+ u32 mask;
+};
+
+static int mtk_reboot_mode_write(struct reboot_mode_driver *reboot,
+ unsigned int magic)
+{
+ struct mtk_reboot_mode *mtk_rbm;
+ int ret;
+
+ mtk_rbm = container_of(reboot, struct mtk_reboot_mode, reboot);
+
+ ret = regmap_update_bits(mtk_rbm->map, mtk_rbm->offset,
+ mtk_rbm->mask, magic);
+ if (ret < 0)
+ dev_info(reboot->dev, "update reboot mode bits failed\n");
+
+ return ret;
+}
+
+static int mtk_regmap_lookup_by_phandle(struct device *dev,
+ struct mtk_reboot_mode *mtk_rbm)
+{
+ struct device_node *toprgu_np;
+ struct device_node *np = dev->of_node;
+ void __iomem *base;
+
+ toprgu_np = of_parse_phandle(np, "regmap", 0);
+
+ if (!of_device_is_compatible(toprgu_np, "mediatek,toprgu"))
+ return -EINVAL;
+
+ base = of_iomap(toprgu_np, 0);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
+
+ mtk_rbm->map = devm_regmap_init_mmio(dev, base,
+ &mtk_regmap_config);
+ return PTR_ERR_OR_ZERO(mtk_rbm->map);
+}
+
+static int mtk_reboot_mode_probe(struct platform_device *pdev)
+{
+ int ret;
+ struct mtk_reboot_mode *mtk_rbm;
+
+ mtk_rbm = devm_kzalloc(&pdev->dev, sizeof(*mtk_rbm), GFP_KERNEL);
+ if (!mtk_rbm)
+ return -ENOMEM;
+
+ mtk_rbm->reboot.dev = &pdev->dev;
+ mtk_rbm->reboot.write = mtk_reboot_mode_write;
+ mtk_rbm->mask = 0xf;
+
+ ret = mtk_regmap_lookup_by_phandle(&pdev->dev, mtk_rbm);
+ if (ret) {
+ dev_info(&pdev->dev, "Couldn't create the toprgu regmap\n");
+ return -EINVAL;
+ }
+
+ if (of_property_read_u32(pdev->dev.of_node, "offset",
+ &mtk_rbm->offset))
+ return -EINVAL;
+
+ of_property_read_u32(pdev->dev.of_node, "mask", &mtk_rbm->mask);
+
+ ret = devm_reboot_mode_register(&pdev->dev, &mtk_rbm->reboot);
+ if (ret)
+ dev_info(&pdev->dev, "can't register reboot mode\n");
+
+ return ret;
+}
+
+static const struct of_device_id mtk_reboot_mode_of_match[] = {
+ { .compatible = "toprgu-reboot-mode" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, mtk_reboot_mode_of_match);
+
+static struct platform_driver mtk_reboot_mode_driver = {
+ .probe = mtk_reboot_mode_probe,
+ .driver = {
+ .name = "toprgu-reboot-mode",
+ .of_match_table = mtk_reboot_mode_of_match,
+ },
+};
+module_platform_driver(mtk_reboot_mode_driver);
+
+MODULE_AUTHOR("Freddy Hsin <freddy.hsin@mediatek.com>");
+MODULE_DESCRIPTION("Mediatek reboot mode driver");
+MODULE_LICENSE("GPL v2");
--
1.7.9.5
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit)
2019-11-26 5:34 [PATCH v1 0/4] Support MTK reboot mode driver freddy.hsin
2019-11-26 5:34 ` [PATCH v1 1/4] power: reset: add " freddy.hsin
@ 2019-11-26 5:34 ` freddy.hsin
2019-11-26 12:18 ` Guenter Roeck
2019-11-26 5:34 ` [PATCH v1 3/4] soc: mediatek: add reboot-mode header freddy.hsin
2019-11-26 5:34 ` [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver freddy.hsin
3 siblings, 1 reply; 7+ messages in thread
From: freddy.hsin @ 2019-11-26 5:34 UTC (permalink / raw)
To: sre, linux-pm, linux-kernel, wim, linux, matthias.bgg,
linux-watchdog, linux-arm-kernel, linux-mediatek, robh+dt,
mark.rutland, devicetree
Cc: Freddy Hsin, Chang-An.Chen, wsd_upstream
From: Freddy Hsin <freddy.hsin@mediatek.com>
of_platform_population should be added in the probe function of
toprgu driver, or the reboot mode driver will not be probed
Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
---
drivers/watchdog/mtk_wdt.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 9c3d003..2fb2614 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -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;
--
1.7.9.5
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit)
2019-11-26 5:34 ` [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit) freddy.hsin
@ 2019-11-26 12:18 ` Guenter Roeck
0 siblings, 0 replies; 7+ messages in thread
From: Guenter Roeck @ 2019-11-26 12:18 UTC (permalink / raw)
To: freddy.hsin, sre, linux-pm, linux-kernel, wim, matthias.bgg,
linux-watchdog, linux-arm-kernel, linux-mediatek, robh+dt,
mark.rutland, devicetree
Cc: Chang-An.Chen, wsd_upstream
On 11/25/19 9:34 PM, freddy.hsin@mediatek.com wrote:
> From: Freddy Hsin <freddy.hsin@mediatek.com>
>
> of_platform_population should be added in the probe function of
> toprgu driver, or the reboot mode driver will not be probed
>
> Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
> ---
> drivers/watchdog/mtk_wdt.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> index 9c3d003..2fb2614 100644
> --- a/drivers/watchdog/mtk_wdt.c
> +++ b/drivers/watchdog/mtk_wdt.c
> @@ -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);
> +
This seems just wrong. Such a driver should not be a child of the watchdog driver.
Guenter
> mtk_wdt->wdt_dev.info = &mtk_wdt_info;
> mtk_wdt->wdt_dev.ops = &mtk_wdt_ops;
> mtk_wdt->wdt_dev.timeout = WDT_MAX_TIMEOUT;
>
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 3/4] soc: mediatek: add reboot-mode header
2019-11-26 5:34 [PATCH v1 0/4] Support MTK reboot mode driver freddy.hsin
2019-11-26 5:34 ` [PATCH v1 1/4] power: reset: add " freddy.hsin
2019-11-26 5:34 ` [PATCH v1 2/4] watchdog: populate reboot mode node in toprgu node of MTK RGU (Reset Generation Unit) freddy.hsin
@ 2019-11-26 5:34 ` freddy.hsin
2019-11-26 5:34 ` [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver freddy.hsin
3 siblings, 0 replies; 7+ messages in thread
From: freddy.hsin @ 2019-11-26 5:34 UTC (permalink / raw)
To: sre, linux-pm, linux-kernel, wim, linux, matthias.bgg,
linux-watchdog, linux-arm-kernel, linux-mediatek, robh+dt,
mark.rutland, devicetree
Cc: Freddy Hsin, Chang-An.Chen, wsd_upstream
From: Freddy Hsin <freddy.hsin@mediatek.com>
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.
Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
---
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
diff --git a/include/dt-bindings/soc/mediatek,boot-mode.h b/include/dt-bindings/soc/mediatek,boot-mode.h
new file mode 100644
index 0000000..f7d5107
--- /dev/null
+++ b/include/dt-bindings/soc/mediatek,boot-mode.h
@@ -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
--
1.7.9.5
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver
2019-11-26 5:34 [PATCH v1 0/4] Support MTK reboot mode driver freddy.hsin
` (2 preceding siblings ...)
2019-11-26 5:34 ` [PATCH v1 3/4] soc: mediatek: add reboot-mode header freddy.hsin
@ 2019-11-26 5:34 ` freddy.hsin
2019-12-05 19:08 ` Rob Herring
3 siblings, 1 reply; 7+ messages in thread
From: freddy.hsin @ 2019-11-26 5:34 UTC (permalink / raw)
To: sre, linux-pm, linux-kernel, wim, linux, matthias.bgg,
linux-watchdog, linux-arm-kernel, linux-mediatek, robh+dt,
mark.rutland, devicetree
Cc: Freddy Hsin, Chang-An.Chen, wsd_upstream
From: Freddy Hsin <freddy.hsin@mediatek.com>
Add documentation for MTK RGU (Reset Generation Unit) reboot driver.
Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
---
.../devicetree/bindings/power/reset/mtk-reboot.txt | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
diff --git a/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt b/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
new file mode 100644
index 0000000..708d351
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
@@ -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>;
--
1.7.9.5
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver
2019-11-26 5:34 ` [PATCH v1 4/4] dt-binding: power: reset: Add documentation for MTK RGU (Reset Gernation Unit) reboot driver freddy.hsin
@ 2019-12-05 19:08 ` Rob Herring
0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2019-12-05 19:08 UTC (permalink / raw)
To: freddy.hsin
Cc: mark.rutland, devicetree, linux-watchdog, wsd_upstream, linux-pm,
linux-kernel, sre, linux-mediatek, linux-arm-kernel,
matthias.bgg, Chang-An.Chen, wim, linux
On Tue, Nov 26, 2019 at 01:34:50PM +0800, freddy.hsin@mediatek.com wrote:
> From: Freddy Hsin <freddy.hsin@mediatek.com>
>
> Add documentation for MTK RGU (Reset Generation Unit) reboot driver.
>
> Signed-off-by: Freddy Hsin <freddy.hsin@mediatek.com>
> ---
> .../devicetree/bindings/power/reset/mtk-reboot.txt | 30 ++++++++++++++++++++
> 1 file changed, 30 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
>
> diff --git a/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt b/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
> new file mode 100644
> index 0000000..708d351
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/power/reset/mtk-reboot.txt
> @@ -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?
> +- regmap: this is phandle to the register map node
Make this node a child node of the phandle and get rid of this.
> +- 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>;
> --
> 1.7.9.5
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
^ permalink raw reply [flat|nested] 7+ messages in thread