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

Commit 2eb8efc2 authored by Shreyas Narayan's avatar Shreyas Narayan
Browse files

Revert "adsprpc:Make TZ security skel call for DSP backward compatible" 



This reverts commit b6a74b55.

Change-Id: Iecf37da6c3a36130914d5d05f75348519c89af74
Signed-off-by: default avatarShreyas Narayan <shrena@codeaurora.org>
parent b6a74b55

drivers/char/adsprpc.c

+0 −13
Original line number Diff line number Diff line
@@ -2481,21 +2481,8 @@ static int fastrpc_munmap_on_dsp_rh(struct fastrpc_file *fl, uint64_t phys, 


		VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

				FASTRPC_MODE_PARALLEL, 1, &ioctl)));

		if (err == AEE_EUNSUPPORTED) {

			remote_arg_t ra[1];



			pr_warn("ADSPRPC:Failed to get security key with updated remote call,

				 falling back to older method");

			ra[0].buf.pv = (void *)&routargs;

			ra[0].buf.len = sizeof(routargs);

			ioctl.inv.sc = REMOTE_SCALARS_MAKE(7, 0, 1);

			ioctl.inv.pra = ra;

			VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

				FASTRPC_MODE_PARALLEL, 1, &ioctl)));

		}

		if (err)

			goto bail;



		desc.args[0] = TZ_PIL_AUTH_QDSP6_PROC;

		desc.args[1] = phys;

		desc.args[2] = size;

drivers/char/adsprpc_shared.h

+0 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ do {\ 
} while (0)

#endif



/* Fall back to older APIS in case API is not supported */

#define AEE_EUNSUPPORTED    20



#define remote_arg64_t    union remote_arg64



struct remote_buf64 {