ASoC: Intel: avs: L1SEN reference counted

Code loading is not the only procedure that manipulates L1SEN. Update
existing mechanism so the stream starting procedure can interfere with
L1SEN without causing any trouble to its other users.

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://msgid.link/r/20240220115035.770402-2-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/avs.h b/sound/soc/intel/avs/avs.h
index d694e08e44e1851fafb69352eeadafbb70d0def8..cb4302816e740417d96c2196a9be0fec27676e19 100644 (file)
--- a/sound/soc/intel/avs/avs.h
+++ b/sound/soc/intel/avs/avs.h
@@ -127,6 +127,7 @@ struct avs_dev {
        int *core_refs;         /* reference count per core */
        char **lib_names;
        int num_lp_paths;
+       atomic_t l1sen_counter; /* controls whether L1SEN should be disabled */
 
        struct completion fw_ready;
        struct work_struct probe_work;

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index db78eb2f0108071736b6bafa5e77f874b15f3375..30baaa5de01600e670dd5213203195dac1ca0f59 100644 (file)
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -69,9 +69,14 @@ void avs_hda_clock_gating_enable(struct avs_dev *adev, bool enable)
 
 void avs_hda_l1sen_enable(struct avs_dev *adev, bool enable)
 {
-       u32 value = enable ? AZX_VS_EM2_L1SEN : 0;
-
-       snd_hdac_chip_updatel(&adev->base.core, VS_EM2, AZX_VS_EM2_L1SEN, value);
+       if (enable) {
+               if (atomic_inc_and_test(&adev->l1sen_counter))
+                       snd_hdac_chip_updatel(&adev->base.core, VS_EM2, AZX_VS_EM2_L1SEN,
+                                             AZX_VS_EM2_L1SEN);
+       } else {
+               if (atomic_dec_return(&adev->l1sen_counter) == -1)
+                       snd_hdac_chip_updatel(&adev->base.core, VS_EM2, AZX_VS_EM2_L1SEN, 0);
+       }
 }
 
 static int avs_hdac_bus_init_streams(struct hdac_bus *bus)