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

Commit 4048c77c authored by Susheel Khiani's avatar Susheel Khiani
Browse files

soc: qcom: Expose TZ specific device id to other functions 



We need to pass TZ specific device id when
calling into TZ for SMMU configuration. Expose
these device ids and an interface function which
can be used to extract these device id.

CRs-Fixed: 959535
Change-Id: I31239d187c893e1bf419a5e9b5add127699ef701
Signed-off-by: default avatarSusheel Khiani <skhiani@codeaurora.org>
parent 275c81c2

drivers/soc/qcom/msm_tz_smmu.c

+2 −35
Original line number Diff line number Diff line
@@ -16,39 +16,6 @@ 
#include <soc/qcom/scm.h>

#include <soc/qcom/msm_tz_smmu.h>



enum tz_smmu_device_id {

	TZ_DEVICE_START = 0,

	TZ_DEVICE_VIDEO = 0,

	TZ_DEVICE_MDSS,

	TZ_DEVICE_LPASS,

	TZ_DEVICE_MDSS_BOOT,

	TZ_DEVICE_USB1_HS,

	TZ_DEVICE_OCMEM,

	TZ_DEVICE_LPASS_CORE,

	TZ_DEVICE_VPU,

	TZ_DEVICE_COPSS_SMMU,

	TZ_DEVICE_USB3_0,

	TZ_DEVICE_USB3_1,

	TZ_DEVICE_PCIE_0,

	TZ_DEVICE_PCIE_1,

	TZ_DEVICE_BCSS,

	TZ_DEVICE_VCAP,

	TZ_DEVICE_PCIE20,

	TZ_DEVICE_IPA,

	TZ_DEVICE_APPS,

	TZ_DEVICE_GPU,

	TZ_DEVICE_UFS,

	TZ_DEVICE_ICE,

	TZ_DEVICE_ROT,

	TZ_DEVICE_VFE,

	TZ_DEVICE_ANOC0,

	TZ_DEVICE_ANOC1,

	TZ_DEVICE_ANOC2,

	TZ_DEVICE_CPP,

	TZ_DEVICE_JPEG,

	TZ_DEVICE_MAX,

};



static const char * const device_id_mappings[] = {

	[TZ_DEVICE_VIDEO] = "VIDEO",

	[TZ_DEVICE_MDSS] = "MDSS",
@@ -86,7 +53,7 @@ static const char * const device_id_mappings[] = { 
#define TZ_SMMU_ATOS_START 1

#define TZ_SMMU_ATOS_END 0



static enum tz_smmu_device_id __dev_to_device_id(struct device *dev)

enum tz_smmu_device_id msm_dev_to_device_id(struct device *dev)

{

	const char *device_id;

	enum tz_smmu_device_id iter;
@@ -108,7 +75,7 @@ static int __msm_tz_smmu_atos(struct device *dev, int cb_num, int operation) 
{

	int ret;

	struct scm_desc desc = {0};

	enum tz_smmu_device_id devid = __dev_to_device_id(dev);

	enum tz_smmu_device_id devid = msm_dev_to_device_id(dev);



	if (devid == TZ_DEVICE_MAX)

		return -ENODEV;

include/soc/qcom/msm_tz_smmu.h

+39 −0
Original line number Diff line number Diff line
@@ -15,10 +15,44 @@ 


#include <linux/device.h>



enum tz_smmu_device_id {

	TZ_DEVICE_START = 0,

	TZ_DEVICE_VIDEO = 0,

	TZ_DEVICE_MDSS,

	TZ_DEVICE_LPASS,

	TZ_DEVICE_MDSS_BOOT,

	TZ_DEVICE_USB1_HS,

	TZ_DEVICE_OCMEM,

	TZ_DEVICE_LPASS_CORE,

	TZ_DEVICE_VPU,

	TZ_DEVICE_COPSS_SMMU,

	TZ_DEVICE_USB3_0,

	TZ_DEVICE_USB3_1,

	TZ_DEVICE_PCIE_0,

	TZ_DEVICE_PCIE_1,

	TZ_DEVICE_BCSS,

	TZ_DEVICE_VCAP,

	TZ_DEVICE_PCIE20,

	TZ_DEVICE_IPA,

	TZ_DEVICE_APPS,

	TZ_DEVICE_GPU,

	TZ_DEVICE_UFS,

	TZ_DEVICE_ICE,

	TZ_DEVICE_ROT,

	TZ_DEVICE_VFE,

	TZ_DEVICE_ANOC0,

	TZ_DEVICE_ANOC1,

	TZ_DEVICE_ANOC2,

	TZ_DEVICE_CPP,

	TZ_DEVICE_JPEG,

	TZ_DEVICE_MAX,

};



#ifdef CONFIG_MSM_TZ_SMMU



int msm_tz_smmu_atos_start(struct device *dev, int cb_num);

int msm_tz_smmu_atos_end(struct device *dev, int cb_num);

enum tz_smmu_device_id msm_dev_to_device_id(struct device *dev);



#else
@@ -32,6 +66,11 @@ static inline int msm_tz_smmu_atos_end(struct device *dev, int cb_num) 
	return 0;

}



static inline enum tz_smmu_device_id msm_dev_to_device_id(struct device *dev)

{

	return -EINVAL;

}



#endif /* CONFIG_MSM_TZ_SMMU */



#endif /* __MSM_TZ_SMMU_H__ */