evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm/drm: Add secure support to GPU IOMMU

Browse source 
Add support for creating a secure domain in the GPU IOMMU. By default
the secure domain is bound to context bank name "gfx3d_secure".

Change-Id: Ic0dedbad19f69ec4175624dc80f2114bfda2e195
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2017-04-07 15:01:43 -06:00
parent 0bea8c919a
commit 8e00aa10d2
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/gpu/drm/msm/msm_iommu.c
View file

@ -17,6 +17,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <soc/qcom/secure_buffer.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "msm_iommu.h" #include "msm_iommu.h"
@ -142,6 +143,20 @@ static int msm_iommu_attach_dynamic(struct msm_mmu *mmu, const char **names,
return 0; return 0;
} }
static int msm_iommu_attach_secure(struct msm_mmu *mmu, const char **names,
int cnt)
{
struct msm_iommu *iommu = to_msm_iommu(mmu);
int ret, vmid = VMID_CP_PIXEL;
ret = iommu_domain_set_attr(iommu->domain, DOMAIN_ATTR_SECURE_VMID,
&vmid);
if (ret)
return ret;
return iommu_attach_device(iommu->domain, mmu->dev);
}
static void msm_iommu_detach(struct msm_mmu *mmu) static void msm_iommu_detach(struct msm_mmu *mmu)
{ {
struct msm_iommu *iommu = to_msm_iommu(mmu); struct msm_iommu *iommu = to_msm_iommu(mmu);
@ -250,6 +265,14 @@ static const struct msm_mmu_funcs user_funcs = {
.disable = msm_iommu_clocks_disable, .disable = msm_iommu_clocks_disable,
}; };
static const struct msm_mmu_funcs secure_funcs = {
.attach = msm_iommu_attach_secure,
.detach = msm_iommu_detach,
.map = msm_iommu_map,
.unmap = msm_iommu_unmap,
.destroy = msm_iommu_destroy,
};
static const struct msm_mmu_funcs dynamic_funcs = { static const struct msm_mmu_funcs dynamic_funcs = {
.attach = msm_iommu_attach_dynamic, .attach = msm_iommu_attach_dynamic,
.detach = msm_iommu_detach_dynamic, .detach = msm_iommu_detach_dynamic,
@ -270,6 +293,10 @@ static const struct {
.cbname = "gfx3d_user", .cbname = "gfx3d_user",
.funcs = &user_funcs, .funcs = &user_funcs,
}, },
[MSM_IOMMU_DOMAIN_SECURE] = {
.cbname = "gfx3d_secure",
.funcs = &secure_funcs
},
}; };
static struct msm_mmu *iommu_create(struct device *dev, static struct msm_mmu *iommu_create(struct device *dev,

1
drivers/gpu/drm/msm/msm_mmu.h
View file

@ -33,6 +33,7 @@ enum msm_mmu_domain_type {
enum msm_iommu_domain_type { enum msm_iommu_domain_type {
MSM_IOMMU_DOMAIN_DEFAULT, MSM_IOMMU_DOMAIN_DEFAULT,
MSM_IOMMU_DOMAIN_USER, MSM_IOMMU_DOMAIN_USER,
MSM_IOMMU_DOMAIN_SECURE,
}; };
struct msm_mmu_funcs { struct msm_mmu_funcs {