Merge "dsp: increase the spf close all command timeout"

asoc/codecs/wcd-mbhc-v2.c

@@ -1141,6 +1141,17 @@ static irqreturn_t wcd_mbhc_mech_plug_detect_irq(int irq, void *data)
 	struct wcd_mbhc *mbhc = data;
 
 	pr_debug("%s: enter\n", __func__);
+
+	/* WCD USB AATC did not required mech plug detection, will receive
+	 * insertion/removal events from UCSI layer
+	 */
+#if IS_ENABLED(CONFIG_QCOM_WCD_USBSS_I2C)
+	if (mbhc->mbhc_cfg->enable_usbc_analog) {
+		pr_debug("%s: leave, (irq_none)", __func__);
+		return IRQ_NONE;
+	}
+#endif
+
 	if (mbhc == NULL) {
 		pr_err("%s: NULL irq data\n", __func__);
 		return IRQ_NONE;

dsp/spf-core.c

@@ -26,6 +26,7 @@
 
 #define APM_STATE_READY_TIMEOUT_MS    10000
 #define Q6_READY_TIMEOUT_MS 1000
+#define Q6_CLOSE_ALL_TIMEOUT_MS 5000
 #define APM_CMD_GET_SPF_STATE 0x01001021
 #define APM_CMD_CLOSE_ALL 0x01001013
 #define APM_CMD_RSP_GET_SPF_STATE 0x02001007
@@ -239,8 +240,20 @@ void spf_core_apm_close_all(void)
 		goto done;
 	}
 
+
+	/* While graph_open is processing by the SPF, apps receives
+	 * userspace(agm/pal) crash which will triggers spf_close_all
+	 * cmd from msm common drivers and immediately calls
+	 * msm_audio_ion_crash_handler() which will un-maps the memory. But
+	 * here SPF is still in processing the graph_open, recieved spf_close_all
+	 * cmd is queued in SPF. Due to un-mapping is done immediately in HLOS
+	 * will resulting in SMMU fault.
+	 * To avoid such scenarios, increased the spf_close_all cmd timeout,
+	 * because the AGM timeout for the graph_open is 4sec, so increase the timeout
+	 * for spf_close_all cmd response until graph open completes or timed out.
+	*/
 	rc = wait_event_timeout(core->wait, (core->resp_received),
-				msecs_to_jiffies(Q6_READY_TIMEOUT_MS));
+				msecs_to_jiffies(Q6_CLOSE_ALL_TIMEOUT_MS));
 	dev_info_ratelimited(spf_core_priv->dev, "%s: wait event unblocked \n", __func__);
 	if (rc > 0 && core->resp_received) {
 		if (core->status != 0)