Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8cb727c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: smp2p: convert to secured smem feature"

parents 07d50e7b 3957912f

arch/arm/mach-msm/smp2p.c

+6 −3
Original line number Diff line number Diff line
@@ -352,11 +352,13 @@ static void *smp2p_get_local_smem_item(int remote_pid) 
		/* lookup or allocate SMEM item */

		smem_id = smp2p_get_smem_item_id(SMP2P_APPS_PROC, remote_pid);

		if (smem_id >= 0) {

			item_ptr = smem_get_entry(smem_id, &size);

			item_ptr = smem_get_entry_to_proc(smem_id, &size,

								remote_pid, 0);



			if (!item_ptr) {

				size = sizeof(struct smp2p_smem_item);

				item_ptr = smem_alloc2(smem_id, size);

				item_ptr = smem_alloc2_to_proc(smem_id, size,

								remote_pid, 0);

			}

		}

	} else if (remote_pid == SMP2P_REMOTE_MOCK_PROC) {
@@ -401,7 +403,8 @@ static void *smp2p_get_remote_smem_item(int remote_pid, 


		smem_id = smp2p_get_smem_item_id(remote_pid, SMP2P_APPS_PROC);

		if (smem_id >= 0)

			item_ptr = smem_get_entry(smem_id, &size);

			item_ptr = smem_get_entry_to_proc(smem_id, &size,

								remote_pid, 0);

	} else if (remote_pid == SMP2P_REMOTE_MOCK_PROC) {

		item_ptr = msm_smp2p_get_remote_mock_smem_item(&size);

	}

arch/arm/mach-msm/smp2p_spinlock_test.c

+3 −2
Original line number Diff line number Diff line
@@ -381,8 +381,9 @@ static void smp2p_ut_remote_spinlock_rpm(struct seq_file *s) 
		smem_spinlock = smem_get_remote_spinlock();

		UT_ASSERT_PTR(smem_spinlock, !=, NULL);



		data_ptr = smem_alloc2(SMEM_ID_VENDOR0,

				sizeof(struct rpm_spinlock_test));

		data_ptr = smem_alloc2_to_proc(SMEM_ID_VENDOR0,

				sizeof(struct rpm_spinlock_test), 0,

				SMEM_ANY_HOST_FLAG);

		UT_ASSERT_PTR(0, !=, data_ptr);



		/* Send start */