Revert "dsp: add workqueue for audio_prm and pinctrl_lpi"

This reverts commit 8b3578665bf0041282606a67f6dd97f8220af521 as
it would cause NOC issue.
Move clk reset and snd_event_notify from PD notification to
ssr_enable function to make sure these are done after GPR is
up.

Change-Id: I784ad03093846434313967bcf18c946b3ef18bfc
Signed-off-by: Meng Wang <[email protected]>

dsp/audio_prm.c

@@ -30,7 +30,6 @@ struct audio_prm {
 	atomic_t state;
 	atomic_t status;
 	bool is_adsp_up;
-	struct work_struct reset_work;
 };
 
 static struct audio_prm g_prm;
@@ -307,13 +306,6 @@ int audio_prm_set_lpass_clk_cfg (struct clk_cfg *clk, uint8_t enable)
 }
 EXPORT_SYMBOL(audio_prm_set_lpass_clk_cfg);
 
-static void audio_prm_adsp_work(struct work_struct *work)
-{
-	mutex_lock(&g_prm.lock);
-	g_prm.is_adsp_up = true;
-	mutex_unlock(&g_prm.lock);
-}
-
 static int audio_prm_service_cb(struct notifier_block *this,
 				unsigned long opcode, void *data)
 {
@@ -328,7 +320,9 @@ static int audio_prm_service_cb(struct notifier_block *this,
 		mutex_unlock(&g_prm.lock);
 		break;
 	case AUDIO_NOTIFIER_SERVICE_UP:
-		schedule_work(&g_prm.reset_work);
+		mutex_lock(&g_prm.lock);
+		g_prm.is_adsp_up = true;
+		mutex_unlock(&g_prm.lock);
 		break;
 	default:
 		break;
@@ -360,7 +354,6 @@ static int audio_prm_probe(struct gpr_device *adev)
 
 	init_waitqueue_head(&g_prm.wait);
 	g_prm.is_adsp_up = true;
-	INIT_WORK(&g_prm.reset_work, audio_prm_adsp_work);
 	pr_err("%s: prm probe success\n", __func__);
 	return ret;
 }
@@ -373,9 +366,6 @@ static int audio_prm_remove(struct gpr_device *adev)
 	mutex_lock(&g_prm.lock);
 	g_prm.is_adsp_up = false;
 	g_prm.adev = NULL;
-	flush_work(&g_prm.reset_work);
-	cancel_work_sync(&g_prm.reset_work);
-	INIT_WORK(&g_prm.reset_work, NULL);
 	mutex_unlock(&g_prm.lock);
 	return ret;
 }

soc/pinctrl-lpi.c

@@ -68,6 +68,7 @@
 
 static bool lpi_dev_up;
 static struct device *lpi_dev;
+static bool initial_boot = false;
 
 /* The index of each function in lpi_gpio_functions[] array */
 enum lpi_gpio_func_index {
@@ -119,7 +120,6 @@ struct lpi_gpio_state {
 	struct mutex         slew_access_lock;
 	bool core_hw_vote_status;
 	struct mutex        core_hw_vote_lock;
-	struct work_struct reset_work;
 };
 
 static const char *const lpi_gpio_groups[] = {
@@ -472,24 +472,9 @@ static void lpi_gpio_set(struct gpio_chip *chip, unsigned int pin, int value)
 	lpi_config_set(state->ctrl, pin, &config, 1);
 }
 
-static void lpi_clk_reset(struct work_struct *work)
-{
-	struct lpi_gpio_state *state = dev_get_drvdata(lpi_dev);
-
-	if (state->lpass_core_hw_vote)
-		digital_cdc_rsc_mgr_hw_vote_reset(
-			state->lpass_core_hw_vote);
-	if (state->lpass_audio_hw_vote)
-		digital_cdc_rsc_mgr_hw_vote_reset(
-			state->lpass_audio_hw_vote);
-}
-
 static int lpi_notifier_service_cb(struct notifier_block *this,
 				   unsigned long opcode, void *ptr)
 {
-	static bool initial_boot = true;
-	struct lpi_gpio_state *state = dev_get_drvdata(lpi_dev);
-
 	pr_debug("%s: Service opcode 0x%lx\n", __func__, opcode);
 
 	switch (opcode) {
@@ -498,22 +483,15 @@ static int lpi_notifier_service_cb(struct notifier_block *this,
 			initial_boot = false;
 			break;
 		}
-		snd_event_notify(lpi_dev, SND_EVENT_DOWN);
 		lpi_dev_up = false;
 		break;
 	case AUDIO_NOTIFIER_SERVICE_UP:
-		if (initial_boot)
+		if (initial_boot) {
 			initial_boot = false;
 
-		/* Reset HW votes after SSR */
-		if (!lpi_dev_up) {
-			/* Add 100ms sleep to ensure AVS is up after SSR */
-			msleep(100);
-			schedule_work(&state->reset_work);
+			lpi_dev_up = true;
+			snd_event_notify(lpi_dev, SND_EVENT_UP);
 		}
-
-		lpi_dev_up = true;
-		snd_event_notify(lpi_dev, SND_EVENT_UP);
 		break;
 	default:
 		break;
@@ -567,8 +545,33 @@ static void lpi_pinctrl_ssr_disable(struct device *dev, void *data)
 	lpi_pinctrl_suspend(dev);
 }
 
+static int lpi_pinctrl_ssr_enable(struct device *dev, void *data)
+{
+	struct lpi_gpio_state *state = dev_get_drvdata(lpi_dev);
+	dev_dbg(dev, "%s: enter\n", __func__);
+
+	if (!initial_boot) {
+		trace_printk("%s: enter\n", __func__);
+		if (!lpi_dev_up) {
+			msleep(100);
+			if (state->lpass_core_hw_vote)
+				digital_cdc_rsc_mgr_hw_vote_reset(
+					state->lpass_core_hw_vote);
+			if (state->lpass_audio_hw_vote)
+				digital_cdc_rsc_mgr_hw_vote_reset(
+					state->lpass_audio_hw_vote);
+		}
+
+		lpi_dev_up = true;
+	}
+
+	dev_dbg(dev, "%s: leave\n", __func__);
+	return 0;
+}
+
 static const struct snd_event_ops lpi_pinctrl_ssr_ops = {
 	.disable = lpi_pinctrl_ssr_disable,
+	.enable = lpi_pinctrl_ssr_enable,
 };
 
 #ifdef CONFIG_DEBUG_FS
@@ -750,7 +753,6 @@ static int lpi_pinctrl_probe(struct platform_device *pdev)
 	}
 
 	state->base = lpi_base;
-	INIT_WORK(&state->reset_work, lpi_clk_reset);
 
 	for (i = 0; i < npins; i++, pindesc++) {
 		pad = &pads[i];
@@ -801,6 +803,7 @@ static int lpi_pinctrl_probe(struct platform_device *pdev)
 
 	lpi_dev = &pdev->dev;
 	lpi_dev_up = true;
+	initial_boot = true;
 
 	ret = snd_event_client_register(dev, &lpi_pinctrl_ssr_ops, NULL);
 	if (!ret) {