Merge "power: reset: Support Minidump select option in dump type" (d2f5b905) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/kernel/smp.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		#include <asm/ptrace.h>
		#include <asm/virt.h>
		#include <asm/system_misc.h>
		#include <soc/qcom/minidump.h>

		#include <soc/qcom/scm.h>

		@@ -860,6 +861,7 @@ static void ipi_cpu_stop(unsigned int cpu, struct pt_regs *regs)
		pr_crit("CPU%u: stopping\n", cpu);
		__show_regs(regs);
		dump_stack();
		dump_stack_minidump(regs->sp);
		raw_spin_unlock(&stop_lock);
		}

drivers/cpuidle/lpm-levels.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include <soc/qcom/event_timer.h>
		#include <soc/qcom/lpm-stats.h>
		#include <soc/qcom/system_pm.h>
		#include <soc/qcom/minidump.h>
		#include <asm/arch_timer.h>
		#include <asm/suspend.h>
		#include <asm/cpuidle.h>
		@@ -1621,6 +1622,7 @@ static int lpm_probe(struct platform_device *pdev)
		int ret;
		int size;
		struct kobject *module_kobj = NULL;
		struct md_region md_entry;

		get_online_cpus();
		lpm_root_node = lpm_of_parse_cluster(pdev);
		@@ -1677,6 +1679,14 @@ static int lpm_probe(struct platform_device *pdev)
		goto failed;
		}

		/* Add lpm_debug to Minidump*/
		strlcpy(md_entry.name, "KLPMDEBUG", sizeof(md_entry.name));
		md_entry.virt_addr = (uintptr_t)lpm_debug;
		md_entry.phys_addr = lpm_debug_phys;
		md_entry.size = size;
		if (msm_minidump_add_region(&md_entry))
		pr_info("Failed to add lpm_debug in Minidump\n");

		return 0;
		failed:
		free_cluster_node(lpm_root_node);

drivers/power/reset/msm-poweroff.c

+59 −3

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include <soc/qcom/scm.h>
		#include <soc/qcom/restart.h>
		#include <soc/qcom/watchdog.h>
		#include <soc/qcom/minidump.h>

		#define EMERGENCY_DLOAD_MAGIC1 0x322A4F99
		#define EMERGENCY_DLOAD_MAGIC2 0xC67E4350
		@@ -42,10 +43,11 @@
		#define SCM_IO_DISABLE_PMIC_ARBITER 1
		#define SCM_IO_DEASSERT_PS_HOLD 2
		#define SCM_WDOG_DEBUG_BOOT_PART 0x9
		#define SCM_DLOAD_MODE 0X10
		#define SCM_DLOAD_FULLDUMP 0X10
		#define SCM_EDLOAD_MODE 0X01
		#define SCM_DLOAD_CMD 0x10

		#define SCM_DLOAD_MINIDUMP 0X20
		#define SCM_DLOAD_BOTHDUMPS (SCM_DLOAD_MINIDUMP \| SCM_DLOAD_FULLDUMP)

		static int restart_mode;
		static void restart_reason, dload_type_addr;
		@@ -72,6 +74,7 @@ static struct kobject dload_kobj;
		#endif

		static int in_panic;
		static int dload_type = SCM_DLOAD_FULLDUMP;
		static void *dload_mode_addr;
		static bool dload_mode_enabled;
		static void *emergency_dload_mode_addr;
		@@ -140,7 +143,7 @@ static void set_dload_mode(int on)
		mb();
		}

		ret = scm_set_dload_mode(on ? SCM_DLOAD_MODE : 0, 0);
		ret = scm_set_dload_mode(on ? dload_type : 0, 0);
		if (ret)
		pr_err("Failed to set secure DLOAD mode: %d\n", ret);

		@@ -438,6 +441,9 @@ static ssize_t show_emmc_dload(struct kobject kobj, struct attribute attr,
		{
		uint32_t read_val, show_val;

		if (!dload_type_addr)
		return -ENODEV;

		read_val = __raw_readl(dload_type_addr);
		if (read_val == EMMC_DLOAD_TYPE)
		show_val = 1;
		@@ -453,6 +459,9 @@ static size_t store_emmc_dload(struct kobject kobj, struct attribute attr,
		uint32_t enabled;
		int ret;

		if (!dload_type_addr)
		return -ENODEV;

		ret = kstrtouint(buf, 0, &enabled);
		if (ret < 0)
		return ret;
		@@ -467,10 +476,57 @@ static size_t store_emmc_dload(struct kobject kobj, struct attribute attr,

		return count;
		}

		#ifdef CONFIG_QCOM_MINIDUMP
		static DEFINE_MUTEX(tcsr_lock);

		static ssize_t show_dload_mode(struct kobject kobj, struct attribute attr,
		char *buf)
		{
		return scnprintf(buf, PAGE_SIZE, "DLOAD dump type: %s\n",
		(dload_type == SCM_DLOAD_BOTHDUMPS) ? "both" :
		((dload_type == SCM_DLOAD_MINIDUMP) ? "mini" : "full"));
		}

		static size_t store_dload_mode(struct kobject kobj, struct attribute attr,
		const char *buf, size_t count)
		{
		if (sysfs_streq(buf, "full")) {
		dload_type = SCM_DLOAD_FULLDUMP;
		} else if (sysfs_streq(buf, "mini")) {
		if (!msm_minidump_enabled()) {
		pr_err("Minidump is not enabled\n");
		return -ENODEV;
		}
		dload_type = SCM_DLOAD_MINIDUMP;
		} else if (sysfs_streq(buf, "both")) {
		if (!msm_minidump_enabled()) {
		pr_err("Minidump not enabled, setting fulldump only\n");
		dload_type = SCM_DLOAD_FULLDUMP;
		return count;
		}
		dload_type = SCM_DLOAD_BOTHDUMPS;
		} else{
		pr_err("Invalid Dump setup request..\n");
		pr_err("Supported dumps:'full', 'mini', or 'both'\n");
		return -EINVAL;
		}

		mutex_lock(&tcsr_lock);
		/Overwrite TCSR reg/
		set_dload_mode(dload_type);
		mutex_unlock(&tcsr_lock);
		return count;
		}
		RESET_ATTR(dload_mode, 0644, show_dload_mode, store_dload_mode);
		#endif
		RESET_ATTR(emmc_dload, 0644, show_emmc_dload, store_emmc_dload);

		static struct attribute *reset_attrs[] = {
		&reset_attr_emmc_dload.attr,
		#ifdef CONFIG_QCOM_MINIDUMP
		&reset_attr_dload_mode.attr,
		#endif
		NULL
		};

drivers/soc/qcom/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ obj-$(CONFIG_MSM_CORE_HANG_DETECT) += core_hang_detect.o
		obj-$(CONFIG_QCOM_DCC_V2) += dcc_v2.o
		obj-$(CONFIG_MSM_GLADIATOR_HANG_DETECT) += gladiator_hang_detect.o
		obj-$(CONFIG_MSM_GLADIATOR_ERP) += gladiator_erp.o
		obj-$(CONFIG_QCOM_MINIDUMP) += msm_minidump.o
		obj-$(CONFIG_QCOM_MINIDUMP) += msm_minidump.o minidump_log.o
		obj-$(CONFIG_QCOM_SECURE_BUFFER) += secure_buffer.o
		obj-$(CONFIG_QCOM_MEMORY_DUMP_V2) += memory_dump_v2.o
		obj-$(CONFIG_QCOM_WATCHDOG_V2) += watchdog_v2.o

drivers/soc/qcom/cpuss_dump.c

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -74,6 +74,8 @@ static int cpuss_dump_probe(struct platform_device *pdev)

		dump_data->addr = dump_addr;
		dump_data->len = size;
		scnprintf(dump_data->name, sizeof(dump_data->name),
		"KCPUSS%X", id);
		dump_entry.id = id;
		dump_entry.addr = virt_to_phys(dump_data);
		ret = msm_dump_data_register(MSM_DUMP_TABLE_APPS, &dump_entry);