Commit 5397b5c4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'qcom-drivers-for-4.12' of... 

Merge tag 'qcom-drivers-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers

Qualcomm ARM Based Driver Updates for v4.12

* Add SCM APIs for restore_sec_cfg and iommu secure page table

* tag 'qcom-drivers-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux

:
  firmware: qcom_scm: add two scm calls for iommu secure page table
  firmware/qcom: add qcom_scm_restore_sec_cfg()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 55de8075 b182cc4d

drivers/firmware/qcom_scm-32.c

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


	return ret ? : le32_to_cpu(scm_ret);

}



int __qcom_scm_restore_sec_cfg(struct device *dev, u32 device_id,

			       u32 spare)

{

	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

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


	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;

}



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

+18 −0
Original line number Diff line number Diff line
@@ -315,6 +315,24 @@ static const struct reset_control_ops qcom_scm_pas_reset_ops = { 
	.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);



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

+11 −0
Original line number Diff line number Diff line
@@ -85,4 +85,15 @@ static inline int qcom_scm_remap_error(int err) 
	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);

#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

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ extern int qcom_scm_pas_shutdown(u32 peripheral); 
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)
@@ -67,5 +70,8 @@ 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_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