Merge "firmware: qcom_scm: Add funcnum IDs" (86d26b10) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/firmware/qcom_scm-32.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ static struct qcom_scm_entry qcom_scm_wb[] = {

		static DEFINE_MUTEX(qcom_scm_lock);

		#define LEGACY_FUNCNUM(s, c) (((s) << 10) \| ((c) & 0x3ff))

		/**
		* struct qcom_scm_legacy_command - one SCM command buffer
		* @len: total available memory for command and response
		@@ -180,7 +182,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
		cmd->buf_offset = cpu_to_le32(sizeof(*cmd));
		cmd->resp_hdr_offset = cpu_to_le32(sizeof(*cmd) + cmd_len);

		cmd->id = cpu_to_le32((svc_id << 10) \| cmd_id);
		cmd->id = cpu_to_le32(LEGACY_FUNCNUM(svc_id, cmd_id));
		if (cmd_buf)
		memcpy(legacy_get_command_buffer(cmd), cmd_buf, cmd_len);

		@@ -221,7 +223,7 @@ static int qcom_scm_call(struct device *dev, u32 svc_id, u32 cmd_id,
		#define LEGACY_CLASS_REGISTER (0x2 << 8)
		#define LEGACY_MASK_IRQS BIT(5)
		#define LEGACY_ATOMIC_ID(svc, cmd, n) \
		(((((svc) << 10)\|((cmd) & 0x3ff)) << 12) \| \
		((LEGACY_FUNCNUM(svc, cmd) << 12) \| \
		LEGACY_CLASS_REGISTER \| \
		LEGACY_MASK_IRQS \| \
		(n & 0xf))

+1 −2

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@

		#include "qcom_scm.h"

		#define SMCCC_FUNCNUM(s, c) ((((s) & 0xFF) << 8) \| ((c) & 0xFF))

		#define MAX_QCOM_SCM_ARGS 10
		#define MAX_QCOM_SCM_RETS 3

		@@ -58,6 +56,7 @@ static DEFINE_MUTEX(qcom_scm_lock);
		#define QCOM_SCM_EBUSY_WAIT_MS 30
		#define QCOM_SCM_EBUSY_MAX_RETRY 20

		#define SMCCC_FUNCNUM(s, c) ((((s) & 0xFF) << 8) \| ((c) & 0xFF))
		#define SMCCC_N_EXT_ARGS 7
		#define SMCCC_FIRST_EXT_IDX 3
		#define SMCCC_N_REG_ARGS (MAX_QCOM_SCM_ARGS - SMCCC_N_EXT_ARGS + 1)