Support mute notifications for CS35L41 HDA
v3 cover Support mute notifications for CS35L41 HDA
Some systems use a special keyboard shortcut to mute speaker audio. On systems using CS35L41 HDA which have this shortcut, add a mechanism which uses ACPI notifications to determine when the shortcut is pressed, and then mute the amps inside the driver.
Since this is not a normal mute mechanism, it does not go through userspace. To allow userspace to be able to track this special state, add an ALSA control which tracks the state of this forced mute
Changes since v2:
- Fixed compile issue when CONFIG_ACPI is missing
Stefan Binding (1):
ALSA: hda: cs35l41: Add read-only ALSA control for forced mute
Vitaly Rodionov (1):
ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA
sound/pci/hda/cs35l41_hda.c | 132 ++++++++++++++++++++++++++++++---- sound/pci/hda/cs35l41_hda.h | 3 + sound/pci/hda/hda_component.h | 4 ++ sound/pci/hda/patch_realtek.c | 85 +++++++++++++++++++++- 4 files changed, 210 insertions(+), 14 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA
From: Vitaly Rodionov <[email protected]>
Some laptops require a hardware based mute system, where when a hotkey is pressed, it forces the amp to be muted.
For CS35L41, when the hotkey is pressed, an acpi notification is sent to the CS35L41 Device Node. The driver needs to handle this notification and call a _DSM function to retrieve the mute state.
Since the amp is only muted during playback, the driver will only mute or unmute if playback is occurring, otherwise it will save the mute state for when playback starts.
Only one handler can be registered for the acpi notification, but all amps need to receive that notification, we can register a single handler inside the Realtek HDA driver, so that it can then notify through the component framework.
--- sound/pci/hda/cs35l41_hda.c | 104 +++++++++++++++++++++++++++++----- sound/pci/hda/cs35l41_hda.h | 3 + sound/pci/hda/hda_component.h | 4 ++ sound/pci/hda/patch_realtek.c | 85 ++++++++++++++++++++++++++- 4 files changed, 182 insertions(+), 14 deletions(-)
sound/pci/hda/cs35l41_hda.c +91 -13
@@ -33,6 +33,9 @@#define CAL_AMBIENT_DSP_CTL_NAME "CAL_AMBIENT"#define CAL_DSP_CTL_TYPE 5#define CAL_DSP_CTL_ALG 205 +#define CS35L41_UUID "50d90cdc-3de4-4f18-b528-c7fe3b71f40d" +#define CS35L41_DSM_GET_MUTE 5 +#define CS35L41_NOTIFY_EVENT 0x91static bool firmware_autostart =1 ;module_param (firmware_autostart, bool,0444 );
@@ -520,6 +523,31 @@ static void cs35l41_hda_play_start(struct device *dev) } +static void cs35l41_mute (struct device *dev,bool mute) +{ +struct cs35l41_hda *cs35l41 =dev_get_drvdata (dev); +struct regmap *reg = cs35l41->regmap; + +dev_dbg (dev,"Mute(%d:%d) Playback Started: %d\n" , mute, cs35l41->mute_override, + cs35l41->playback_started); + +if (cs35l41->playback_started) { +if (mute || cs35l41->mute_override) { +dev_dbg (dev,"Muting\n" ); +regmap_multi_reg_write (reg, cs35l41_hda_mute,ARRAY_SIZE (cs35l41_hda_mute)); + }else { +dev_dbg (dev,"Unmuting\n" ); +if (cs35l41->firmware_running) { +regmap_multi_reg_write (reg, cs35l41_hda_unmute_dsp, +ARRAY_SIZE (cs35l41_hda_unmute_dsp)); + }else { +regmap_multi_reg_write (reg, cs35l41_hda_unmute, +ARRAY_SIZE (cs35l41_hda_unmute)); + } + } + } +} +static void cs35l41_hda_play_done (struct device *dev) {struct cs35l41_hda *cs35l41 =dev_get_drvdata (dev);
@@ -529,13 +557,7 @@ static void cs35l41_hda_play_done(struct device *dev)cs35l41_global_enable (dev, reg, cs35l41->hw_cfg.bst_type,1 , cs35l41->firmware_running); -if (cs35l41->firmware_running) { -regmap_multi_reg_write (reg, cs35l41_hda_unmute_dsp, -ARRAY_SIZE (cs35l41_hda_unmute_dsp)); - }else { -regmap_multi_reg_write (reg, cs35l41_hda_unmute, -ARRAY_SIZE (cs35l41_hda_unmute)); - } +cs35l41_mute (dev, false); }static void cs35l41_hda_pause_start (struct device *dev)
@@ -545,7 +567,7 @@ static void cs35l41_hda_pause_start(struct device *dev)dev_dbg (dev,"Pause (Start)\n" ); -regmap_multi_reg_write (reg, cs35l41_hda_mute,ARRAY_SIZE (cs35l41_hda_mute)); +cs35l41_mute (dev, true);cs35l41_global_enable (dev, reg, cs35l41->hw_cfg.bst_type,0 , cs35l41->firmware_running); }
@@ -1073,6 +1095,53 @@ static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)return 0 ; } +static bool cs35l41_dsm_supported (acpi_handle handle,unsigned int commands) +{ +guid_t guid; + +guid_parse (CS35L41_UUID , &guid); + +return acpi_check_dsm (handle, &guid,0 ,BIT (commands)); +} + +static int cs35l41_get_acpi_mute_state (struct cs35l41_hda *cs35l41,acpi_handle handle) +{ +guid_t guid; +union acpi_object *ret; +int mute = -ENODEV ; + +guid_parse (CS35L41_UUID , &guid); + +if (cs35l41_dsm_supported (handle,CS35L41_DSM_GET_MUTE )) { + ret =acpi_evaluate_dsm (handle, &guid,0 ,CS35L41_DSM_GET_MUTE ,NULL ); + mute = *ret->buffer.pointer; +dev_dbg (cs35l41->dev,"CS35L41_DSM_GET_MUTE: %d\n" , mute); + } + +dev_dbg (cs35l41->dev,"%s: %d\n" , __func__, mute); + +return mute; +} + +static void cs35l41_acpi_device_notify (acpi_handle handle,u32 event,struct device *dev) +{ +struct cs35l41_hda *cs35l41 =dev_get_drvdata (dev); +int mute; + +if (event !=CS35L41_NOTIFY_EVENT ) +return ; + + mute =cs35l41_get_acpi_mute_state (cs35l41, handle); +if (mute <0 ) { +dev_warn (cs35l41->dev,"Unable to retrieve mute state: %d\n" , mute); +return ; + } + +dev_dbg (cs35l41->dev,"Requesting mute value: %d\n" , mute); + cs35l41->mute_override = (mute >0 ); +cs35l41_mute (cs35l41->dev, cs35l41->mute_override); +} +static int cs35l41_hda_bind (struct device *dev,struct device *master,void *master_data) {struct cs35l41_hda *cs35l41 =dev_get_drvdata (dev);
@@ -1114,6 +1183,14 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas comps->playback_hook = cs35l41_hda_playback_hook; comps->pre_playback_hook = cs35l41_hda_pre_playback_hook; comps->post_playback_hook = cs35l41_hda_post_playback_hook; + comps->acpi_notify = cs35l41_acpi_device_notify; + comps->adev = cs35l41->dacpi; + + comps->acpi_notifications_supported =cs35l41_dsm_supported (acpi_device_handle (comps->adev), +CS35L41_DSM_GET_MUTE ); + + cs35l41->mute_override =cs35l41_get_acpi_mute_state (cs35l41, +acpi_device_handle (cs35l41->dacpi)) >0 ;mutex_unlock (&cs35l41->fw_mutex);
@@ -1387,8 +1464,8 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, ireturn -ENODEV ; } + cs35l41->dacpi = adev; physdev =get_device (acpi_get_first_physical_node (adev)); -acpi_dev_put (adev); sub =acpi_get_subsystem_id (ACPI_HANDLE (physdev));if (IS_ERR (sub))
@@ -1498,6 +1575,7 @@ static int cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41, const char *hid, i hw_cfg->valid = false; hw_cfg->gpio1.valid = false; hw_cfg->gpio2.valid = false; +acpi_dev_put (cs35l41->dacpi); put_physdev:put_device (physdev);
@@ -1601,10 +1679,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int iif (ret) goto err; - ret =regmap_multi_reg_write (cs35l41->regmap, cs35l41_hda_mute, -ARRAY_SIZE (cs35l41_hda_mute)); -if (ret) - goto err; +cs35l41_mute (cs35l41->dev, true);INIT_WORK (&cs35l41->fw_load_work, cs35l41_fw_load_work);mutex_init (&cs35l41->fw_mutex);
@@ -1641,6 +1716,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int iif (cs35l41_safe_reset (cs35l41->regmap, cs35l41->hw_cfg.bst_type))gpiod_set_value_cansleep (cs35l41->reset_gpio,0 );gpiod_put (cs35l41->reset_gpio); +acpi_dev_put (cs35l41->dacpi);kfree (cs35l41->acpi_subsystem_id);return ret;
@@ -1660,6 +1736,8 @@ void cs35l41_hda_remove(struct device *dev)component_del (cs35l41->dev, &cs35l41_hda_comp_ops); +acpi_dev_put (cs35l41->dacpi); +pm_runtime_put_noidle (cs35l41->dev);if (cs35l41_safe_reset (cs35l41->regmap, cs35l41->hw_cfg.bst_type))
sound/pci/hda/cs35l41_hda.h +3 -0
@@ -10,6 +10,7 @@#ifndef __CS35L41_HDA_H__#define __CS35L41_HDA_H__ +#include <linux/acpi.h> #include <linux/efi.h> #include <linux/regulator/consumer.h> #include <linux/gpio/consumer.h>
@@ -70,6 +71,8 @@ struct cs35l41_hda {bool halo_initialized;bool playback_started;struct cs_dsp cs_dsp; +struct acpi_device *dacpi; +bool mute_override; };enum halo_state {
sound/pci/hda/hda_component.h +4 -0
@@ -6,6 +6,7 @@* Cirrus Logic International Semiconductor Ltd. */ +#include <linux/acpi.h> #include <linux/component.h> #define HDA_MAX_COMPONENTS 4
@@ -15,6 +16,9 @@ struct hda_component {struct device *dev;char name[HDA_MAX_NAME_SIZE ];struct hda_codec *codec; +struct acpi_device *adev; +bool acpi_notifications_supported; +void (*acpi_notify)(acpi_handle handle,u32 event,struct device *dev);void (*pre_playback_hook)(struct device *dev,int action);void (*playback_hook)(struct device *dev,int action);void (*post_playback_hook)(struct device *dev,int action);
sound/pci/hda/patch_realtek.c +84 -1
109 lines not on this page · raw message
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH v3 1/2] ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA
kernel test robot noticed the following build warnings:
Hi Stefan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20230919]
[cannot apply to tiwai-sound/for-next tiwai-sound/for-linus v6.6-rc2 v6.6-rc1 v6.5 linus/master v6.6-rc2] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Stefan-Binding/ALSA-hda-cs35l41-Support-mute-notifications-for-CS35L41-HDA/20230920-005359 base: next-20230919 patch link: https://lore.kernel.org/r/20230919142240.467682-2-sbinding%40opensource.cirrus.com patch subject: [PATCH v3 1/2] ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20230920/[email protected]/config) compiler: m68k-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20230920/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
sound/pci/hda/patch_realtek.c: In function 'comp_acpi_device_notify':
sound/pci/hda/patch_realtek.c:6718:52: error: implicit declaration of function 'acpi_device_handle'; did you mean 'acpi_fwnode_handle'? [-Werror=implicit-function-declaration]
6718 | spec->comps[i].acpi_notify(acpi_device_handle(spec->comps[i].adev), event,
| ^~~~~~~~~~~~~~~~~~
| acpi_fwnode_handle
sound/pci/hda/patch_realtek.c:6718:52: warning: passing argument 1 of 'spec->comps[i].acpi_notify' makes pointer from integer without a cast [-Wint-conversion]
6718 | spec->comps[i].acpi_notify(acpi_device_handle(spec->comps[i].adev), event,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| int
sound/pci/hda/patch_realtek.c:6718:52: note: expected 'acpi_handle' {aka 'void *'} but argument is of type 'int'
sound/pci/hda/patch_realtek.c: At top level:
>> sound/pci/hda/patch_realtek.c:6708:13: warning: 'comp_acpi_device_notify' defined but not used [-Wunused-function] 6708 | static void comp_acpi_device_notify(acpi_handle handle, u32 event, void *data)
| ^~~~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/comp_acpi_device_notify +6708 sound/pci/hda/patch_realtek.c
6707
> 6708 static void comp_acpi_device_notify(acpi_handle handle, u32 event, void *data)
6709 {
6710 struct hda_codec *cdc = data;
6711 struct alc_spec *spec = cdc->spec;
6712 int i;
6713
6714 codec_info(cdc, "ACPI Notification %d\n", event);
6715
6716 for (i = 0; i < HDA_MAX_COMPONENTS; i++) {
6717 if (spec->comps[i].dev && spec->comps[i].acpi_notify)
> 6718 spec->comps[i].acpi_notify(acpi_device_handle(spec->comps[i].adev), event, 6719 spec->comps[i].dev);
6720 }
6721 }
6722
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH v3 1/2] ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA
In reply to Stefan BindingQuoted 14 lines · Stefan Binding
From: Vitaly Rodionov <[email protected]>
Some laptops require a hardware based mute system, where when a hotkey is pressed, it forces the amp to be muted.
For CS35L41, when the hotkey is pressed, an acpi notification is sent to the CS35L41 Device Node. The driver needs to handle this notification and call a
_DSMfunction to retrieve the mute state.Since the amp is only muted during playback, the driver will only mute or unmute if playback is occurring, otherwise it will save the mute state for when playback starts.
Quoted 7 lines
Only one handler can be registered for the acpi notification, but all amps need to receive that notification, we can register a single handler inside the Realtek HDA driver, so that it can then notify through the component framework.
Signed-off-by Vitaly Rodionov <[email protected]>Signed-off-by Stefan Binding <[email protected]>
The patch is a bit lengthy. I'd split the binding of patch_realtek.c into another patch. That part is fairly generic.
Quoted 2 lines
sound/pci/hda/patch_realtek.c +0
-0
(snip)
Quoted 4 lines
sound/pci/hda/patch_realtek.c +4
-0+static void comp_acpi_device_notify (acpi_handle handle,u32 event,void *data) +{ +struct hda_codec *cdc = data; +struct alc_spec *spec = cdc->spec;
sound/pci/hda/patch_realtek.c static void alc287_fixup_legion_15imhg05_speakers(struct hda_codec *codec, · line 6721
Quoted 10 lines
sound/pci/hda/patch_realtek.c +10
-0+int i; + +codec_info (cdc,"ACPI Notification %d\n" , event); + +for (i =0 ; i <HDA_MAX_COMPONENTS ; i++) { +if (spec->comps[i].dev && spec->comps[i].acpi_notify) + spec->comps[i].acpi_notify (acpi_device_handle (spec->comps[i].adev), event, + spec->comps[i].dev); + } +}
This function should be in #ifdef CONFIG_ACPI, too.
thanks,
Takashi
PATCH v3 2/2 ALSA: hda: cs35l41: Add read-only ALSA control for forced mute
In reply to Stefan BindingWhen the CS35L41 amp is requested to mute using the ACPI notification mechanism, userspace is not notified that the amp is muted. To allow userspace to know about the mute, add an ALSA control which tracks the forced mute override. This control does not track the overall mute state of the amp, since the amp is only unmuted during playback anyway, instead it tracks the mute override request from the ACPI notification.
--- sound/pci/hda/cs35l41_hda.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
sound/pci/hda/cs35l41_hda.c +28 -0
@@ -972,6 +972,15 @@ static int cs35l41_fw_load_ctl_get(struct snd_kcontrol *kcontrol,return 0 ; } +static int cs35l41_mute_override_ctl_get (struct snd_kcontrol *kcontrol, +struct snd_ctl_elem_value *ucontrol) +{ +struct cs35l41_hda *cs35l41 =snd_kcontrol_chip (kcontrol); + + ucontrol->value.integer.value[0 ] = cs35l41->mute_override; +return 0 ; +} +static void cs35l41_fw_load_work (struct work_struct *work) { struct cs35l41_hda *cs35l41 = container_of(work, struct cs35l41_hda, fw_load_work);
@@ -1055,6 +1064,7 @@ static int cs35l41_create_controls(struct cs35l41_hda *cs35l41) {char fw_type_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ];char fw_load_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ]; +char mute_override_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN ];struct snd_kcontrol_new fw_type_ctl = { .name = fw_type_ctl_name, .iface =SNDRV_CTL_ELEM_IFACE_CARD ,
@@ -1069,12 +1079,21 @@ static int cs35l41_create_controls(struct cs35l41_hda *cs35l41) .get = cs35l41_fw_load_ctl_get, .put = cs35l41_fw_load_ctl_put, }; +struct snd_kcontrol_new mute_override_ctl = { + .name = mute_override_ctl_name, + .iface =SNDRV_CTL_ELEM_IFACE_CARD , + .info = snd_ctl_boolean_mono_info, + .access =SNDRV_CTL_ELEM_ACCESS_READ |SNDRV_CTL_ELEM_ACCESS_VOLATILE , + .get = cs35l41_mute_override_ctl_get, + };int ret;scnprintf (fw_type_ctl_name,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ,"%s DSP1 Firmware Type" , cs35l41->amp_name);scnprintf (fw_load_ctl_name,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ,"%s DSP1 Firmware Load" , cs35l41->amp_name); +scnprintf (mute_override_ctl_name,SNDRV_CTL_ELEM_ID_NAME_MAXLEN ,"%s Forced Mute Status" , + cs35l41->amp_name); ret =snd_ctl_add (cs35l41->codec->card,snd_ctl_new1 (&fw_type_ctl, cs35l41));if (ret) {
@@ -1092,6 +1111,15 @@ static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)dev_dbg (cs35l41->dev,"Added Control %s\n" , fw_load_ctl.name); + ret =snd_ctl_add (cs35l41->codec->card,snd_ctl_new1 (&mute_override_ctl, cs35l41)); +if (ret) { +dev_err (cs35l41->dev,"Failed to add KControl %s = %d\n" , mute_override_ctl.name, + ret); +return ret; + } + +dev_dbg (cs35l41->dev,"Added Control %s\n" , mute_override_ctl.name); +return 0 ; }
Signature · 1 line
2.34.1