audio: mic_privacy: Fix pricacy feature not working after D3 resume

When resuming from D3 state, the microphone privacy feature wasn't being
properly restored. This led to failures in privacy tests, as the system
didn't respond to privacy button inputs after a D3 transition.

This patch fixes the issue by implementing proper state restoration in
resume_dais():
- Re-initialize mic_privacy_manager when exiting D3
- Restore privacy settings based on saved state before D3
- Re-enable DMIC IRQ handlers to catch further privacy state changes
- Add additional validation and logging to track D3 transition behavior

The fix improves the mic_privacy_enable_dmic_irq function to handle D3
state transitions more robustly by immediately checking the IRQ status
after re-enabling handlers to catch any events that may have occurred
during D3.

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>

Author: tmleman

src/audio/mic_privacy_manager/mic_privacy_manager_intel.c

@@ -62,11 +62,29 @@ static void enable_fw_managed_irq(bool enable_irq)
 
 void mic_privacy_enable_dmic_irq(bool enable_irq)
 {
+	/* Only proceed if we have a valid device and API */
+	if (!mic_priv_dev || !mic_privacy_api) {
+		LOG_ERR("mic_privacy device or API not initialized");
+		return;
+	}
+
 	if (mic_privacy_api->get_policy() == MIC_PRIVACY_HW_MANAGED) {
-		if (enable_irq)
+		if (enable_irq) {
 			mic_privacy_api->enable_dmic_irq(true, handle_dmic_irq);
-		else
+
+			/* Check current status immediately to handle any transitions during D3 */
+			if (mic_privacy_api->get_dmic_irq_status()) {
+				struct mic_privacy_settings settings;
+				uint32_t mic_disable_status =
+					mic_privacy_api->get_dmic_mic_disable_status();
+
+				mic_privacy_fill_settings(&settings, mic_disable_status);
+				mic_privacy_propagate_settings(&settings);
+				mic_privacy_api->clear_dmic_irq_status();
+			}
+		} else {
 			mic_privacy_api->enable_dmic_irq(false, NULL);
+		}
 	}
 }
 
@@ -84,6 +102,9 @@ int mic_privacy_manager_init(void)
 		LOG_INF("mic_privacy init FW_MANAGED mode");
 		mic_privacy_api->set_fw_managed_mode(true);
 		enable_fw_managed_irq(true);
+	} else if (mic_privacy_policy == MIC_PRIVACY_HW_MANAGED) {
+		LOG_INF("mic_privacy init HW_MANAGED mode");
+		mic_privacy_api->enable_dmic_irq(true, handle_dmic_irq);
 	}
 
 	return 0;

zephyr/lib/cpu.c

@@ -11,6 +11,12 @@
  */
 
 #include <sof/audio/component.h>
+#if CONFIG_INTEL_ADSP_MIC_PRIVACY
+#include <sof/audio/mic_privacy_manager.h>
+#ifdef CONFIG_ADSP_IMR_CONTEXT_SAVE
+static bool mic_privacy_enabled;
+#endif /* CONFIG_ADSP_IMR_CONTEXT_SAVE */
+#endif /* CONFIG_INTEL_ADSP_MIC_PRIVACY */
 #include <sof/init.h>
 #include <sof/lib/cpu.h>
 #include <sof/lib/pm_runtime.h>
@@ -64,6 +70,7 @@ extern void *global_imr_ram_storage;
  * data integrity across D3 transitions, which is critical for SOF's operation
  * and currently outside the scope of Zephyr's device-level PM capabilities.
  */
+
 static void suspend_dais(void)
 {
 	struct ipc_comp_dev *icd;
@@ -79,6 +86,14 @@ static void suspend_dais(void)
 
 		mod = comp_mod(icd->cd);
 		cd = module_get_private_data(mod);
+#if CONFIG_INTEL_ADSP_MIC_PRIVACY
+		if (cd->mic_priv) {
+			if (mic_privacy_manager_get_policy() == MIC_PRIVACY_FW_MANAGED)
+				mic_privacy_enabled = true;
+			else
+				mic_privacy_enabled = false;
+		}
+#endif
 		dd = cd->dd[0];
 		if (dai_remove(dd->dai->dev) < 0) {
 			tr_err(&zephyr_tr, "DAI suspend failed, type %d index %d",
@@ -95,6 +110,13 @@ static void resume_dais(void)
 	struct copier_data *cd;
 	struct dai_data *dd;
 
+#if CONFIG_INTEL_ADSP_MIC_PRIVACY
+	/* Re-initialize mic privacy manager first to ensure proper state
+	 * before DAI resume
+	 */
+	mic_privacy_manager_init();
+#endif
+
 	list_for_item(clist, &ipc_get()->comp_list) {
 		icd = container_of(clist, struct ipc_comp_dev, list);
 		if (icd->type != COMP_TYPE_COMPONENT || dev_comp_type(icd->cd) != SOF_COMP_DAI)
@@ -107,6 +129,23 @@ static void resume_dais(void)
 			tr_err(&zephyr_tr, "DAI resume failed, type %d index %d",
 			       dd->dai->type, dd->dai->index);
 		}
+
+#if CONFIG_INTEL_ADSP_MIC_PRIVACY
+		if (cd->mic_priv) {
+			if (mic_privacy_enabled) {
+				/* Need to restore MIC privacy settings */
+				struct mic_privacy_settings settings;
+
+				/* Update privacy settings based on saved state */
+				mic_privacy_fill_settings(&settings, MIC_PRIV_MUTED);
+				mic_privacy_propagate_settings(&settings);
+				/* Re-enable DMIC IRQ to handle further privacy state changes */
+				mic_privacy_enable_dmic_irq(true);
+				mic_privacy_enabled = false;
+				tr_dbg(&zephyr_tr, "DMIC privacy settings restored after D3");
+			}
+		}
+#endif
 	}
 }
 #endif /* CONFIG_ADSP_IMR_CONTEXT_SAVE */