Merge "qcom-geni-se: update SCM call ID for QUPv3 firmware loading" (aaa6e876) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/platform/msm/qcom-geni-se.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -46,7 +46,9 @@
		static unsigned long default_bus_bw_set[] = {0, 19200000, 50000000,
		100000000, 150000000, 200000000, 236000000};
		/* SCM Call Id */
		#define SSR_SCM_CMD 0x1
		#define TZ_SCM_CALL_FROM_HLOS 0x7E7E7E7E
		#define TZ_PIL_AUTH_GSI_QUP_PROC 0x13
		#define SSR_SCM_CMD 0x2

		struct bus_vectors {
		int src;
		@@ -385,11 +387,11 @@ static void geni_se_ssc_qup_up(struct geni_se_device *dev)
		struct scm_desc desc;
		struct se_geni_rsc *rsc = NULL;

		/* Passing dummy argument as it is scm call requirement */
		desc.args[0] = 0x0;
		desc.arginfo = SCM_ARGS(1, SCM_VAL);
		desc.args[0] = TZ_PIL_AUTH_GSI_QUP_PROC;
		desc.args[1] = TZ_SCM_CALL_FROM_HLOS;
		desc.arginfo = SCM_ARGS(2, SCM_VAL);

		ret = scm_call2(SCM_SIP_FNID(TZ_SVC_QUP_FW_LOAD, SSR_SCM_CMD), &desc);
		ret = scm_call2(SCM_SIP_FNID(SCM_SVC_MP, SSR_SCM_CMD), &desc);
		if (ret) {
		dev_err(dev->dev, "Unable to load firmware after SSR\n");
		return;

+0 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		#define SCM_SVC_QDSS 0x16
		#define SCM_SVC_RTIC 0x19
		#define SCM_SVC_TZSCHEDULER 0xFC
		#define TZ_SVC_QUP_FW_LOAD 0x1F

		#define SCM_FUSE_READ 0x7
		#define SCM_CMD_HDCP 0x01