github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 12:11:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

remoteproc: qcom_q6v5_pas: Map modem DSM memory ownership to MPSS

Browse Source 
Replace the hyp_assign_phys with upstream friendly qcom_scm_assign_mem.
dsm memory region is needed by MPSS PDs, this call reassigns the
ownership to MPSS.

Change-Id: I1ae7e61d1bc74d45bb1bc58b762c5d3d59e12501
Signed-off-by: Gokul krishna Krishnakumar <quic_gokukris@quicinc.com>
This commit is contained in:
Gokul krishna Krishnakumar 2022-11-09 11:04:05 -08:00
parent a5235ba22e
commit 7b161ee9c9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/remoteproc/qcom_q6v5_pas.c
View File

@ -957,14 +957,16 @@ static int adsp_setup_32b_dma_allocs(struct qcom_adsp *adsp)
static int setup_mpss_dsm_mem(struct platform_device *pdev)
{
struct qcom_scm_vmperm newvm[1];
struct device_node *node;
struct resource res;
int hlosvm[1] = {VMID_HLOS};
int mssvm[1] = {VMID_MSS_MSA};
int vmperm[1] = {PERM_READ | PERM_WRITE};
phys_addr_t mem_phys;
int curr_perm;
u64 mem_size;
int ret;
newvm[0].vmid = QCOM_SCM_VMID_MSS_MSA;
newvm[0].perm = QCOM_SCM_PERM_RW;
curr_perm = BIT(QCOM_SCM_VMID_HLOS);
node = of_parse_phandle(pdev->dev.of_node, "mpss_dsm_mem_reg", 0);
if (!node) {
@ -980,7 +982,7 @@ static int setup_mpss_dsm_mem(struct platform_device *pdev)
mem_phys = res.start;
mem_size = resource_size(&res);
ret = hyp_assign_phys(mem_phys, mem_size, hlosvm, 1, mssvm, vmperm, 1);
ret = qcom_scm_assign_mem(mem_phys, mem_size, &curr_perm, newvm, 1);
if (ret) {
dev_err(&pdev->dev, "hyp assign for mpss dsm mem failed\n");
return ret;