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

Commit 36bf04d1 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 de8228f6 60481847

Documentation/devicetree/bindings/pil/pil-q6v5-mss.txt

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ shutting down the processor when it's not needed. 


Required properties:

- compatible:	      Must be "qcom,pil-q6v5-mss" or "qcom,pil-q6v55-mss" or

			"pil-q6v56-mss".

			"qcom,pil-q6v56-mss".

- reg:		      Pairs of physical base addresses and region sizes of

		      memory mapped registers.

- reg-names:	      Names of the bases for the above registers. "qdsp6_base",
@@ -85,6 +85,8 @@ Optional properties: 
		    wordline clamp, and compiler memory clamp during MSS restart.

- qcom,qdsp6v56-1-10: Boolean- Present if the qdsp version is v56 1.10

- qcom,override-acc-1: Override the default ACC settings with this value if present.

- qcom,minidump-id: Unique id for each subsystem

- qcom,reset-clk: Enable clock after MSS restart



One child node to represent the MBA image may be specified, when the MBA image

needs to be loaded in a specifically carved out memory region.

drivers/soc/qcom/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -411,6 +411,16 @@ config MSM_PIL_SSR_GENERIC 
         or a fatal error. Subsystems include LPASS, Venus, VPU, WCNSS and

         BCSS.



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
@@ -54,6 +54,7 @@ obj-$(CONFIG_MSM_SYSMON_GLINK_COMM) += sysmon-glink.o 
obj-$(CONFIG_MSM_SYSMON_QMI_COMM) += sysmon-qmi.o

obj-$(CONFIG_MEM_SHARE_QMI_SERVICE)		+= memshare/

obj-$(CONFIG_MSM_PIL)   +=      peripheral-loader.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_QCOM_RUN_QUEUE_STATS) += rq_stats.o

obj-$(CONFIG_MSM_SPCOM) += spcom.o

drivers/soc/qcom/peripheral-loader.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,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
@@ -69,6 +69,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;