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

Commit 01982fba authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "firmware/qcom_scm: Add scm call to handle smmu errata"

parents 2c87407c ae18db42

drivers/firmware/qcom_scm-32.c

+5 −0
Original line number Diff line number Diff line
@@ -614,3 +614,8 @@ int __qcom_scm_io_writel(struct device *dev, phys_addr_t addr, unsigned int val) 
	return qcom_scm_call_atomic2(QCOM_SCM_SVC_IO, QCOM_SCM_IO_WRITE,

				     addr, val);

}



int __qcom_scm_qsmmu500_wait_safe_toggle(struct device *dev, bool enable)

{

	return -ENODEV;

}

drivers/firmware/qcom_scm-64.c

+13 −0
Original line number Diff line number Diff line
@@ -552,3 +552,16 @@ int __qcom_scm_io_writel(struct device *dev, phys_addr_t addr, unsigned int val) 
	return qcom_scm_call(dev, QCOM_SCM_SVC_IO, QCOM_SCM_IO_WRITE,

			     &desc, &res);

}



int __qcom_scm_qsmmu500_wait_safe_toggle(struct device *dev, bool en)

{

	struct qcom_scm_desc desc = {0};

	struct arm_smccc_res res;



	desc.args[0] = QCOM_SCM_CONFIG_ERRATA1_CLIENT_ALL;

	desc.args[1] = en;

	desc.arginfo = QCOM_SCM_ARGS(2);



	return qcom_scm_call_atomic(dev, QCOM_SCM_SVC_SMMU_PROGRAM,

				    QCOM_SCM_CONFIG_ERRATA1, &desc, &res);

}

drivers/firmware/qcom_scm.c

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

EXPORT_SYMBOL(qcom_scm_iommu_secure_ptbl_init);



int qcom_scm_qsmmu500_wait_safe_toggle(bool en)

{

	return __qcom_scm_qsmmu500_wait_safe_toggle(__scm->dev, en);

}

EXPORT_SYMBOL(qcom_scm_qsmmu500_wait_safe_toggle);



int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val)

{

	return __qcom_scm_io_readl(__scm->dev, addr, val);

drivers/firmware/qcom_scm.h

+5 −0
Original line number Diff line number Diff line
@@ -91,10 +91,15 @@ 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

#define QCOM_SCM_SVC_SMMU_PROGRAM	0x15

#define QCOM_SCM_CONFIG_ERRATA1		0x3

#define QCOM_SCM_CONFIG_ERRATA1_CLIENT_ALL	0x2

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

extern int __qcom_scm_qsmmu500_wait_safe_toggle(struct device *dev,

						bool enable);

#define QCOM_MEM_PROT_ASSIGN_ID	0x16

extern int  __qcom_scm_assign_mem(struct device *dev,

				  phys_addr_t mem_region, size_t mem_sz,

include/linux/qcom_scm.h

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 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);

extern int qcom_scm_qsmmu500_wait_safe_toggle(bool en);

extern int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val);

extern int qcom_scm_io_writel(phys_addr_t addr, unsigned int val);

#else
@@ -97,6 +98,7 @@ 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; }

static inline int qcom_scm_qsmmu500_wait_safe_toggle(bool en) { return -ENODEV; }

static inline int qcom_scm_io_readl(phys_addr_t addr, unsigned int *val) { return -ENODEV; }

static inline int qcom_scm_io_writel(phys_addr_t addr, unsigned int val) { return -ENODEV; }

#endif