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

Commit cdfb89fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Force sequential boot for MSA modem"

parents 67af11f6 7d9369c8

drivers/soc/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -343,6 +343,15 @@ config QCOM_WCNSS_CTRL 
	  Client driver for the WCNSS_CTRL SMD channel, used to download nv

	  firmware to a newly booted WCNSS chip.



config MSM_PIL_MSS_QDSP6V5

	tristate "MSS QDSP6v5 (Hexagon) Boot Support"

	depends on MSM_PIL && MSM_SUBSYSTEM_RESTART

	help

	 Support for booting and shutting down QDSP6v5 (Hexagon) processors

	 in modem subsystems. If you would like to make or receive phone

	 calls then say Y here.

	 If unsure, say N.



config SETUP_SSR_NOTIF_TIMEOUTS

	bool "Set timeouts on SSR sysmon notifications and notifier callbacks"

	help

drivers/soc/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ obj-$(CONFIG_MSM_SERVICE_NOTIFIER) += service-notifier.o 
obj-$(CONFIG_MSM_SERVICE_LOCATOR) += service-locator.o

obj-$(CONFIG_MSM_SYSMON_GLINK_COMM) += sysmon-glink.o

obj-$(CONFIG_MSM_SYSMON_QMI_COMM) += sysmon-qmi.o

obj-$(CONFIG_MSM_PIL_MSS_QDSP6V5) += pil-q6v5.o pil-msa.o pil-q6v5-mss.o

obj-$(CONFIG_MSM_PIL_SSR_GENERIC) += subsys-pil-tz.o

obj-$(CONFIG_MEM_SHARE_QMI_SERVICE)		+= memshare/

obj-$(CONFIG_MSM_PIL)   +=      peripheral-loader.o

drivers/soc/qcom/peripheral-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ int pil_boot(struct pil_desc *desc) 
	 * Fallback to serial loading of blobs if the

	 * workqueue creatation failed during module init.

	 */

	if (pil_wq) {

	if (pil_wq && !(desc->sequential_loading)) {

		ret = pil_load_segs(desc);

		if (ret)

			goto err_deinit_image;

drivers/soc/qcom/peripheral-loader.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct pil_desc { 
	bool shutdown_fail;

	bool modem_ssr;

	bool clear_fw_region;

	bool sequential_loading;

	u32 subsys_vmid;

	bool signal_aop;

	struct mbox_client cl;