A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

drivers: soc: qcom: Make global minidump table pointer NULL

Browse source 
If SMEM has not been initialized yet, before returning EPROBE_DEFER, make
the global minidump table pointer NULL. This avoids the kernel page fault
while trying to dereference the pointer later.

Change-Id: I76cbbee82e5b9fa02e0caaac57db2d6ce8f6ea6e
Signed-off-by: Prakruthi Deepak Heragu <pheragu@codeaurora.org>
This commit is contained in:
Prakruthi Deepak Heragu 2020-07-17 21:34:56 -07:00
commit 0039909655
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/soc/qcom/peripheral-loader.c
View file

@ -1531,6 +1531,7 @@ int pil_desc_init(struct pil_desc *desc)
void __iomem *addr;
void *ss_toc_addr;
int ret;
size_t size;
char buf[sizeof(priv->info->name)];
struct device_node *ofnode = desc->dev->of_node;
@ -1559,6 +1560,15 @@ int pil_desc_init(struct pil_desc *desc)
&desc->minidump_id))
pr_err("minidump-id not found for %s\n", desc->name);
else {
if (IS_ERR_OR_NULL(g_md_toc)) {
/* Get Global minidump ToC*/
g_md_toc = qcom_smem_get(QCOM_SMEM_HOST_ANY,
SBL_MINIDUMP_SMEM_ID, &size);
if (PTR_ERR(g_md_toc) == -EPROBE_DEFER) {
g_md_toc = NULL;
pr_err("SMEM is not initialized.\n");
}
}
if (g_md_toc && g_md_toc->md_toc_init == true) {
ss_toc_addr = &g_md_toc->md_ss_toc[desc->minidump_id];
pr_debug("Minidump : ss_toc_addr for ss is %pa and desc->minidump_id is %d\n",
@ -1665,7 +1675,6 @@ static int __init msm_pil_init(void)
struct device_node *np;
struct resource res;
int i;
size_t size;
np = of_find_compatible_node(NULL, NULL, "qcom,msm-imem-pil");
if (!np) {
@ -1688,15 +1697,6 @@ static int __init msm_pil_init(void)
for (i = 0; i < resource_size(&res)/sizeof(u32); i++)
writel_relaxed(0, pil_info_base + (i * sizeof(u32)));
/* Get Global minidump ToC*/
g_md_toc = qcom_smem_get(QCOM_SMEM_HOST_ANY, SBL_MINIDUMP_SMEM_ID,
&size);
pr_debug("Minidump: g_md_toc is %pa\n", &g_md_toc);
if (PTR_ERR(g_md_toc) == -EPROBE_DEFER) {
pr_err("SMEM is not initialized.\n");
return -EPROBE_DEFER;
}
pil_wq = alloc_workqueue("pil_workqueue", WQ_HIGHPRI | WQ_UNBOUND, 0);
if (!pil_wq)
pr_warn("pil: Defaulting to sequential firmware loading.\n");