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

Commit a2c680c6 authored by Rob Clark's avatar Rob Clark Committed by Andy Gross
Browse files

firmware/qcom: add qcom_scm_restore_sec_cfg() 



Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent c1ae3cfa

drivers/firmware/qcom_scm-32.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -578,3 +578,9 @@ int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) 




	return ret ? : le32_to_cpu(scm_ret);

	return ret ? : le32_to_cpu(scm_ret);

}

}



int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,

			       u32 spare)

{

	return -ENODEV;

}

drivers/firmware/qcom_scm-64.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -381,3 +381,19 @@ int __qcom_scm_set_remote_state(struct device *dev, u32 state, u32 id) 




	return ret ? : res.a1;

	return ret ? : res.a1;

}

}



int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, u32 spare)

{

	struct qcom_scm_desc desc = {0};

	struct arm_smccc_res res;

	int ret;



	desc.args[0] = device_id;

	desc.args[1] = spare;

	desc.arginfo = QCOM_SCM_ARGS(2);



	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP, QCOM_SCM_RESTORE_SEC_CFG,

			    &desc, &res);



	return ret ? : res.a1;

}

drivers/firmware/qcom_scm.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -315,6 +315,12 @@ static const struct reset_control_ops qcom_scm_pas_reset_ops = { 
	.deassert = qcom_scm_pas_reset_deassert,

	.deassert = qcom_scm_pas_reset_deassert,

};

};





int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare)

{

	return __qcom_scm_restore_sec_cfg(__scm->dev, device_id, spare);

}

EXPORT_SYMBOL(qcom_scm_restore_sec_cfg);



/**

/**

 * qcom_scm_is_available() - Checks if SCM is available

 * qcom_scm_is_available() - Checks if SCM is available

 */

 */

drivers/firmware/qcom_scm.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -85,4 +85,9 @@ static inline int qcom_scm_remap_error(int err) 
	return -EINVAL;

	return -EINVAL;

}

}





#define QCOM_SCM_SVC_MP			0xc

#define QCOM_SCM_RESTORE_SEC_CFG	2

extern int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,

				      u32 spare);



#endif
 
#endif

include/linux/qcom_scm.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ extern int qcom_scm_pas_shutdown(u32 peripheral); 
extern void qcom_scm_cpu_power_down(u32 flags);

extern void qcom_scm_cpu_power_down(u32 flags);

extern u32 qcom_scm_get_version(void);

extern u32 qcom_scm_get_version(void);

extern int qcom_scm_set_remote_state(u32 state, u32 id);

extern int qcom_scm_set_remote_state(u32 state, u32 id);

extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare);

#else

#else

static inline

static inline

int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)

int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
@@ -67,5 +68,6 @@ static inline void qcom_scm_cpu_power_down(u32 flags) {} 
static inline u32 qcom_scm_get_version(void) { return 0; }

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

static inline u32

static inline u32

qcom_scm_set_remote_state(u32 state,u32 id) { return -ENODEV; }

qcom_scm_set_remote_state(u32 state,u32 id) { return -ENODEV; }

static inline int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) { return -ENODEV; }

#endif

#endif

#endif
 
#endif