Merge "soc: qcom: pil: allow subsystem to allocate extra memory"

This commit is contained in:
qctecmdr 2020-05-21 18:18:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 23d0cc5e97
2 changed files with 8 additions and 1 deletions

View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
*/
#ifndef __MSM_PERIPHERAL_LOADER_H
#define __MSM_PERIPHERAL_LOADER_H
@ -62,6 +62,7 @@ struct pil_desc {
int minidump_id;
int *aux_minidump_ids;
int num_aux_minidump_ids;
u32 extra_size;
};
/**

View file

@ -617,6 +617,7 @@ static int pil_mem_setup_trusted(struct pil_desc *pil, phys_addr_t addr,
if (d->subsys_desc.no_auth)
return 0;
size += pil->extra_size;
scm_ret = qcom_scm_pas_mem_setup(d->pas_id, addr, size);
return scm_ret;
@ -1349,6 +1350,11 @@ static int pil_tz_generic_probe(struct platform_device *pdev)
}
}
rc = of_property_read_u32(pdev->dev.of_node, "qcom,extra-size",
&d->desc.extra_size);
if (rc)
d->desc.extra_size = 0;
d->dev = &pdev->dev;
d->desc.dev = &pdev->dev;
d->desc.owner = THIS_MODULE;