Commit b182cc4d authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Andy Gross
Browse files

firmware: qcom_scm: add two scm calls for iommu secure page table 



Those two new SCM calls are needed from qcom-iommu driver in order
to initialize secure iommu page table.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent a2c680c6

drivers/firmware/qcom_scm-32.c

+12 −0
Original line number Diff line number Diff line
@@ -584,3 +584,15 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, 
{

	return -ENODEV;

}



int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,

				      size_t *size)

{

	return -ENODEV;

}



int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,

				      u32 spare)

{

	return -ENODEV;

}

drivers/firmware/qcom_scm-64.c

+42 −0
Original line number Diff line number Diff line
@@ -397,3 +397,45 @@ int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id, u32 spare) 


	return ret ? : res.a1;

}



int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,

				      size_t *size)

{

	struct qcom_scm_desc desc = {0};

	struct arm_smccc_res res;

	int ret;



	desc.args[0] = spare;

	desc.arginfo = QCOM_SCM_ARGS(1);



	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,

			    QCOM_SCM_IOMMU_SECURE_PTBL_SIZE, &desc, &res);



	if (size)

		*size = res.a1;



	return ret ? : res.a2;

}



int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr, u32 size,

				      u32 spare)

{

	struct qcom_scm_desc desc = {0};

	struct arm_smccc_res res;

	int ret;



	desc.args[0] = addr;

	desc.args[1] = size;

	desc.args[2] = spare;

	desc.arginfo = QCOM_SCM_ARGS(3, QCOM_SCM_RW, QCOM_SCM_VAL,

				     QCOM_SCM_VAL);



	ret = qcom_scm_call(dev, QCOM_SCM_SVC_MP,

			    QCOM_SCM_IOMMU_SECURE_PTBL_INIT, &desc, &res);



	/* the pg table has been initialized already, ignore the error */

	if (ret == -EPERM)

		ret = 0;



	return ret;

}

drivers/firmware/qcom_scm.c

+12 −0
Original line number Diff line number Diff line
@@ -321,6 +321,18 @@ int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare) 
}

EXPORT_SYMBOL(qcom_scm_restore_sec_cfg);



int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size)

{

	return __qcom_scm_iommu_secure_ptbl_size(__scm->dev, spare, size);

}

EXPORT_SYMBOL(qcom_scm_iommu_secure_ptbl_size);



int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare)

{

	return __qcom_scm_iommu_secure_ptbl_init(__scm->dev, addr, size, spare);

}

EXPORT_SYMBOL(qcom_scm_iommu_secure_ptbl_init);



/**

 * qcom_scm_is_available() - Checks if SCM is available

 */

drivers/firmware/qcom_scm.h

+6 −0
Original line number Diff line number Diff line
@@ -89,5 +89,11 @@ static inline int qcom_scm_remap_error(int err) 
#define QCOM_SCM_RESTORE_SEC_CFG	2

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

				      u32 spare);

#define QCOM_SCM_IOMMU_SECURE_PTBL_SIZE	3

#define QCOM_SCM_IOMMU_SECURE_PTBL_INIT	4

extern int __qcom_scm_iommu_secure_ptbl_size(struct device *dev, u32 spare,

					     size_t *size);

extern int __qcom_scm_iommu_secure_ptbl_init(struct device *dev, u64 addr,

					     u32 size, u32 spare);



#endif

include/linux/qcom_scm.h

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ extern void qcom_scm_cpu_power_down(u32 flags); 
extern u32 qcom_scm_get_version(void);

extern int qcom_scm_set_remote_state(u32 state, u32 id);

extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare);

extern int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size);

extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);

#else

static inline

int qcom_scm_set_cold_boot_addr(void *entry, const cpumask_t *cpus)
@@ -69,5 +71,7 @@ static inline u32 qcom_scm_get_version(void) { return 0; } 
static inline u32

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; }

static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size) { return -ENODEV; }

static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) { return -ENODEV; }

#endif

#endif