Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "msm: cachedump: Drop support for using IMEM"

This commit is contained in:
Linux Build Service Account 2013-11-20 06:14:09 -08:00 committed by Gerrit - the friendly Code Review server
parent 82b2ccb9ba 29572a8260
commit d0f496ad40
2 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/cache/msm_cache_dump.txt vendored
View File

@ -9,10 +9,6 @@ Required properties:
- qcom,memory-reservation-size: Combined reserved memory for the dump buffers
- qcom,memory-reservation-type: Type of memory to be reserved
Optional properties:
- qcom,use-imem-dump-offset: If specified, store cache dump buffer addresses
in IMEM rather than using the memory dump reservation table.
Example:
qcom,cache_dump {
compatible = "qcom,cache_dump";

42
arch/arm/mach-msm/msm_cache_dump.c
View File

@ -41,18 +41,11 @@ static void *msm_cache_dump_vaddr;
*/
static struct l1_cache_dump *l1_dump;
static struct l2_cache_dump *l2_dump;
static int use_imem_dump_offset;
static int msm_cache_dump_panic(struct notifier_block *this,
unsigned long event, void *ptr)
{
#ifdef CONFIG_MSM_CACHE_DUMP_ON_PANIC
/*
* Clear the bootloader magic so the dumps aren't overwritten
*/
if (use_imem_dump_offset)
__raw_writel(0, MSM_IMEM_BASE + L2_DUMP_OFFSET);
scm_call_atomic1(L1C_SERVICE_ID, CACHE_BUFFER_DUMP_COMMAND_ID, 2);
scm_call_atomic1(L1C_SERVICE_ID, CACHE_BUFFER_DUMP_COMMAND_ID, 1);
#endif
@ -90,15 +83,9 @@ static int msm_cache_dump_probe(struct platform_device *pdev)
"qcom,l2-dump-size", &l2_size);
if (ret)
return ret;
use_imem_dump_offset = of_property_read_bool(pdev->dev.of_node,
"qcom,use-imem-dump-offset");
} else {
l1_size = d->l1_size;
l2_size = d->l2_size;
/* Non-DT targets assume the IMEM dump offset shall be used */
use_imem_dump_offset = 1;
};
total_size = l1_size + l2_size;
@ -143,26 +130,21 @@ static int msm_cache_dump_probe(struct platform_device *pdev)
__func__, ret);
#endif
if (use_imem_dump_offset)
__raw_writel(msm_cache_dump_addr + l1_size,
MSM_IMEM_BASE + L2_DUMP_OFFSET);
else {
l1_dump_entry.id = MSM_L1_CACHE;
l1_dump_entry.start_addr = msm_cache_dump_addr;
l1_dump_entry.end_addr = l1_dump_entry.start_addr + l1_size - 1;
l1_dump_entry.id = MSM_L1_CACHE;
l1_dump_entry.start_addr = msm_cache_dump_addr;
l1_dump_entry.end_addr = l1_dump_entry.start_addr + l1_size - 1;
l2_dump_entry.id = MSM_L2_CACHE;
l2_dump_entry.start_addr = msm_cache_dump_addr + l1_size;
l2_dump_entry.end_addr = l2_dump_entry.start_addr + l2_size - 1;
l2_dump_entry.id = MSM_L2_CACHE;
l2_dump_entry.start_addr = msm_cache_dump_addr + l1_size;
l2_dump_entry.end_addr = l2_dump_entry.start_addr + l2_size - 1;
ret = msm_dump_table_register(&l1_dump_entry);
if (ret)
pr_err("Could not register L1 dump area: %d\n", ret);
ret = msm_dump_table_register(&l1_dump_entry);
if (ret)
pr_err("Could not register L1 dump area: %d\n", ret);
ret = msm_dump_table_register(&l2_dump_entry);
if (ret)
pr_err("Could not register L2 dump area: %d\n", ret);
}
ret = msm_dump_table_register(&l2_dump_entry);
if (ret)
pr_err("Could not register L2 dump area: %d\n", ret);
atomic_notifier_chain_register(&panic_notifier_list,
&msm_cache_dump_blk);