android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "drivers: Restore kaslr offset during hibernation"

Browse Source
This commit is contained in:
qctecmdr 2023-09-09 03:31:08 -07:00 committed by Gerrit - the friendly Code Review server
commit 512d0d96f9
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/soc/qcom/memory_dump_v2.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2017, 2019-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#include <linux/slab.h>
@ -19,6 +20,7 @@
#include <linux/module.h>
#include <linux/of_reserved_mem.h>
#include <linux/qcom_scm.h>
#include <linux/syscore_ops.h>
#define MSM_DUMP_TABLE_VERSION MSM_DUMP_MAKE_VERSION(2, 0)
@ -114,6 +116,7 @@ struct msm_memory_dump {
#define SPRS_INITIALIZED BIT(1)
static struct msm_memory_dump memdump;
static size_t total_size;
/**
* reset_sprs_dump_table - reset the sprs dump table
@ -944,6 +947,18 @@ static int init_memdump_imem_area(size_t size)
return 0;
}
#ifdef CONFIG_HIBERNATION
static void memory_dump_syscore_resume(void)
{
if (init_memdump_imem_area(total_size))
pr_err("memdump failed to restore\n");
}
static struct syscore_ops memory_dump_syscore_ops = {
.resume = memory_dump_syscore_resume,
};
#endif
static int init_memory_dump(void *dump_vaddr, phys_addr_t phys_addr)
{
struct msm_dump_table *table;
@ -966,6 +981,10 @@ static int init_memory_dump(void *dump_vaddr, phys_addr_t phys_addr)
}
pr_info("MSM Memory Dump apps data table set up\n");
#ifdef CONFIG_HIBERNATION
register_syscore_ops(&memory_dump_syscore_ops);
#endif
return 0;
}
@ -1058,7 +1077,6 @@ static int mem_dump_alloc(struct platform_device *pdev)
struct msm_dump_data *dump_data;
struct msm_dump_entry dump_entry;
struct md_region md_entry;
size_t total_size;
u32 size, id = 0;
int ret, no_of_nodes;
dma_addr_t dma_handle;

13
drivers/soc/qcom/qcom_cpu_vendor_hooks.c
View File

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#define pr_fmt(fmt) "VendorHooks: " fmt
@ -16,6 +16,7 @@
#include <linux/atomic.h>
#include <linux/sched/debug.h>
#include <linux/io.h>
#include <linux/syscore_ops.h>
#include <soc/qcom/watchdog.h>
@ -134,6 +135,13 @@ static void store_kaslr_offset(void)
iounmap(mem);
}
#if defined(CONFIG_HIBERNATION)
static struct syscore_ops kaslr_offset_restore_syscore_ops = {
.resume = store_kaslr_offset,
};
#endif /* CONFIG_HIBERNATION */
#else
static void store_kaslr_offset(void) {}
#endif /* CONFIG_RANDOMIZE_BASE */
@ -143,6 +151,9 @@ static int cpu_vendor_hooks_driver_probe(struct platform_device *pdev)
int ret;
store_kaslr_offset();
#ifdef CONFIG_HIBERNATION
register_syscore_ops(&kaslr_offset_restore_syscore_ops);
#endif
ret = register_trace_android_vh_ipi_stop(trace_ipi_stop, NULL);
if (ret) {