Merge 'partner/android-gs-pixel-mainline' into 'partner/android13-gs-pixel-5.15'

We are merging from android-gs-pixel-mainline since this branch has already
taken the android13-gs-pixel-5.10 merge. This is a one time merge to get the
5.15 branch up-to-date.

* partner/android-gs-pixel-mainline:
  power: reset: Add reboot-ab-update support
  power: reset: enable Kconfig support
  Update the project paths
  power: reset: remove all unused changes
  power: reset: add shutdown method
  power: reset: gs101: raise restart_handler priority
  power: reset: support psci sys reset and poweroff
  power: reset: raise restart_handler priority
  kleaf: //build/kleaf -> //build/kernel/kleaf.
  Update path for the SoC project
  Kleaf: add power_reset kernel module for cloudripper
  power: reset: add in_panic and in_warm for swreset
  power: reset: add in_panic and in_warm for swreset
  power: reset: support emergency_restart swreset
  power: reset: support emergency_restart swreset
  power: reset: gs201: support PS_HOLD cold reboot
  power: reset: gs201: fix power key detection
  power: reset: gs201: fix power_off function
  power: reset: use warm reboot by swreset
  power: reset: exynos-reboot: Initialize gs201 reset driver.

Change-Id: I560f62e42373cd152555b863de88f326103ae2ba
Signed-off-by: Will McVicker <willmcvicker@google.com>

6 files changed, 256 insertions, 17 deletions

diff --git a/BUILD.bazel b/BUILD.bazel
index 3da6d4a..8cc361c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -8,6 +8,16 @@
 
 load("//build/kernel/kleaf:kernel.bzl", "kernel_module")
 
+filegroup(
+    name = "reset.kconfig",
+    srcs = glob([
+        "Kconfig",
+    ]),
+    visibility = [
+        "//private/google-modules/soc/gs:__pkg__",
+    ],
+)
+
 kernel_module(
     name = "reset.slider",
     srcs = glob([
@@ -15,18 +25,18 @@ kernel_module(
         "**/*.h",
         "Kbuild",
     ]) + [
-        "//gs/google-modules/bms:headers",
-        "//gs/google-modules/soc-modules:gs101_soc_headers",
+        "//private/google-modules/bms:headers",
+        "//private/google-modules/soc/gs:gs101_soc_headers",
     ],
     outs = [
         "exynos-reboot.ko",
     ],
-    kernel_build = "//gs/google-modules/soc-modules:slider",
+    kernel_build = "//private/google-modules/soc/gs:slider",
     kernel_module_deps = [
-        "//gs/google-modules/bms:bms.slider",
-        "//gs/google-modules/soc-modules:gs101_soc",
+        "//private/google-modules/bms:bms.slider",
+        "//private/google-modules/soc/gs:gs101_soc",
     ],
     visibility = [
-        "//gs/google-modules/soc-modules:__pkg__",
+        "//private/google-modules/soc/gs:__pkg__",
     ],
 )
diff --git a/Kbuild b/Kbuild
index 50a7688..3191986 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1 +1,4 @@
+exynos-reboot-$(CONFIG_SOC_GS101) += exynos-gs101-reboot.o
+exynos-reboot-$(CONFIG_SOC_GS201) += exynos-gs201-reboot.o
+
 obj-$(CONFIG_POWER_RESET_EXYNOS) += exynos-reboot.o
diff --git a/Kconfig b/Kconfig
index df5c74e..377e513 100644
--- a/Kconfig
+++ b/Kconfig
@@ -1,5 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+
 config POWER_RESET_EXYNOS
-»   tristate "Samsung Exynos power-off driver"
-»   depends on SOC_GS101
-»   help
-»     Reboot support for Samsung Exynos boards.
+	tristate "Samsung Exynos power-off driver"
+	depends on SOC_GS101 || SOC_GS201
+	help
+	  Reboot support for Samsung Exynos boards.
diff --git a/Makefile b/Makefile
index 616b65e..9e5945f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
 KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build
 M ?= $(shell pwd)
 
-KBUILD_OPTIONS += CONFIG_POWER_RESET_EXYNOS=m
+EXTRA_SYMBOLS += $(OUT_DIR)/../private/google-modules/bms/Module.symvers
 
-EXTRA_SYMBOLS += $(OUT_DIR)/../gs/google-modules/bms/Module.symvers
-
-include $(KERNEL_SRC)/../gs/google-modules/soc-modules/Makefile.include
+include $(KERNEL_SRC)/../private/google-modules/soc/gs/Makefile.include
 
 modules modules_install clean:
 	$(MAKE) -C $(KERNEL_SRC) M=$(M) \
-	$(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@)
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@)
diff --git a/exynos-reboot.c b/exynos-gs101-reboot.c
index c834c28..95ac0e6 100644
--- a/exynos-reboot.c
+++ b/exynos-gs101-reboot.c
@@ -46,6 +46,7 @@ enum pon_reboot_mode {
 
 	REBOOT_MODE_DMVERITY_CORRUPTED	= 0x50,
 	REBOOT_MODE_SHUTDOWN_THERMAL	= 0x51,
+	REBOOT_MODE_AB_UPDATE		= 0x52,
 
 	REBOOT_MODE_RESCUE		= 0xF9,
 	REBOOT_MODE_FASTBOOT		= 0xFA,
@@ -142,6 +143,8 @@ static void exynos_reboot_parse(const char *cmd)
 			value = REBOOT_MODE_RESCUE;
 		else if (!strcmp(cmd, "shutdown-thermal"))
 			value = REBOOT_MODE_SHUTDOWN_THERMAL;
+		else if (!strcmp(cmd, "reboot-ab-update"))
+			value = REBOOT_MODE_AB_UPDATE;
 		else if (!strcmp(cmd, "from_fastboot") ||
 			 !strcmp(cmd, "shell") ||
 			 !strcmp(cmd, "userrequested") ||
@@ -189,7 +192,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod
 
 	if (s2mpg10_get_rev_id() == S2MPG10_EVT0 ||
 	    !rsbm_supported || !dbg_snapshot_get_reboot_status() ||
-	    dbg_snapshot_get_panic_status()) {
+	    dbg_snapshot_get_panic_status() || dbg_snapshot_get_warm_status()) {
 		set_priv_reg(pmu_alive_base + warm_reboot_offset, warm_reboot_trigger);
 	} else {
 		pr_emerg("Set PS_HOLD Low.\n");
@@ -205,7 +208,7 @@ static int exynos_restart_handler(struct notifier_block *this, unsigned long mod
 
 static struct notifier_block exynos_restart_nb = {
 	.notifier_call = exynos_restart_handler,
-	.priority = 128,
+	.priority = 130,
 };
 
 static int exynos_reboot_probe(struct platform_device *pdev)
diff --git a/exynos-gs201-reboot.c b/exynos-gs201-reboot.c
new file mode 100644
index 0000000..0f25600
--- /dev/null
+++ b/exynos-gs201-reboot.c
@@ -0,0 +1,223 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ *  exynos-reboot.c - Samsung Exynos SoC reset code
+ *
+ * Copyright (c) 2019-2021 Samsung Electronics Co., Ltd.
+ *
+ * Author: Hyunki Koo <hyunki00.koo@samsung.com>
+ *	   Youngmin Nam <youngmin.nam@samsung.com>
+ */
+
+#include <linux/delay.h>
+#include <linux/of.h>
+#include <linux/module.h>
+#include <linux/notifier.h>
+#include <linux/of_address.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/samsung/s2mpg12.h>
+#include <linux/platform_device.h>
+#include <linux/reboot.h>
+#if IS_ENABLED(CONFIG_GS_ACPM)
+#include <soc/google/acpm_ipc_ctrl.h>
+#endif
+#include <soc/google/exynos-el3_mon.h>
+#include "../../bms/google_bms.h"
+
+#define EXYNOS_PMU_SYSIP_DAT0		(0x0810)
+
+#define BMS_RSBM_VALID			BIT(31)
+
+static u32 reboot_cmd_offset;
+static phys_addr_t pmu_alive_base;
+
+enum pon_reboot_mode {
+	REBOOT_MODE_NORMAL		= 0x00,
+	REBOOT_MODE_CHARGE		= 0x0A,
+
+	REBOOT_MODE_DMVERITY_CORRUPTED	= 0x50,
+	REBOOT_MODE_SHUTDOWN_THERMAL	= 0x51,
+	REBOOT_MODE_AB_UPDATE		= 0x52,
+
+	REBOOT_MODE_RESCUE		= 0xF9,
+	REBOOT_MODE_FASTBOOT		= 0xFA,
+	REBOOT_MODE_BOOTLOADER		= 0xFC,
+	REBOOT_MODE_FACTORY		= 0xFD,
+	REBOOT_MODE_RECOVERY		= 0xFF,
+};
+
+static void exynos_reboot_mode_set(u32 val)
+{
+	int ret;
+	phys_addr_t reboot_cmd_addr = pmu_alive_base + reboot_cmd_offset;
+	u32 reboot_mode;
+
+	ret = set_priv_reg(reboot_cmd_addr, val);
+	if (ret) {
+		pr_info("%s(): failed to set addr %pap via set_priv_reg, using regmap\n",
+			__func__, &reboot_cmd_addr);
+	}
+
+	reboot_mode = val | BMS_RSBM_VALID;
+	ret = gbms_storage_write(GBMS_TAG_RSBM, &reboot_mode, sizeof(reboot_mode));
+	if (ret < 0)
+		pr_err("%s(): failed to write gbms storage: %d(%d)\n", __func__,
+		       GBMS_TAG_RSBM, ret);
+}
+
+static void exynos_reboot_parse(const char *cmd)
+{
+	if (cmd) {
+		u32 value = U32_MAX;
+
+		pr_info("Reboot command: '%s'\n", cmd);
+
+		if (!strcmp(cmd, "charge"))
+			value = REBOOT_MODE_CHARGE;
+		else if (!strcmp(cmd, "bootloader"))
+			value = REBOOT_MODE_BOOTLOADER;
+		else if (!strcmp(cmd, "fastboot"))
+			value = REBOOT_MODE_FASTBOOT;
+		else if (!strcmp(cmd, "recovery"))
+			value = REBOOT_MODE_RECOVERY;
+		else if (!strcmp(cmd, "dm-verity device corrupted"))
+			value = REBOOT_MODE_DMVERITY_CORRUPTED;
+		else if (!strcmp(cmd, "rescue"))
+			value = REBOOT_MODE_RESCUE;
+		else if (!strcmp(cmd, "shutdown-thermal"))
+			value = REBOOT_MODE_SHUTDOWN_THERMAL;
+		else if (!strcmp(cmd, "reboot-ab-update"))
+			value = REBOOT_MODE_AB_UPDATE;
+		else if (!strcmp(cmd, "from_fastboot") ||
+			 !strcmp(cmd, "shell") ||
+			 !strcmp(cmd, "userrequested") ||
+			 !strcmp(cmd, "userrequested,fastboot") ||
+			 !strcmp(cmd, "userrequested,recovery") ||
+			 !strcmp(cmd, "userrequested,recovery,ui"))
+			value = REBOOT_MODE_NORMAL;
+		else
+			pr_err("Unknown reboot command: '%s'\n", cmd);
+
+		if (value != U32_MAX)
+			exynos_reboot_mode_set(value);
+	}
+}
+
+static int exynos_reboot_handler(struct notifier_block *nb, unsigned long mode, void *cmd)
+{
+	exynos_reboot_parse(cmd);
+
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block exynos_reboot_nb = {
+	.notifier_call = exynos_reboot_handler,
+	.priority = INT_MAX,
+};
+
+static int exynos_restart_handler(struct notifier_block *this, unsigned long mode, void *cmd)
+{
+#if IS_ENABLED(CONFIG_GS_ACPM)
+	acpm_prepare_reboot();
+#endif
+
+	pr_info("ready to do restart.\n");
+
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block exynos_restart_nb = {
+	.notifier_call = exynos_restart_handler,
+	.priority = 130,
+};
+
+static void exynos_power_off(struct platform_device *pdev)
+{
+	while (1) {
+		/* wait for power button release */
+		if (!pmic_read_pwrkey_status()) {
+#if IS_ENABLED(CONFIG_GS_ACPM)
+			acpm_prepare_reboot();
+#endif
+			pr_info("ready to do power off.\n");
+			break;
+		} else {
+			/*
+			 * if power button is not released,
+			 * wait and check TA again
+			 */
+			pr_info("PWR Key is not released.\n");
+		}
+		mdelay(1000);
+	}
+}
+
+static int exynos_reboot_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct device_node *np = pdev->dev.of_node;
+	struct regmap *pmureg;
+	struct device_node *syscon_np;
+	struct resource res;
+	int err;
+
+	pmureg = syscon_regmap_lookup_by_phandle(np, "syscon");
+	if (IS_ERR(pmureg)) {
+		dev_err(dev, "Fail to get regmap of PMU\n");
+		return PTR_ERR(pmureg);
+	}
+
+	syscon_np = of_parse_phandle(np, "syscon", 0);
+	if (!syscon_np) {
+		dev_err(dev, "syscon device node not found\n");
+		return -EINVAL;
+	}
+
+	if (of_address_to_resource(syscon_np, 0, &res)) {
+		dev_err(dev, "failed to get syscon base address\n");
+		return -ENOMEM;
+	}
+
+	pmu_alive_base = res.start;
+
+	if (of_property_read_u32(np, "reboot-cmd-offset", &reboot_cmd_offset) < 0) {
+		dev_info(dev, "failed to find reboot-offset property, using default\n");
+		reboot_cmd_offset = EXYNOS_PMU_SYSIP_DAT0;
+	}
+
+	err = register_reboot_notifier(&exynos_reboot_nb);
+	if (err) {
+		dev_err(dev, "cannot register reboot handler (err=%d)\n", err);
+		return err;
+	}
+
+	err = register_restart_handler(&exynos_restart_nb);
+	if (err) {
+		dev_err(dev, "cannot register restart handler (err=%d)\n", err);
+		unregister_reboot_notifier(&exynos_reboot_nb);
+		return err;
+	}
+
+	dev_info(dev, "register restart handler successfully\n");
+
+	return 0;
+}
+
+static const struct of_device_id exynos_reboot_of_match[] = {
+	{ .compatible = "samsung,exynos-reboot" },
+	{}
+};
+
+static struct platform_driver exynos_reboot_driver = {
+	.probe = exynos_reboot_probe,
+	.shutdown = exynos_power_off,
+	.driver = {
+		.name = "exynos-reboot",
+		.of_match_table = exynos_reboot_of_match,
+	},
+};
+module_platform_driver(exynos_reboot_driver);
+
+MODULE_DESCRIPTION("Exynos Reboot driver");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:exynos-reboot");