diff options
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mediatek/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/misc/mediatek/Kconfig.kernel | 31 | ||||
| -rw-r--r-- | drivers/misc/mediatek/ram_console/Kconfig | 53 | ||||
| -rw-r--r-- | drivers/misc/mediatek/ram_console/mtk_ram_console.c | 647 | ||||
| -rw-r--r-- | drivers/misc/mediatek/ram_console/ram_console.h | 12 |
5 files changed, 545 insertions, 199 deletions
diff --git a/drivers/misc/mediatek/Kconfig b/drivers/misc/mediatek/Kconfig index 02d2d485e..f5e459a45 100644 --- a/drivers/misc/mediatek/Kconfig +++ b/drivers/misc/mediatek/Kconfig @@ -493,5 +493,6 @@ source "drivers/misc/mediatek/connectivity/Kconfig" source "drivers/misc/mediatek/hall/Kconfig" source "drivers/misc/mediatek/multibridge/Kconfig" source "drivers/misc/mediatek/m4u/Kconfig" +source "drivers/misc/mediatek/ram_console/Kconfig" endif diff --git a/drivers/misc/mediatek/Kconfig.kernel b/drivers/misc/mediatek/Kconfig.kernel index b25dc65e1..bed3667a4 100644 --- a/drivers/misc/mediatek/Kconfig.kernel +++ b/drivers/misc/mediatek/Kconfig.kernel @@ -96,37 +96,6 @@ config CPUTIME_STATS tristate "cputime profiling module for functions" select CPUTIME_SUPPORT default n - -config MTK_RAM_CONSOLE - bool "mt ram console" - -config MTK_RAM_CONSOLE_USING_SRAM - bool "Using SRAM as ram console storage" - depends on MTK_RAM_CONSOLE - -config MTK_RAM_CONSOLE_USING_DRAM - bool "Using DRAM as ram console storage" - depends on MTK_RAM_CONSOLE - -config MTK_RAM_CONSOLE_SIZE - hex "MTK RAM console address" - default 0 - depends on MTK_RAM_CONSOLE - -config MTK_RAM_CONSOLE_ADDR - hex "MTK RAM console buffer size" - default 0 - depends on MTK_RAM_CONSOLE - -config MTK_RAM_CONSOLE_DRAM_SIZE - hex "MTK RAM console dram address" - default 0 - depends on MTK_RAM_CONSOLE - -config MTK_RAM_CONSOLE_DRAM_ADDR - hex "MTK RAM console dram size" - default 0 - depends on MTK_RAM_CONSOLE config PREEMPT_MONITOR bool "mt preempt monitor" diff --git a/drivers/misc/mediatek/ram_console/Kconfig b/drivers/misc/mediatek/ram_console/Kconfig new file mode 100644 index 000000000..27c68e434 --- /dev/null +++ b/drivers/misc/mediatek/ram_console/Kconfig @@ -0,0 +1,53 @@ +config MTK_RAM_CONSOLE + bool "mt ram console" + help + ram_console is a feature which will record some + debug information and can be read after reboot. + It can be configured as SRAM or DRAM. + Each ram type should be set address and size. + +config MTK_RAM_CONSOLE_USING_SRAM + bool "Using SRAM as ram console storage" + depends on MTK_RAM_CONSOLE + help + If set this config as yes, ram_console will use + SRAM as its storage, all ram_console content + will write into SRAM. + You should set SRAM address and size as belows. + +config MTK_RAM_CONSOLE_USING_DRAM + bool "Using DRAM as ram console storage" + depends on MTK_RAM_CONSOLE + help + If set this config as yes, ram_console will use + DRAM as its storage, all ram_console content + will write into DRAM. + You should set DRAM address and size as belows. + +config MTK_RAM_CONSOLE_SIZE + hex "MTK RAM console address" + default 0 + depends on MTK_RAM_CONSOLE + help + SRAM ram_console memory allocate size. + +config MTK_RAM_CONSOLE_ADDR + hex "MTK RAM console buffer size" + default 0 + depends on MTK_RAM_CONSOLE + help + SRAM ram_console address. + +config MTK_RAM_CONSOLE_DRAM_SIZE + hex "MTK RAM console dram address" + default 0 + depends on MTK_RAM_CONSOLE + help + DRAM ram_console memory allocate size. + +config MTK_RAM_CONSOLE_DRAM_ADDR + hex "MTK RAM console dram size" + default 0 + depends on MTK_RAM_CONSOLE + help + DRAM ram_console address. diff --git a/drivers/misc/mediatek/ram_console/mtk_ram_console.c b/drivers/misc/mediatek/ram_console/mtk_ram_console.c index 4f5ee935b..9cd56a53d 100644 --- a/drivers/misc/mediatek/ram_console/mtk_ram_console.c +++ b/drivers/misc/mediatek/ram_console/mtk_ram_console.c @@ -18,21 +18,25 @@ #include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_reserved_mem.h> -#include <asm/io.h> -#include <mach/mt_reg_dump.h> +#include <linux/pstore.h> +#include <linux/io.h> #include <mach/wd_api.h> +#include "ram_console.h" +//#include <mt-plat/mt_debug_latch.h> #define RAM_CONSOLE_HEADER_STR_LEN 1024 static int mtk_cpu_num; +static int ram_console_init_done; + /* This group of API call by sub-driver module to report reboot reasons aee_rr_* stand for previous reboot reason */ struct last_reboot_reason { uint32_t fiq_step; - uint32_t exp_type; /* 0xaeedeadX: X=1 (HWT), X=2 (KE), X=3 (nested panic) */ + uint32_t exp_type; /* 0xaeedeadX: X=1 (HWT), X=2 (KE), X=3 (nested panic) */ uint32_t reboot_mode; uint32_t last_irq_enter[NR_CPUS]; @@ -45,26 +49,30 @@ struct last_reboot_reason { char last_sched_comm[NR_CPUS][TASK_COMM_LEN]; uint8_t hotplug_data1[NR_CPUS]; - uint8_t hotplug_data2; + uint8_t hotplug_data2; uint64_t hotplug_data3; uint32_t mcdi_wfi; uint32_t mcdi_r15; uint32_t deepidle_data; + uint32_t sodi3_data; uint32_t sodi_data; uint32_t spm_suspend_data; uint64_t cpu_dormant[NR_CPUS]; uint32_t clk_data[8]; uint32_t suspend_debug_flag; - + + uint32_t vcore_dvfs_opp; + uint32_t vcore_dvfs_status; + uint8_t cpu_dvfs_vproc_big; uint8_t cpu_dvfs_vproc_little; uint8_t cpu_dvfs_oppidx; uint8_t cpu_dvfs_status; - + uint8_t gpu_dvfs_vgpu; uint8_t gpu_dvfs_oppidx; - uint8_t gpu_dvfs_status; + uint8_t gpu_dvfs_status; uint64_t ptp_cpu_big_volt; uint64_t ptp_cpu_little_volt; @@ -80,6 +88,7 @@ struct last_reboot_reason { uint8_t thermal_temp5; uint8_t thermal_status; + uint8_t isr_el1; void *kparams; }; @@ -97,17 +106,17 @@ struct ram_console_buffer { uint32_t sig; /* for size comptible */ uint32_t off_pl; - uint32_t off_lpl; /* last preloader: struct reboot_reason_pl*/ + uint32_t off_lpl; /* last preloader: struct reboot_reason_pl */ uint32_t sz_pl; uint32_t off_lk; - uint32_t off_llk; /* last lk: struct reboot_reason_lk */ + uint32_t off_llk; /* last lk: struct reboot_reason_lk */ uint32_t sz_lk; uint32_t padding[3]; - uint32_t sz_buffer; - uint32_t off_linux; /* struct last_reboot_reason */ + uint32_t sz_buffer; + uint32_t off_linux; /* struct last_reboot_reason */ uint32_t off_console; - /* console buffer*/ + /* console buffer */ uint32_t log_start; uint32_t log_size; uint32_t sz_console; @@ -117,7 +126,7 @@ struct ram_console_buffer { static int FIQ_log_size = sizeof(struct ram_console_buffer); static struct ram_console_buffer *ram_console_buffer; -static struct ram_console_buffer *ram_console_old ; +static struct ram_console_buffer *ram_console_old; static struct ram_console_buffer *ram_console_buffer_pa; static DEFINE_SPINLOCK(ram_console_lock); @@ -139,7 +148,7 @@ static void *_memcpy(void *dest, const void *src, size_t count) #endif #define LAST_RR_SEC_VAL(header, sect, type, item) \ - header->off_##sect ? ((type*)((void*)header + header->off_##sect))->item : 0 + (header->off_##sect ? ((type *)((void *)header + header->off_##sect))->item : 0) #define LAST_RRR_BUF_VAL(buf, rr_item) LAST_RR_SEC_VAL(buf, linux, struct last_reboot_reason, rr_item) #define LAST_RRPL_BUF_VAL(buf, rr_item) LAST_RR_SEC_VAL(buf, pl, struct reboot_reason_pl, rr_item) #define LAST_RRR_VAL(rr_item) LAST_RR_SEC_VAL(ram_console_old, linux, struct last_reboot_reason, rr_item) @@ -153,26 +162,26 @@ unsigned int ram_console_size(void) #ifdef CONFIG_MTK_EMMC_SUPPORT #ifdef CONFIG_MTK_AEE_IPANIC #include <linux/mmc/sd_misc.h> -extern int card_dump_func_write(unsigned char *buf, unsigned int len, unsigned long long offset, - int dev); #define EMMC_ADDR 0X700000 static char *ram_console2_log; -extern int boot_finish; -extern struct file *expdb_open(void); + void last_kmsg_store_to_emmc(void) { int buff_size; - struct wd_api*wd_api = NULL; + struct wd_api *wd_api = NULL; + get_wd_api(&wd_api); - -// if(num_online_cpus() > 1){ - if(wd_api->wd_get_check_bit() > 1){ - printk(KERN_ERR"ram_console: online cpu %d!\n",wd_api->wd_get_check_bit()); - if(boot_finish == 0) - return; + +/* if(num_online_cpus() > 1){ */ + if (wd_api->wd_get_check_bit() > 1) { + pr_err("ram_console: online cpu %d!\n", wd_api->wd_get_check_bit()); +//#ifdef CONFIG_MTPROF + if (boot_finish == 0) + return; +//#endif } - + /* save log to emmc */ buff_size = ram_console_buffer->sz_buffer; card_dump_func_write((unsigned char *)ram_console_buffer, buff_size, EMMC_ADDR, @@ -185,6 +194,7 @@ static int ram_console_lastk_show(struct ram_console_buffer *buffer, struct seq_ static int ram_console2_show(struct seq_file *m, void *v) { struct ram_console_buffer *bufp = NULL; + bufp = (struct ram_console_buffer *)ram_console2_log; seq_printf(m, "show last_kmsg2 sig %d, size %d", bufp->sig, bufp->log_size); ram_console_lastk_show(bufp, m, v); @@ -205,6 +215,55 @@ static const struct file_operations ram_console2_file_ops = { .release = single_release, }; +static int emmc_read_last_kmsg(void *data) +{ + int ret; + struct file *filp; + + struct proc_dir_entry *entry; + struct ram_console_buffer *bufp = NULL; + int timeout = 0; + + ram_console2_log = kzalloc(ram_console_buffer->sz_buffer, GFP_KERNEL); + if (ram_console2_log == NULL) + return 1; + + do { + filp = expdb_open(); + if (timeout++ > 60) { + pr_err("ram_console: open expdb partition error [%ld]!\n", PTR_ERR(filp)); + return 1; + } + msleep(500); + } while (IS_ERR(filp)); + ret = kernel_read(filp, EMMC_ADDR, ram_console2_log, ram_console_buffer->sz_buffer); + fput(filp); + if (IS_ERR(ERR_PTR(ret))) { + kfree(ram_console2_log); + ram_console2_log = NULL; + pr_err("ram_console: read emmc data 2 error!\n"); + return 1; + } + + bufp = (struct ram_console_buffer *)ram_console2_log; + if (bufp->sig != REBOOT_REASON_SIG) { + kfree(ram_console2_log); + ram_console2_log = NULL; + pr_err("ram_console: emmc read data sig is not match!\n"); + return 1; + } + + entry = proc_create("last_kmsg2", 0444, NULL, &ram_console2_file_ops); + if (!entry) { + pr_err("ram_console: failed to create proc entry\n"); + kfree(ram_console2_log); + ram_console2_log = NULL; + return 1; + } + pr_err("ram_console: create last_kmsg2 ok.\n"); + return 0; + +} #else void last_kmsg_store_to_emmc(void) { @@ -212,13 +271,43 @@ void last_kmsg_store_to_emmc(void) #endif #endif -//#ifdef CONFIG_PSTORE -#if 0 -extern void pstore_bconsole_write(struct console *con, const char *s, unsigned c); +#ifdef CONFIG_PSTORE void sram_log_save(const char *msg, int count) { pstore_bconsole_write(NULL, msg, count); } + +void pstore_console_show(enum pstore_type_id type_id, struct seq_file *m, void *v) +{ + struct pstore_info *psi = psinfo; + char *buf = NULL; + ssize_t size; + u64 id; + int count; + enum pstore_type_id type; + struct timespec time; + bool compressed; + + if (!psi) + return; + mutex_lock(&psi->read_mutex); + if (psi->open && psi->open(psi)) + goto out; + + while ((size = psi->read(&id, &type, &count, &time, &buf, &compressed, psi)) > 0) { + /*pr_err("ram_console: id %lld, type %d, count %d, size %zx\n", id, type, count, + size);*/ + if (type == type_id) + seq_write(m, buf, size); + kfree(buf); + buf = NULL; + } + + if (psi->close) + psi->close(psi); +out: + mutex_unlock(&psi->read_mutex); +} #else void sram_log_save(const char *msg, int count) { @@ -233,7 +322,7 @@ void sram_log_save(const char *msg, int count) } buffer = ram_console_buffer; - rc_console = (char*)ram_console_buffer + ram_console_buffer->off_console; + rc_console = (char *)ram_console_buffer + ram_console_buffer->off_console; /* count >= buffer_size, full the buffer */ if (count >= ram_console_buffer_size) { @@ -241,24 +330,22 @@ void sram_log_save(const char *msg, int count) ram_console_buffer_size); buffer->log_start = 0; buffer->log_size = ram_console_buffer_size; - } else if (count > (ram_console_buffer_size - buffer->log_start)) /* count > last buffer, full them and fill the head buffer */ - { + } else if (count > (ram_console_buffer_size - buffer->log_start)) { + /* count > last buffer, full them and fill the head buffer */ rem = ram_console_buffer_size - buffer->log_start; memcpy(rc_console + buffer->log_start, msg, rem); memcpy(rc_console, msg + rem, count - rem); buffer->log_start = count - rem; buffer->log_size = ram_console_buffer_size; - } else /* count <= last buffer, fill in free buffer */ - { + } else { + /* count <= last buffer, fill in free buffer */ memcpy(rc_console + buffer->log_start, msg, count); /* count <= last buffer, fill them */ buffer->log_start += count; buffer->log_size += count; - if (buffer->log_start >= ram_console_buffer_size) { + if (buffer->log_start >= ram_console_buffer_size) buffer->log_start = 0; - } - if (buffer->log_size > ram_console_buffer_size) { + if (buffer->log_size > ram_console_buffer_size) buffer->log_size = ram_console_buffer_size; - } } } @@ -273,9 +360,10 @@ void aee_sram_fiq_save_bin(const char *msg, size_t len) { int i; char buf[20]; + for (i = 0; i < len;) { - snprintf(buf, sizeof(long)*2 + 2, FORMAT_LONG, *(long*)(msg + i)); - sram_log_save(buf, sizeof(long)*2 + 1); + snprintf(buf, sizeof(long) * 2 + 2, FORMAT_LONG, *(long *)(msg + i)); + sram_log_save(buf, sizeof(long) * 2 + 1); i += sizeof(long); if (i % 32 == 0) sram_log_save("\n", 1); @@ -285,7 +373,6 @@ void aee_sram_fiq_save_bin(const char *msg, size_t len) void aee_disable_ram_console_write(void) { atomic_set(&rc_in_fiq, 1); - return; } void aee_sram_fiq_log(const char *msg) @@ -294,9 +381,8 @@ void aee_sram_fiq_log(const char *msg) int delay = 100; unsigned int ram_console_buffer_size = ram_console_size(); - if (FIQ_log_size + count > ram_console_buffer_size) { + if (FIQ_log_size + count > ram_console_buffer_size) return; - } atomic_set(&rc_in_fiq, 1); @@ -340,13 +426,16 @@ void ram_console_enable_console(int enabled) static int ram_console_check_header(struct ram_console_buffer *buffer) { - int i; - if (!buffer || (buffer->sz_buffer != ram_console_buffer->sz_buffer) || buffer->off_pl > buffer->sz_buffer - || buffer->off_lk > buffer->sz_buffer || buffer->off_linux > buffer->sz_buffer || buffer->off_console > buffer->sz_buffer) { + /*int i; */ + if (!buffer || (buffer->sz_buffer != ram_console_buffer->sz_buffer) + || buffer->off_pl > buffer->sz_buffer || buffer->off_lk > buffer->sz_buffer + || buffer->off_linux > buffer->sz_buffer || buffer->off_console > buffer->sz_buffer) { pr_err("ram_console: ilegal header."); - for (i = 0; i < 16; i++) - pr_debug("0x%x ", ((int*)buffer)[i]); - pr_debug("\n"); + /* + for (i = 0; i < 16; i++) + pr_debug("0x%x ", ((int*)buffer)[i]); + pr_debug("\n"); + */ return -1; } else return 0; @@ -355,32 +444,43 @@ static int ram_console_check_header(struct ram_console_buffer *buffer) static int ram_console_lastk_show(struct ram_console_buffer *buffer, struct seq_file *m, void *v) { unsigned int wdt_status; + if (ram_console_check_header(buffer) && buffer->sz_buffer != 0) { - pr_err("ram_console: buffer %p, size %x(%x)\n", buffer, buffer->sz_buffer, ram_console_buffer->sz_buffer); + pr_err("ram_console: buffer %p, size %x(%x)\n", buffer, buffer->sz_buffer, + ram_console_buffer->sz_buffer); if (buffer) seq_write(m, buffer, ram_console_buffer->sz_buffer); else - seq_printf(m, "NO VALID DATA.\n"); + seq_puts(m, "NO VALID DATA.\n"); return 0; } if (buffer->off_pl == 0 || buffer->off_pl + ALIGN(buffer->sz_pl, 64) != buffer->off_lpl) { /* workaround for compatiblity to old preloader & lk (OTA) */ - wdt_status = *((unsigned char*)buffer + 12); + wdt_status = *((unsigned char *)buffer + 12); } else wdt_status = LAST_RRPL_BUF_VAL(buffer, wdt_status); - + seq_printf(m, "ram console header, hw_status: %u, fiq step %u.\n", wdt_status, LAST_RRR_BUF_VAL(buffer, fiq_step)); - if (buffer->off_console != 0 && buffer->off_linux + ALIGN(sizeof(struct last_reboot_reason), 64) == buffer->off_console - && buffer->sz_console == buffer->sz_buffer - buffer->off_console && buffer->log_size <= buffer->sz_console && - buffer->log_start <= buffer->sz_console) { - seq_write(m, (void*)buffer + buffer->off_console + buffer->log_start, buffer->log_size - buffer->log_start); - seq_write(m, (void*)buffer + buffer->off_console, buffer->log_start); +#ifdef CONFIG_PSTORE_CONSOLE + /*pr_err("ram_console: pstore show start\n");*/ + pstore_console_show(PSTORE_TYPE_CONSOLE, m, v); + /*pr_err("ram_console: pstore show end\n");*/ +#else + if (buffer->off_console != 0 + && buffer->off_linux + ALIGN(sizeof(struct last_reboot_reason), + 64) == buffer->off_console + && buffer->sz_console == buffer->sz_buffer - buffer->off_console + && buffer->log_size <= buffer->sz_console && buffer->log_start <= buffer->sz_console) { + seq_write(m, (void *)buffer + buffer->off_console + buffer->log_start, + buffer->log_size - buffer->log_start); + seq_write(m, (void *)buffer + buffer->off_console, buffer->log_start); } else { - seq_printf(m, "header may be corrupted, dump the raw buffer for reference only\n"); + seq_puts(m, "header may be corrupted, dump the raw buffer for reference only\n"); seq_write(m, buffer, ram_console_buffer->sz_buffer); } +#endif return 0; } @@ -400,22 +500,24 @@ static int __init ram_console_init(struct ram_console_buffer *buffer, size_t buf ram_console_buffer = buffer; if (buffer->sig != REBOOT_REASON_SIG) { - memset((void*)buffer, 0, buffer_size); + memset_io((void *)buffer, 0, buffer_size); buffer->sig = REBOOT_REASON_SIG; } ram_console_save_old(buffer, buffer_size); if (buffer->sz_lk != 0 && buffer->off_lk + ALIGN(buffer->sz_lk, 64) == buffer->off_llk) buffer->off_linux = buffer->off_llk + ALIGN(buffer->sz_lk, 64); else - buffer->off_linux = 512; /* OTA:leave enough space for pl/lk */ + buffer->off_linux = 512; /* OTA:leave enough space for pl/lk */ buffer->sz_buffer = buffer_size; buffer->off_console = buffer->off_linux + ALIGN(sizeof(struct last_reboot_reason), 64); buffer->sz_console = buffer->sz_buffer - buffer->off_console; - memset((void*)buffer + buffer->off_linux, 0, buffer_size - buffer->off_linux); -//#ifndef CONFIG_PSTORE -#if 1 + buffer->log_start = 0; + buffer->log_size = 0; + memset_io((void *)buffer + buffer->off_linux, 0, buffer_size - buffer->off_linux); +#ifndef CONFIG_PSTORE register_console(&ram_console); #endif + ram_console_init_done = 1; return 0; } @@ -434,14 +536,13 @@ static void *remap_lowmem(phys_addr_t start, phys_addr_t size) prot = pgprot_noncached(PAGE_KERNEL); - pages = kmalloc(sizeof(struct page *) * page_count, GFP_KERNEL); - if (!pages) { - pr_err("%s: Failed to allocate array for %u pages\n", __func__, page_count); + pages = kmalloc_array(page_count, sizeof(struct page *), GFP_KERNEL); + if (!pages) return NULL; - } for (i = 0; i < page_count; i++) { phys_addr_t addr = page_start + i * PAGE_SIZE; + pages[i] = pfn_to_page(addr >> PAGE_SHIFT); } vaddr = vmap(pages, page_count, VM_MAP, prot); @@ -455,26 +556,27 @@ static void *remap_lowmem(phys_addr_t start, phys_addr_t size) } #endif -typedef struct { - unsigned int start; - unsigned int size; -} mem_desc_t; +struct mem_desc_t { + unsigned long start; + unsigned long size; +}; #if defined(CONFIG_MTK_RAM_CONSOLE_USING_SRAM) #ifdef CONFIG_OF static int __init dt_get_ram_console(unsigned long node, const char *uname, int depth, void *data) { - mem_desc_t *sram; - if (depth != 1 ||(strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) - return 0; - - sram = (mem_desc_t *) of_get_flat_dt_prop(node, "non_secure_sram", NULL); - if(sram){ - pr_notice("ram_console:[DT] 0x%x@0x%x\n", sram->size, sram->start); - *(mem_desc_t*)data = *sram; - } + struct mem_desc_t *sram; + + if (depth != 1 || (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0)) + return 0; + + sram = (struct mem_desc_t *) of_get_flat_dt_prop(node, "non_secure_sram", NULL); + if (sram) { + pr_notice("ram_console:[DT] 0x%lx@0x%lx\n", sram->size, sram->start); + *(struct mem_desc_t *) data = *sram; + } - return 1; + return 1; } #endif #endif @@ -485,30 +587,38 @@ static int __init ram_console_early_init(void) size_t buffer_size = 0; #if defined(CONFIG_MTK_RAM_CONSOLE_USING_SRAM) #ifdef CONFIG_OF - mem_desc_t sram = {0}; + struct mem_desc_t sram = { 0 }; + if (of_scan_flat_dt(dt_get_ram_console, &sram)) { if (sram.start == 0) { sram.start = CONFIG_MTK_RAM_CONSOLE_ADDR; sram.size = CONFIG_MTK_RAM_CONSOLE_SIZE; } bufp = ioremap(sram.start, sram.size); - ram_console_buffer_pa = sram.start; + ram_console_buffer_pa = (struct ram_console_buffer *)sram.start; if (bufp) buffer_size = sram.size; else { - pr_err("ram_console: ioremap failed, [0x%x, 0x%x]\n", sram.start, sram.size); + pr_err("ram_console: ioremap failed, [0x%lx, 0x%lx]\n", sram.start, + sram.size); return 0; } } else { return 0; } #else - bufp = (struct ram_console_buffer *)CONFIG_MTK_RAM_CONSOLE_ADDR; - buffer_size = CONFIG_MTK_RAM_CONSOLE_SIZE; + bufp = ioremap(CONFIG_MTK_RAM_CONSOLE_ADDR, CONFIG_MTK_RAM_CONSOLE_SIZE); + if (bufp) + buffer_size = CONFIG_MTK_RAM_CONSOLE_SIZE; + ram_console_buffer_pa = CONFIG_MTK_RAM_CONSOLE_ADDR; + else { + pr_err("ram_console: ioremap failed, [0x%x, 0x%x]\n", sram.start, sram.size); + return 0; + } #endif #elif defined(CONFIG_MTK_RAM_CONSOLE_USING_DRAM) bufp = remap_lowmem(CONFIG_MTK_RAM_CONSOLE_DRAM_ADDR, CONFIG_MTK_RAM_CONSOLE_DRAM_SIZE); - ram_console_buffer_pa = CONFIG_MTK_RAM_CONSOLE_DRAM_ADDR; + ram_console_buffer_pa = (struct ram_console_buffer *)CONFIG_MTK_RAM_CONSOLE_DRAM_ADDR; if (bufp == NULL) { pr_err("ram_console: ioremap failed\n"); return 0; @@ -550,6 +660,7 @@ static int __init ram_console_late_init(void) #ifdef CONFIG_MTK_AEE_IPANIC int err; static struct task_struct *thread; + thread = kthread_run(emmc_read_last_kmsg, 0, "read_poweroff_log"); if (IS_ERR(thread)) { err = PTR_ERR(thread); @@ -561,76 +672,88 @@ static int __init ram_console_late_init(void) if (!entry) { pr_err("ram_console: failed to create proc entry\n"); kfree(ram_console_old); - ram_console_old = NULL; + ram_console_old = NULL; return 0; } return 0; } + console_initcall(ram_console_early_init); late_initcall(ram_console_late_init); -int ram_console_pstore_reserve_memory(struct reserved_mem *rmem, unsigned long node, const char *uname) +int ram_console_pstore_reserve_memory(struct reserved_mem *rmem) +{ + pr_alert("[memblock]%s: 0x%llx - 0x%llx (0x%llx)\n", "pstore-reserve-memory", + (unsigned long long)rmem->base, + (unsigned long long)rmem->base + (unsigned long long)rmem->size, + (unsigned long long)rmem->size); + return 0; +} + +int ram_console_binary_reserve_memory(struct reserved_mem *rmem) { - pr_alert("[memblock]%s: 0x%llx - 0x%llx (0x%llx)\n", uname, (unsigned long long)rmem->base, - (unsigned long long)rmem->base + (unsigned long long)rmem->size, (unsigned long long)rmem->size); + pr_alert("[memblock]%s: 0x%llx - 0x%llx (0x%llx)\n", "ram_console-reserve-memory", + (unsigned long long)rmem->base, + (unsigned long long)rmem->base + (unsigned long long)rmem->size, + (unsigned long long)rmem->size); return 0; } -RESERVEDMEM_OF_DECLARE(reserve_memory_pstore, "pstore-reserve-memory", ram_console_pstore_reserve_memory); + +RESERVEDMEM_OF_DECLARE(reserve_memory_pstore, "pstore-reserve-memory", + ram_console_pstore_reserve_memory); +RESERVEDMEM_OF_DECLARE(reserve_memory_ram_console, "mediatek,ram_console", + ram_console_binary_reserve_memory); /* aee sram flags save */ -#define RR_BASE(stage) ((void*)ram_console_buffer + ram_console_buffer->off_##stage) -#define RR_LINUX ((struct last_reboot_reason*)RR_BASE(linux)) -#define RR_BASE_PA(stage) ((void*)ram_console_buffer_pa + ram_console_buffer->off_##stage) -#define RR_LINUX_PA ((struct last_reboot_reason*)RR_BASE_PA(linux)) - -#define LAST_RR_SET(rr_item, value) \ - if (ram_console_buffer) { \ - RR_LINUX->rr_item = value; \ - } +#define RR_BASE(stage) ((void *)ram_console_buffer + ram_console_buffer->off_##stage) +#define RR_LINUX ((struct last_reboot_reason *)RR_BASE(linux)) +#define RR_BASE_PA(stage) ((void *)ram_console_buffer_pa + ram_console_buffer->off_##stage) +#define RR_LINUX_PA ((struct last_reboot_reason *)RR_BASE_PA(linux)) -#define LAST_RR_SET_WITH_ID(rr_item, id, value) \ - if (ram_console_buffer) { \ - RR_LINUX->rr_item[id] = value; \ - } +/*NOTICE: You should check if ram_console is null before call these macros*/ +#define LAST_RR_SET(rr_item, value) (RR_LINUX->rr_item = value) + +#define LAST_RR_SET_WITH_ID(rr_item, id, value) (RR_LINUX->rr_item[id] = value) #define LAST_RR_VAL(rr_item) \ (ram_console_buffer ? RR_LINUX->rr_item : 0) -#define LAST_RR_GET(rr_item) \ - return LAST_RR_VAL(rr_item) - #define LAST_RR_MEMCPY(rr_item, str, len) \ - if (ram_console_buffer) { \ - strlcpy(RR_LINUX->rr_item, str, len); \ - } + (strlcpy(RR_LINUX->rr_item, str, len)) #define LAST_RR_MEMCPY_WITH_ID(rr_item, id, str, len) \ - if (ram_console_buffer) { \ - strlcpy(RR_LINUX->rr_item[id], str, len); \ - } + (strlcpy(RR_LINUX->rr_item[id], str, len)) void aee_rr_rec_reboot_mode(u8 mode) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(reboot_mode, mode); } void aee_rr_rec_kdump_params(void *params) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(kparams, params); } void aee_rr_rec_fiq_step(u8 step) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(fiq_step, step); } int aee_rr_curr_fiq_step(void) { - LAST_RR_GET(fiq_step); + return LAST_RR_VAL(fiq_step); } void aee_rr_rec_exp_type(unsigned int type) { + if (!ram_console_init_done || !ram_console_buffer) + return; if (LAST_RR_VAL(exp_type) == 0 && type < 16) LAST_RR_SET(exp_type, 0xaeedead0 | type); } @@ -638,40 +761,49 @@ void aee_rr_rec_exp_type(unsigned int type) unsigned int aee_rr_curr_exp_type(void) { unsigned int exp_type = LAST_RR_VAL(exp_type); + return (exp_type ^ 0xaeedead0) < 16 ? exp_type ^ 0xaeedead0 : exp_type; } /* composite api */ void aee_rr_rec_last_irq_enter(int cpu, int irq, u64 jiffies) { - if (cpu >= 0 && cpu < NR_CPUS) { + if (!ram_console_init_done || !ram_console_buffer) + return; + if (cpu >= 0 && cpu < num_possible_cpus()) { LAST_RR_SET_WITH_ID(last_irq_enter, cpu, irq); LAST_RR_SET_WITH_ID(jiffies_last_irq_enter, cpu, jiffies); } - mb(); + mb(); /*TODO:need add comments */ } void aee_rr_rec_last_irq_exit(int cpu, int irq, u64 jiffies) { - if (cpu >=0 && cpu < NR_CPUS) { + if (!ram_console_init_done || !ram_console_buffer) + return; + if (cpu >= 0 && cpu < num_possible_cpus()) { LAST_RR_SET_WITH_ID(last_irq_exit, cpu, irq); LAST_RR_SET_WITH_ID(jiffies_last_irq_exit, cpu, jiffies); } - mb(); + mb(); /*TODO:need add comments */ } void aee_rr_rec_last_sched_jiffies(int cpu, u64 jiffies, const char *comm) { - if (cpu >=0 && cpu < NR_CPUS) { + if (!ram_console_init_done || !ram_console_buffer) + return; + if (cpu >= 0 && cpu < num_possible_cpus()) { LAST_RR_SET_WITH_ID(jiffies_last_sched, cpu, jiffies); LAST_RR_MEMCPY_WITH_ID(last_sched_comm, cpu, comm, TASK_COMM_LEN); } - mb(); + mb(); /*TODO:need add comments */ } void aee_rr_rec_hoplug(int cpu, u8 data1, u8 data2) { - if (cpu >=0 && cpu < NR_CPUS) { + if (!ram_console_init_done || !ram_console_buffer) + return; + if (cpu >= 0 && cpu < num_possible_cpus()) { LAST_RR_SET_WITH_ID(hotplug_data1, cpu, data1); if (cpu == 0) LAST_RR_SET(hotplug_data2, data2); @@ -680,80 +812,109 @@ void aee_rr_rec_hoplug(int cpu, u8 data1, u8 data2) void aee_rr_rec_hotplug(int cpu, u8 data1, u8 data2, unsigned long data3) { - if (cpu >=0 && cpu < NR_CPUS) { + if (!ram_console_init_done || !ram_console_buffer) + return; + if (cpu >= 0 && cpu < num_possible_cpus()) { LAST_RR_SET_WITH_ID(hotplug_data1, cpu, data1); if (cpu == 0) { LAST_RR_SET(hotplug_data2, data2); - LAST_RR_SET(hotplug_data3, (uint64_t)data3); + LAST_RR_SET(hotplug_data3, (uint64_t) data3); } } } void aee_rr_rec_clk(int id, u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET_WITH_ID(clk_data, id, val); } void aee_rr_rec_deepidle_val(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(deepidle_data, val); } u32 aee_rr_curr_deepidle_val(void) { - LAST_RR_GET(deepidle_data); + return LAST_RR_VAL(deepidle_data); } void aee_rr_rec_mcdi_wfi_val(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(mcdi_wfi, val); } u32 aee_rr_curr_mcdi_wfi_val(void) { - LAST_RR_GET(mcdi_wfi); + return LAST_RR_VAL(mcdi_wfi); } void aee_rr_rec_mcdi_r15_val(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(mcdi_r15, val); } void aee_rr_rec_sodi_val(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(sodi_data, val); } +void aee_rr_rec_sodi3_val(u32 val) +{ + if (!ram_console_init_done) + return; + LAST_RR_SET(sodi3_data, val); +} + +u32 aee_rr_curr_sodi3_val(void) +{ + if (!ram_console_init_done) + return 0; + return LAST_RR_VAL(sodi3_data); +} + u32 aee_rr_curr_sodi_val(void) { - LAST_RR_GET(sodi_data); + return LAST_RR_VAL(sodi_data); } void aee_rr_rec_spm_suspend_val(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(spm_suspend_data, val); } u32 aee_rr_curr_spm_suspend_val(void) { - LAST_RR_GET(spm_suspend_data); + return LAST_RR_VAL(spm_suspend_data); } /* special case without MMU, return addr directly, strongly suggest not to use */ unsigned int *aee_rr_rec_mcdi_wfi(void) { -#if 0 +#if 0 if (ram_console_buffer) return &RR_LINUX->mcdi_wfi; else -#endif return NULL; +#endif + return NULL; } unsigned long *aee_rr_rec_cpu_dormant(void) { if (ram_console_buffer) - return (unsigned long*)&RR_LINUX->cpu_dormant; + return (unsigned long *)&RR_LINUX->cpu_dormant; else return NULL; } @@ -761,166 +922,247 @@ unsigned long *aee_rr_rec_cpu_dormant(void) unsigned long *aee_rr_rec_cpu_dormant_pa(void) { if (ram_console_buffer_pa) - return (unsigned long*)&RR_LINUX_PA->cpu_dormant; + return (unsigned long *)&RR_LINUX_PA->cpu_dormant; else return NULL; } +void aee_rr_rec_vcore_dvfs_opp(u32 val) +{ + if (!ram_console_init_done) + return; + LAST_RR_SET(vcore_dvfs_opp, val); +} + +u32 aee_rr_curr_vcore_dvfs_opp(void) +{ + return LAST_RR_VAL(vcore_dvfs_opp); +} + +void aee_rr_rec_vcore_dvfs_status(u32 val) +{ + if (!ram_console_init_done) + return; + LAST_RR_SET(vcore_dvfs_status, val); +} + +u32 aee_rr_curr_vcore_dvfs_status(void) +{ + return LAST_RR_VAL(vcore_dvfs_status); +} + void aee_rr_rec_cpu_dvfs_vproc_big(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(cpu_dvfs_vproc_big, val); } void aee_rr_rec_cpu_dvfs_vproc_little(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(cpu_dvfs_vproc_little, val); } void aee_rr_rec_cpu_dvfs_oppidx(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(cpu_dvfs_oppidx, val); } u8 aee_rr_curr_cpu_dvfs_oppidx(void) { - LAST_RR_GET(cpu_dvfs_oppidx); + return LAST_RR_VAL(cpu_dvfs_oppidx); } void aee_rr_rec_cpu_dvfs_status(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(cpu_dvfs_status, val); } u8 aee_rr_curr_cpu_dvfs_status(void) { - LAST_RR_GET(cpu_dvfs_status); + return LAST_RR_VAL(cpu_dvfs_status); } void aee_rr_rec_gpu_dvfs_vgpu(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(gpu_dvfs_vgpu, val); } void aee_rr_rec_gpu_dvfs_oppidx(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(gpu_dvfs_oppidx, val); } void aee_rr_rec_gpu_dvfs_status(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(gpu_dvfs_status, val); } u8 aee_rr_curr_gpu_dvfs_status(void) { - LAST_RR_GET(gpu_dvfs_status); + return LAST_RR_VAL(gpu_dvfs_status); } void aee_rr_rec_ptp_cpu_big_volt(u64 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(ptp_cpu_big_volt, val); } void aee_rr_rec_ptp_cpu_little_volt(u64 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(ptp_cpu_little_volt, val); } void aee_rr_rec_ptp_gpu_volt(u64 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(ptp_gpu_volt, val); } void aee_rr_rec_ptp_temp(u64 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(ptp_temp, val); } void aee_rr_rec_ptp_status(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(ptp_status, val); } void aee_rr_rec_thermal_temp1(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_temp1, val); } + void aee_rr_rec_thermal_temp2(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_temp2, val); } + void aee_rr_rec_thermal_temp3(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_temp3, val); } + void aee_rr_rec_thermal_temp4(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_temp4, val); } + void aee_rr_rec_thermal_temp5(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_temp5, val); } void aee_rr_rec_thermal_status(u8 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(thermal_status, val); } +void aee_rr_rec_isr_el1(u8 val) +{ + if (!ram_console_init_done || !ram_console_buffer) + return; + LAST_RR_SET(isr_el1, val); +} u64 aee_rr_curr_ptp_cpu_big_volt(void) { - LAST_RR_GET(ptp_cpu_big_volt); + return LAST_RR_VAL(ptp_cpu_big_volt); } u64 aee_rr_curr_ptp_cpu_little_volt(void) { - LAST_RR_GET(ptp_cpu_little_volt); + return LAST_RR_VAL(ptp_cpu_little_volt); } u64 aee_rr_curr_ptp_gpu_volt(void) { - LAST_RR_GET(ptp_gpu_volt); + return LAST_RR_VAL(ptp_gpu_volt); } u64 aee_rr_curr_ptp_temp(void) { - LAST_RR_GET(ptp_temp); + return LAST_RR_VAL(ptp_temp); } u8 aee_rr_curr_ptp_status(void) { - LAST_RR_GET(ptp_status); + return LAST_RR_VAL(ptp_status); } u8 aee_rr_curr_thermal_temp1(void) { - LAST_RR_GET(thermal_temp1); + return LAST_RR_VAL(thermal_temp1); } + u8 aee_rr_curr_thermal_temp2(void) { - LAST_RR_GET(thermal_temp2); + return LAST_RR_VAL(thermal_temp2); } + u8 aee_rr_curr_thermal_temp3(void) { - LAST_RR_GET(thermal_temp3); + return LAST_RR_VAL(thermal_temp3); } + u8 aee_rr_curr_thermal_temp4(void) { - LAST_RR_GET(thermal_temp4); + return LAST_RR_VAL(thermal_temp4); } + u8 aee_rr_curr_thermal_temp5(void) { - LAST_RR_GET(thermal_temp5); + return LAST_RR_VAL(thermal_temp5); } u8 aee_rr_curr_thermal_status(void) { - LAST_RR_GET(thermal_status); + return LAST_RR_VAL(thermal_status); +} + +u8 aee_rr_curr_isr_el1(void) +{ + return LAST_RR_VAL(isr_el1); } void aee_rr_rec_suspend_debug_flag(u32 val) { + if (!ram_console_init_done || !ram_console_buffer) + return; LAST_RR_SET(suspend_debug_flag, val); } @@ -930,16 +1172,17 @@ int aee_rr_last_fiq_step(void) return LAST_RRR_VAL(fiq_step); } -typedef void (*last_rr_show_t)(struct seq_file *m); -typedef void (*last_rr_show_cpu_t)(struct seq_file *m, int cpu); +typedef void (*last_rr_show_t) (struct seq_file *m); +typedef void (*last_rr_show_cpu_t) (struct seq_file *m, int cpu); void aee_rr_show_wdt_status(struct seq_file *m) { unsigned int wdt_status; struct ram_console_buffer *buffer = ram_console_old; + if (buffer->off_pl == 0 || buffer->off_pl + ALIGN(buffer->sz_pl, 64) != buffer->off_lpl) { /* workaround for compatiblity to old preloader & lk (OTA) */ - wdt_status = *((unsigned char*)buffer + 12); + wdt_status = *((unsigned char *)buffer + 12); } else wdt_status = LAST_RRPL_VAL(wdt_status); seq_printf(m, "WDT status: %d", wdt_status); @@ -953,7 +1196,9 @@ void aee_rr_show_fiq_step(struct seq_file *m) void aee_rr_show_exp_type(struct seq_file *m) { unsigned int exp_type = LAST_RRR_VAL(exp_type); - seq_printf(m, " exception type: %u\n", (exp_type ^ 0xaeedead0) < 16 ? exp_type ^ 0xaeedead0 : exp_type); + + seq_printf(m, " exception type: %u\n", + (exp_type ^ 0xaeedead0) < 16 ? exp_type ^ 0xaeedead0 : exp_type); } void aee_rr_show_last_irq_enter(struct seq_file *m, int cpu) @@ -986,11 +1231,12 @@ void aee_rr_show_hotplug_data2(struct seq_file *m, int cpu) if (cpu == 0) seq_printf(m, "%d, ", LAST_RRR_VAL(hotplug_data2)); } + void aee_rr_show_hotplug_data3(struct seq_file *m, int cpu) { if (cpu == 0) seq_printf(m, "0x%llx", LAST_RRR_VAL(hotplug_data3)); - seq_printf(m, "\n"); + seq_puts(m, "\n"); } void aee_rr_show_mcdi(struct seq_file *m) @@ -1008,6 +1254,11 @@ void aee_rr_show_deepidle(struct seq_file *m) seq_printf(m, "deepidle: 0x%x\n", LAST_RRR_VAL(deepidle_data)); } +void aee_rr_show_sodi3(struct seq_file *m) +{ + seq_printf(m, "sodi3: 0x%x\n", LAST_RRR_VAL(sodi3_data)); +} + void aee_rr_show_sodi(struct seq_file *m) { seq_printf(m, "sodi: 0x%x\n", LAST_RRR_VAL(sodi_data)); @@ -1025,11 +1276,22 @@ void aee_rr_show_cpu_dormant(struct seq_file *m, int cpu) void aee_rr_show_clk(struct seq_file *m) { - int i=0; - for(i=0; i<8; i++) + int i = 0; + + for (i = 0; i < 8; i++) seq_printf(m, "clk_data: 0x%x\n", LAST_RRR_VAL(clk_data[i])); } +void aee_rr_show_vcore_dvfs_opp(struct seq_file *m) +{ + seq_printf(m, "vcore_dvfs_opp: 0x%x\n", LAST_RRR_VAL(vcore_dvfs_opp)); +} + +void aee_rr_show_vcore_dvfs_status(struct seq_file *m) +{ + seq_printf(m, "vcore_dvfs_status: 0x%x\n", LAST_RRR_VAL(vcore_dvfs_status)); +} + void aee_rr_show_cpu_dvfs_vproc_big(struct seq_file *m) { seq_printf(m, "cpu_dvfs_vproc_big: 0x%x\n", LAST_RRR_VAL(cpu_dvfs_vproc_big)); @@ -1069,22 +1331,28 @@ void aee_rr_show_gpu_dvfs_status(struct seq_file *m) void aee_rr_show_ptp_cpu_big_volt(struct seq_file *m) { int i; + for (i = 0; i < 8; i++) - seq_printf(m, "ptp_cpu_big_volt[%d] = %llx\n", i, (LAST_RRR_VAL(ptp_cpu_big_volt) >> (i*8)) & 0xFF); + seq_printf(m, "ptp_cpu_big_volt[%d] = %llx\n", i, + (LAST_RRR_VAL(ptp_cpu_big_volt) >> (i * 8)) & 0xFF); } void aee_rr_show_ptp_cpu_little_volt(struct seq_file *m) { int i; + for (i = 0; i < 8; i++) - seq_printf(m, "ptp_cpu_little_volt[%d] = %llx\n", i, (LAST_RRR_VAL(ptp_cpu_little_volt) >> (i*8)) & 0xFF); + seq_printf(m, "ptp_cpu_little_volt[%d] = %llx\n", i, + (LAST_RRR_VAL(ptp_cpu_little_volt) >> (i * 8)) & 0xFF); } void aee_rr_show_ptp_gpu_volt(struct seq_file *m) { int i; - for (i = 0; i < 8; i++) - seq_printf(m, "ptp_gpu_volt[%d] = %llx\n", i, (LAST_RRR_VAL(ptp_gpu_volt) >> (i*8)) & 0xFF); + + for (i = 0; i < 8; i++) + seq_printf(m, "ptp_gpu_volt[%d] = %llx\n", i, + (LAST_RRR_VAL(ptp_gpu_volt) >> (i * 8)) & 0xFF); } void aee_rr_show_ptp_temp(struct seq_file *m) @@ -1113,14 +1381,21 @@ void aee_rr_show_thermal_status(struct seq_file *m) seq_printf(m, "thermal_status: %d\n", LAST_RRR_VAL(thermal_status)); } +void aee_rr_show_isr_el1(struct seq_file *m) +{ + seq_printf(m, "isr_el1: %d\n", LAST_RRR_VAL(isr_el1)); +} + __weak uint32_t get_suspend_debug_flag(void) { - LAST_RR_GET(suspend_debug_flag); + return LAST_RR_VAL(suspend_debug_flag); } + void aee_rr_show_suspend_debug_flag(struct seq_file *m) { - uint32_t flag = get_suspend_debug_flag(); - seq_printf(m, "SPM Suspend debug = 0x%x\n", flag ); + uint32_t flag = get_suspend_debug_flag(); + + seq_printf(m, "SPM Suspend debug = 0x%x\n", flag); } int __weak mt_reg_dump(char *buf) @@ -1131,23 +1406,48 @@ int __weak mt_reg_dump(char *buf) void aee_rr_show_last_pc(struct seq_file *m) { char *reg_buf = kmalloc(4096, GFP_KERNEL); - if (reg_buf && mt_reg_dump(reg_buf) == 0) { - seq_printf(m, "%s\n", reg_buf); + + if (reg_buf) { + if (mt_reg_dump(reg_buf) == 0) + seq_printf(m, "%s\n", reg_buf); kfree(reg_buf); } } +int __weak mt_lastbus_dump(char *buf) +{ + return 1; +} + +void aee_rr_show_last_bus(struct seq_file *m) +{ + char *reg_buf = kmalloc(4096, GFP_KERNEL); + + if (reg_buf) { + if (mt_lastbus_dump) { + mt_lastbus_dump(reg_buf); + seq_printf(m, "%s\n", reg_buf); + } + kfree(reg_buf); + } +} + + last_rr_show_t aee_rr_show[] = { aee_rr_show_wdt_status, aee_rr_show_fiq_step, aee_rr_show_exp_type, aee_rr_show_last_pc, + aee_rr_show_last_bus, aee_rr_show_mcdi, aee_rr_show_mcdi_r15, aee_rr_show_suspend_debug_flag, aee_rr_show_deepidle, + aee_rr_show_sodi3, aee_rr_show_sodi, aee_rr_show_spm_suspend, + aee_rr_show_vcore_dvfs_opp, + aee_rr_show_vcore_dvfs_status, aee_rr_show_clk, aee_rr_show_cpu_dvfs_vproc_big, aee_rr_show_cpu_dvfs_vproc_little, @@ -1162,7 +1462,8 @@ last_rr_show_t aee_rr_show[] = { aee_rr_show_ptp_temp, aee_rr_show_ptp_status, aee_rr_show_thermal_temp, - aee_rr_show_thermal_status + aee_rr_show_thermal_status, + aee_rr_show_isr_el1 }; last_rr_show_cpu_t aee_rr_show_cpu[] = { @@ -1176,21 +1477,31 @@ last_rr_show_cpu_t aee_rr_show_cpu[] = { aee_rr_show_cpu_dormant, }; +last_rr_show_t aee_rr_last_xxx[] = { + aee_rr_show_last_pc, + aee_rr_show_last_bus, + aee_rr_show_suspend_debug_flag +}; + #define array_size(x) (sizeof(x) / sizeof((x)[0])) int aee_rr_reboot_reason_show(struct seq_file *m, void *v) { int i, cpu; + if (ram_console_check_header(ram_console_old)) { - seq_printf(m, "NO VALID DATA.\n"); + seq_puts(m, "NO VALID DATA.\n"); + seq_puts(m, "Only try to dump last_XXX.\n"); + for (i = 0; i < array_size(aee_rr_last_xxx); i++) + aee_rr_last_xxx[i] (m); return 0; } for (i = 0; i < array_size(aee_rr_show); i++) - aee_rr_show[i](m); + aee_rr_show[i] (m); - for (cpu = 0; cpu < NR_CPUS; cpu++) { + for (cpu = 0; cpu < num_possible_cpus(); cpu++) { seq_printf(m, "CPU %d\n", cpu); for (i = 0; i < array_size(aee_rr_show_cpu); i++) - aee_rr_show_cpu[i](m, cpu); + aee_rr_show_cpu[i] (m, cpu); } return 0; } diff --git a/drivers/misc/mediatek/ram_console/ram_console.h b/drivers/misc/mediatek/ram_console/ram_console.h new file mode 100644 index 000000000..e7e94d509 --- /dev/null +++ b/drivers/misc/mediatek/ram_console/ram_console.h @@ -0,0 +1,12 @@ +#ifndef __RAM_CONSOLE_H__ +#define __RAM_CONSOLE_H__ +extern int card_dump_func_write(unsigned char *buf, unsigned int len, unsigned long long offset, + int dev); +#ifdef CONFIG_MTPROF +extern int boot_finish; +#endif +extern struct file *expdb_open(void); +#ifdef CONFIG_PSTORE +extern void pstore_bconsole_write(struct console *con, const char *s, unsigned c); +#endif +#endif |