Skip to content

Commit

Permalink
ASoC: Intel: avs: L1SEN reference counted
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cezary Rojewski authored and Mark Brown committed Feb 20, 2024
1 parent b401b62 commit 1b72943
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions sound/soc/intel/avs/avs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 8 additions & 3 deletions sound/soc/intel/avs/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1b72943

Please sign in to comment.