Merge "Revert "Update platform file to support 8916 LA 2.0"" (a3add56f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gud/MobiCoreDriver/platforms/MSM8960_SURF_STD/platform.h

+16 −20

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		#define SCM_SVC_MOBICORE 250
		#define SCM_CMD_MOBICORE 1

		#ifdef CONFIG_ARM64

		#include <soc/qcom/qseecomi.h>
		#include <linux/slab.h>
		#include <linux/io.h>
		@@ -50,18 +52,14 @@
		TZ_SYSCALL_PARAM_TYPE_BUF_RW, TZ_SYSCALL_PARAM_TYPE_VAL, \
		TZ_SYSCALL_PARAM_TYPE_BUF_RW, TZ_SYSCALL_PARAM_TYPE_VAL)

		/* from following file */
		#define SCM_SVC_MOBICORE 250
		#define SCM_CMD_MOBICORE 1

		#endif

		extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
		void *resp_buf, size_t resp_len);

		static inline int smc_fastcall(void *fc_generic, size_t size)
		{
		if (is_scm_armv8())
		{
		#ifdef CONFIG_ARM64
		struct scm_desc desc = {0};
		int ret;
		void* scm_buf = NULL;
		@@ -84,13 +82,11 @@ static inline int smc_fastcall(void *fc_generic, size_t size)
		memcpy(fc_generic, scm_buf, size);
		kfree(scm_buf);
		return ret;
		}
		else
		{
		#else
		return scm_call(SCM_SVC_MOBICORE, SCM_CMD_MOBICORE,
		fc_generic, size,
		fc_generic, size);
		}
		#endif
		}

		/* Enable mobicore mem traces */