diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 20:14:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 20:14:10 -0800 |
| commit | 4f88bd23baab4335e96d38828ef38124ec717eb9 (patch) | |
| tree | 97f760c96b8799ee57a013f60cb76e781ddf1e62 /drivers/firmware/qcom_scm.h | |
| parent | bedf571986990046ddc4578e6378de146cf75b9e (diff) | |
| parent | 1a5d5c592e902191bfa091ec9169aa43299a7d0f (diff) | |
| download | linux-0-day-4f88bd23baab4335e96d38828ef38124ec717eb9.tar.gz linux-0-day-4f88bd23baab4335e96d38828ef38124ec717eb9.tar.xz | |
Merge tag 'rproc-v4.15' of git://github.com/andersson/remoteproc
Pull remoteproc updates from Bjorn Andersson:
"This adds an interface for configuring Qualcomm's "secure SMMU" and
adds support for booting the modem Hexagon on MSM8996.
Two new debugfs entries are added in the remoteproc core to introspect
the list of memory carveouts and the loaded resource table"
* tag 'rproc-v4.15' of git://github.com/andersson/remoteproc:
remoteproc: qcom: Fix error handling paths in order to avoid memory leaks
remoteproc: qcom: Drop pr_err in q6v5_xfer_mem_ownership()
remoteproc: debug: add carveouts list dump feature
remoteproc: debug: add resource table dump feature
remoteproc: qcom: Add support for mss remoteproc on msm8996
remoteproc: qcom: Make secure world call for mem ownership switch
remoteproc: qcom: refactor mss fw image loading sequence
firmware: scm: Add new SCM call API for switching memory ownership
Diffstat (limited to 'drivers/firmware/qcom_scm.h')
| -rw-r--r-- | drivers/firmware/qcom_scm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h index 83f171c239430..dcd7f7917fc71 100644 --- a/drivers/firmware/qcom_scm.h +++ b/drivers/firmware/qcom_scm.h @@ -103,5 +103,10 @@ 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); +#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, + phys_addr_t src, size_t src_sz, + phys_addr_t dest, size_t dest_sz); #endif |