2021-06-29 01:20:34

by Qing Zhang

[permalink] [raw]
Subject: [PATCH v5 1/2] MIPS: Loongson64: Add Loongson-2K1000 reset platform driver

Add power management register operations to support reboot and poweroff.

Signed-off-by: Qing Zhang <[email protected]>
---

v5-v6:
No change

drivers/platform/mips/Kconfig | 6 +++
drivers/platform/mips/Makefile | 1 +
drivers/platform/mips/ls2k-reset.c | 60 ++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+)
create mode 100644 drivers/platform/mips/ls2k-reset.c

diff --git a/drivers/platform/mips/Kconfig b/drivers/platform/mips/Kconfig
index 8ac149173c64..d421e1482395 100644
--- a/drivers/platform/mips/Kconfig
+++ b/drivers/platform/mips/Kconfig
@@ -30,4 +30,10 @@ config RS780E_ACPI
help
Loongson RS780E PCH ACPI Controller driver.

+config LS2K_RESET
+ bool "Loongson-2K1000 Reset Controller"
+ depends on MACH_LOONGSON64 || COMPILE_TEST
+ help
+ Loongson-2K1000 Reset Controller driver.
+
endif # MIPS_PLATFORM_DEVICES
diff --git a/drivers/platform/mips/Makefile b/drivers/platform/mips/Makefile
index 178149098777..4c71444e453a 100644
--- a/drivers/platform/mips/Makefile
+++ b/drivers/platform/mips/Makefile
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-$(CONFIG_CPU_HWMON) += cpu_hwmon.o
obj-$(CONFIG_RS780E_ACPI) += rs780e-acpi.o
+obj-$(CONFIG_LS2K_RESET) += ls2k-reset.o
diff --git a/drivers/platform/mips/ls2k-reset.c b/drivers/platform/mips/ls2k-reset.c
new file mode 100644
index 000000000000..c5f073c82c5e
--- /dev/null
+++ b/drivers/platform/mips/ls2k-reset.c
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2021, Qing Zhang <[email protected]>
+ * Loongson-2K1000 reset support
+ */
+
+#include <linux/of_address.h>
+#include <linux/pm.h>
+#include <asm/reboot.h>
+
+static char *pm_reg_name[] = {"pm1_sts", "pm1_cnt", "rst_cnt"};
+
+static void __iomem *get_reg_byname(struct device_node *node, const char *name)
+{
+ int index = of_property_match_string(node, "reg-names", name);
+
+ if (index < 0)
+ return NULL;
+
+ return of_iomap(node, index);
+}
+
+static void ls2k_restart(char *command)
+{
+ writel(0x1, (void *)pm_reg_name[2]);
+}
+
+static void ls2k_poweroff(void)
+{
+ /* Clear */
+ writel((readl((void *)pm_reg_name[0]) & 0xffffffff), (void *)pm_reg_name[0]);
+ /* Sleep Enable | Soft Off*/
+ writel(GENMASK(12, 10)|BIT(13), (void *)pm_reg_name[1]);
+}
+
+static int ls2k_reset_init(void)
+{
+ struct device_node *np;
+ int i;
+
+ np = of_find_node_by_type(NULL, "power management");
+ if (!np) {
+ pr_info("Failed to get PM node\n");
+ return -ENODEV;
+ }
+
+ for (i = 0; i < sizeof(pm_reg_name)/sizeof(char *); i++) {
+ pm_reg_name[i] = get_reg_byname(np, pm_reg_name[i]);
+ if (!pm_reg_name[i])
+ iounmap(pm_reg_name[i]);
+ }
+
+ _machine_restart = ls2k_restart;
+ pm_power_off = ls2k_poweroff;
+
+ of_node_put(np);
+ return 0;
+}
+
+arch_initcall(ls2k_reset_init);
--
2.31.0


2021-06-29 01:21:03

by Qing Zhang

[permalink] [raw]
Subject: [PATCH v5 2/2] MIPS: Loongson64: Add pm block node for Loongson-2K1000

The module is now supported, enable it.

Signed-off-by: Qing Zhang <[email protected]>
---

v4-v5:
add missing spaces

arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
index 569e814def83..38bf14f00694 100644
--- a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
+++ b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
@@ -101,6 +101,16 @@ uart0: serial@1fe00000 {
no-loopback-test;
};

+ pm: power-controller {
+ device_type = "power management";
+ compatible = "loongson, reset-controller";
+
+ reg = <0 0x1fe0700c 0 0x8>,
+ <0 0x1fe07014 0 0x8>,
+ <0 0x1fe07030 0 0x8>;
+ reg-names = "pm1_sts", "pm1_cnt", "rst_cnt";
+ };
+
pci@1a000000 {
compatible = "loongson,ls2k-pci";
device_type = "pci";
--
2.31.0

2021-06-29 03:17:37

by Jiaxun Yang

[permalink] [raw]
Subject: Re: [PATCH v5 2/2] MIPS: Loongson64: Add pm block node for Loongson-2K1000



?? 2021/6/29 ????9:19, Qing Zhang ะด??:
> The module is now supported, enable it.
>
> Signed-off-by: Qing Zhang <[email protected]>
> ---
>
> v4-v5:
> add missing spaces
>
> arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> index 569e814def83..38bf14f00694 100644
> --- a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> +++ b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> @@ -101,6 +101,16 @@ uart0: serial@1fe00000 {
> no-loopback-test;
> };
>
> + pm: power-controller {
^ power-management@1fe0700c
> + device_type = "power management";
^ Why do you need to specify device type?
> + compatible = "loongson, reset-controller";
^ why space?
I guess it should be loongson,ls2k-pm...

- Jiaxun
> +
> + reg = <0 0x1fe0700c 0 0x8>,
> + <0 0x1fe07014 0 0x8>,
> + <0 0x1fe07030 0 0x8>;
> + reg-names = "pm1_sts", "pm1_cnt", "rst_cnt";
^ I guess there is no need to specify three reg names, you can simply
tell driver 0x1fe07000
base address and calculate them on your own.

Thanks.

- Jiaxun
> + };
> +
> pci@1a000000 {
> compatible = "loongson,ls2k-pci";
> device_type = "pci";

2021-06-29 17:22:04

by Sergei Shtylyov

[permalink] [raw]
Subject: Re: [PATCH v5 2/2] MIPS: Loongson64: Add pm block node for Loongson-2K1000

On 6/29/21 4:19 AM, Qing Zhang wrote:

> The module is now supported, enable it.
>
> Signed-off-by: Qing Zhang <[email protected]>
> ---
>
> v4-v5:
> add missing spaces
>
> arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> index 569e814def83..38bf14f00694 100644
> --- a/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> +++ b/arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi
> @@ -101,6 +101,16 @@ uart0: serial@1fe00000 {
> no-loopback-test;
> };
>
> + pm: power-controller {
> + device_type = "power management";
> + compatible = "loongson, reset-controller";
^
When I said te space aren't allowed, I meant this place. :-)

> +
> + reg = <0 0x1fe0700c 0 0x8>,
> + <0 0x1fe07014 0 0x8>,
> + <0 0x1fe07030 0 0x8>;

TY! :-)

[...]

MBR, Sergei