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

Commit 38c7257a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: SCM front-end over QCPE"

parents d8ff341d 232738f7

drivers/soc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_MACH_DOVE) += dove/ 
obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip/

obj-$(CONFIG_QCOM_SCM_QCPE)	+= qcom/

obj-$(CONFIG_ARCH_SUNXI)	+= sunxi/

obj-$(CONFIG_ARCH_TEGRA)	+= tegra/

obj-$(CONFIG_SOC_TI)		+= ti/

drivers/soc/qcom/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -379,6 +379,10 @@ config QCOM_SCM 
       bool "Secure Channel Manager (SCM) support"

       default n



config QCOM_SCM_QCPE

       bool "Para-Virtualized Secure Channel Manager (SCM) support over QCPE"

       default n



menuconfig QCOM_SCM_XPU

	bool "Qualcomm XPU configuration driver"

	depends on QCOM_SCM

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) 


obj-$(CONFIG_QCOM_SCM_ERRATA) += scm-errata.o

obj-$(CONFIG_QCOM_SCM)  +=      scm.o scm-boot.o

obj-$(CONFIG_QCOM_SCM_QCPE)  += scm_qcpe.o

obj-$(CONFIG_QCOM_SCM_XPU) += scm-xpu.o

obj-$(CONFIG_QCOM_WATCHDOG_V2) += watchdog_v2.o

obj-$(CONFIG_QCOM_MEMORY_DUMP) += memory_dump.o

drivers/soc/qcom/scm_qcpe.c

0 → 100644
+1137 −0

File added.

Preview size limit exceeded, changes collapsed.

include/soc/qcom/scm.h

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct scm_desc { 
	u64 x5;

};



#ifdef CONFIG_QCOM_SCM

#if defined(CONFIG_QCOM_SCM) || defined(CONFIG_QCOM_SCM_QCPE)

extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,

		void *resp_buf, size_t resp_len);
@@ -230,7 +230,7 @@ static inline int scm_io_write(phys_addr_t address, u32 val) 
	return 0;

}



inline bool scm_is_secure_device(void)

static inline bool scm_is_secure_device(void)

{

	return false;

}