Merge "ASoC: wcd-dsp-mgr: fix race during subsystem restart" (520dcbbe) · Commits · e / devices / android_kernel_fairphone_FP3

sound/soc/codecs/wcd-dsp-mgr.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -417,22 +417,23 @@ static int wdsp_download_segments(struct wdsp_mgr_priv *wdsp,
		/* Go through the list of segments and download one by one */
		list_for_each_entry(seg, wdsp->seg_list, list) {
		ret = wdsp_load_each_segment(wdsp, seg);
		if (ret < 0) {
		wdsp_broadcast_event_downseq(wdsp,
		WDSP_EVENT_DLOAD_FAILED,
		NULL);
		if (ret)
		goto dload_error;
		}
		}

		/* Flush the list before setting status and notifying components */
		wdsp_flush_segment_list(wdsp->seg_list);

		WDSP_SET_STATUS(wdsp, status);

		/* Notify all components that image is downloaded */
		wdsp_broadcast_event_downseq(wdsp, post, NULL);
		done:
		return ret;

		dload_error:
		wdsp_flush_segment_list(wdsp->seg_list);
		done:
		wdsp_broadcast_event_downseq(wdsp, WDSP_EVENT_DLOAD_FAILED, NULL);
		return ret;
		}

		@@ -486,10 +487,14 @@ static int wdsp_enable_dsp(struct wdsp_mgr_priv *wdsp)
		/* Make sure wdsp is in good state */
		if (!WDSP_STATUS_IS_SET(wdsp, WDSP_STATUS_CODE_DLOADED)) {
		WDSP_ERR(wdsp, "WDSP in invalid state 0x%x", wdsp->status);
		ret = -EINVAL;
		goto done;
		return -EINVAL;
		}

		/*
		* Acquire SSR mutex lock to make sure enablement of DSP
		* does not race with SSR handling.
		*/
		WDSP_MGR_MUTEX_LOCK(wdsp, wdsp->ssr_mutex);
		/* Download the read-write sections of image */
		ret = wdsp_download_segments(wdsp, WDSP_ELF_FLAG_WRITE);
		if (ret < 0) {
		@@ -510,6 +515,7 @@ static int wdsp_enable_dsp(struct wdsp_mgr_priv *wdsp)
		wdsp_broadcast_event_downseq(wdsp, WDSP_EVENT_POST_BOOTUP, NULL);
		WDSP_SET_STATUS(wdsp, WDSP_STATUS_BOOTED);
		done:
		WDSP_MGR_MUTEX_UNLOCK(wdsp, wdsp->ssr_mutex);
		return ret;
		}