Commit 6d885330 authored by Stanimir Varbanov's avatar Stanimir Varbanov Committed by Mauro Carvalho Chehab
Browse files

media: firmware: qcom_scm: Add memory protect virtual address ranges 



This adds a new SCM memprotect command to set virtual address ranges.

Signed-off-by: default avatarStanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: default avatarElliot Berman <eberman@codeaurora.org>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 435c53c3

drivers/firmware/qcom_scm.c

+24 −0
Original line number Diff line number Diff line
@@ -756,6 +756,30 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare) 
}

EXPORT_SYMBOL(qcom_scm_iommu_secure_ptbl_init);



int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,

				   u32 cp_nonpixel_start,

				   u32 cp_nonpixel_size)

{

	int ret;

	struct qcom_scm_desc desc = {

		.svc = QCOM_SCM_SVC_MP,

		.cmd = QCOM_SCM_MP_VIDEO_VAR,

		.arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_VAL, QCOM_SCM_VAL,

					 QCOM_SCM_VAL, QCOM_SCM_VAL),

		.args[0] = cp_start,

		.args[1] = cp_size,

		.args[2] = cp_nonpixel_start,

		.args[3] = cp_nonpixel_size,

		.owner = ARM_SMCCC_OWNER_SIP,

	};

	struct qcom_scm_res res;



	ret = qcom_scm_call(__scm->dev, &desc, &res);



	return ret ? : res.result[0];

}

EXPORT_SYMBOL(qcom_scm_mem_protect_video_var);



static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region,

				 size_t mem_sz, phys_addr_t src, size_t src_sz,

				 phys_addr_t dest, size_t dest_sz)

drivers/firmware/qcom_scm.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ extern int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc, 
#define QCOM_SCM_MP_RESTORE_SEC_CFG		0x02

#define QCOM_SCM_MP_IOMMU_SECURE_PTBL_SIZE	0x03

#define QCOM_SCM_MP_IOMMU_SECURE_PTBL_INIT	0x04

#define QCOM_SCM_MP_VIDEO_VAR			0x08

#define QCOM_SCM_MP_ASSIGN			0x16



#define QCOM_SCM_SVC_OCMEM		0x0f

include/linux/qcom_scm.h

+7 −0
Original line number Diff line number Diff line
@@ -84,6 +84,9 @@ extern bool qcom_scm_restore_sec_cfg_available(void); 
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);

extern int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,

					  u32 cp_nonpixel_start,

					  u32 cp_nonpixel_size);

extern int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,

			       unsigned int *src,

			       const struct qcom_scm_vmperm *newvm,
@@ -141,6 +144,10 @@ 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; }

extern inline int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,

						 u32 cp_nonpixel_start,

						 u32 cp_nonpixel_size)

		{ return -ENODEV; }

static inline int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,

		unsigned int *src, const struct qcom_scm_vmperm *newvm,

		unsigned int dest_cnt) { return -ENODEV; }