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

Commit dc9a5781 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "firmware: qcom_scm: Remove unused qcom_scm_get_version"

parents 25a16eb9 22afda04

drivers/firmware/qcom_scm-32.c

+0 −36
Original line number Diff line number Diff line
@@ -295,42 +295,6 @@ static s32 qcom_scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) 
	return r0;

}



u32 qcom_scm_get_version(void)

{

	int context_id;

	static u32 version = -1;

	register u32 r0 asm("r0");

	register u32 r1 asm("r1");



	if (version != -1)

		return version;



	mutex_lock(&qcom_scm_lock);



	r0 = 0x1 << 8;

	r1 = (u32)&context_id;

	do {

		asm volatile(

			__asmeq("%0", "r0")

			__asmeq("%1", "r1")

			__asmeq("%2", "r0")

			__asmeq("%3", "r1")

#ifdef REQUIRES_SEC

			".arch_extension sec\n"

#endif

			"smc	#0	@ switch to secure world\n"

			: "=r" (r0), "=r" (r1)

			: "r" (r0), "r" (r1)

			: "r2", "r3", "r12");

	} while (r0 == QCOM_SCM_INTERRUPTED);



	version = r1;

	mutex_unlock(&qcom_scm_lock);



	return version;

}

EXPORT_SYMBOL(qcom_scm_get_version);



/**

 * qcom_scm_set_cold_boot_addr() - Set the cold boot address for cpus

 * @entry: Entry point function for the cpus

include/linux/qcom_scm.h

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ extern bool qcom_scm_hdcp_available(void); 
extern int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt,

			     u32 *resp);

extern int qcom_scm_qsmmu500_wait_safe_toggle(bool en);

extern u32 qcom_scm_get_version(void);

extern bool qcom_scm_is_available(void);

#else
@@ -101,7 +100,6 @@ static inline int qcom_scm_hdcp_req(struct qcom_scm_hdcp_req *req, u32 req_cnt, 
				    u32 *resp) { return -ENODEV; }

static inline int qcom_scm_qsmmu500_wait_safe_toggle(bool en)

		{ return -ENODEV; }

static inline u32 qcom_scm_get_version(void) { return 0; }

static inline bool qcom_scm_is_available(void) { return false; }

#endif

#endif