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

Commit 4d0fbd6b authored by Siddharth Gupta's avatar Siddharth Gupta Committed by Elliot Berman
Browse files

firmware: qcom_scm: Merge qtee_shmbridge and qcom_scm 



Merge qtee_shmbridge and qcom_scm drivers into a single compilation unit.

Change-Id: Icfbf7c335fc8d9468236cdc08dfda52fa563be40
Signed-off-by: default avatarSiddharth Gupta <sidgup@codeaurora.org>
Signed-off-by: default avatarElliot Berman <eberman@codeaurora.org>
parent 29f1d94a

arch/arm64/configs/vendor/lahaina_QGKI.config

+1 −0
Original line number Diff line number Diff line
@@ -29,3 +29,4 @@ CONFIG_ION_POOL_AUTO_REFILL=y 
CONFIG_MSM_BT_POWER=m

CONFIG_QCOM_SCM=y

# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set

CONFIG_QTEE_SHM_BRIDGE=y

arch/arm64/configs/vendor/lahaina_debug.config

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ CONFIG_ATOMIC64_SELFTEST=m 
CONFIG_TEST_USER_COPY=m

CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y

CONFIG_OF_RESERVED_MEM_CHECK=y

CONFIG_QTEE_SHM_BRIDGE=y

CONFIG_SERIAL_MSM_GENI=y

CONFIG_SERIAL_MSM_GENI_CONSOLE=y

CONFIG_MSM_GENI_SE=y

drivers/firmware/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -255,6 +255,16 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT 


	  Say Y here to enable "download mode" by default.



config QTEE_SHM_BRIDGE

	bool "QTI TEE shared memory bridge"

	depends on QCOM_SCM

	help

	  QTEE shared memory bridge driver provides kernel APIs to share

	  memory between trustzone & other VMs through shared memory bridge.

	  It allows kernel clients to create bridge, delete bridge, and do

	  memory sub-allocation and free from the default kernel bridge

	  created by bridge driver.



config TI_SCI_PROTOCOL

	tristate "TI System Control Interface (TISCI) Message Protocol"

	depends on TI_MESSAGE_MANAGER

drivers/firmware/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_RASPBERRYPI_FIRMWARE) += raspberrypi.o 
obj-$(CONFIG_FW_CFG_SYSFS)	+= qemu_fw_cfg.o

obj-$(CONFIG_QCOM_SCM)		+= _qcom_scm.o

_qcom_scm-y			+= qcom_scm.o qcom_scm-smc.o

_qcom_scm-$(CONFIG_QTEE_SHM_BRIDGE)	+= qtee_shmbridge.o

obj-$(CONFIG_TI_SCI_PROTOCOL)	+= ti_sci.o

obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o

obj-$(CONFIG_TURRIS_MOX_RWTM)	+= turris-mox-rwtm.o

drivers/firmware/qcom_scm.c

+17 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/reset-controller.h>



#include "qcom_scm.h"

#include "qtee_shmbridge_internal.h"



static bool download_mode = IS_ENABLED(CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT);

module_param(download_mode, bool, 0);
@@ -632,6 +633,21 @@ static struct platform_driver qcom_scm_driver = { 


static int __init qcom_scm_init(void)

{

	return platform_driver_register(&qcom_scm_driver);

	int ret;



	ret = platform_driver_register(&qcom_scm_driver);

	if (ret)

		return ret;



	return qtee_shmbridge_driver_init();

}

subsys_initcall(qcom_scm_init);



#if IS_MODULE(CONFIG_QCOM_SCM)

static void __exit qcom_scm_exit(void)

{

	platform_driver_unregister(&qcom_scm_driver);

	qtee_shmbridge_driver_exit();

}

module_exit(qcom_scm_exit);

#endif