| Message ID | 20210112171814.5404-1-Perry_Yuan@Dell.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/3] platform/x86: dell-privacy: Add support for Dell hardware privacy | expand |
> -----Original Message----- > From: Yuan, Perry <Perry_Yuan@Dell.com> > Sent: Tuesday, January 12, 2021 11:18 > To: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; > hdegoede@redhat.com; mgross@linux.intel.com > Cc: lgirdwood@gmail.com; broonie@kernel.org; alsa-devel@alsa-project.org; > linux-kernel@vger.kernel.org; platform-driver-x86@vger.kernel.org; Yuan, > Perry; Limonciello, Mario > Subject: [PATCH v3 3/3] ASoC: rt715:add micmute led state control supports > > From: Perry Yuan <perry_yuan@dell.com> > > Some new Dell system is going to support audio internal micphone > privacy setting from hardware level with micmute led state changing > When micmute hotkey pressed by user, soft mute will need to be enabled > firstly in case of pop noise, and codec driver need to react to mic > mute event to EC(embedded controller) notifying that SW mute is completed > Then EC will do the hardware mute physically within the timeout reached > > This patch allow codec rt715 driver to ack EC when micmute key pressed > through this micphone led control interface like hda_generic provided > ACPI method defined in dell-privacy micmute led trigger will be called > for notifying the EC that software mute has been completed > > Signed-off-by: Perry Yuan <perry_yuan@dell.com> > > -------- > v2 -> v3 > * simplify the patch to reuse some val value > * add more detail to the commit info > > v1 -> v2: > * fix some format issue > -------- > --- > sound/soc/codecs/rt715-sdca.c | 16 ++++++++++++++++ > sound/soc/codecs/rt715-sdca.h | 1 + > sound/soc/codecs/rt715.c | 14 ++++++++++++++ > sound/soc/codecs/rt715.h | 1 + > 4 files changed, 32 insertions(+) > > diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c > index b43ac8559e45..861a0d2a8957 100644 > --- a/sound/soc/codecs/rt715-sdca.c > +++ b/sound/soc/codecs/rt715-sdca.c > @@ -12,6 +12,7 @@ > #include <linux/version.h> > #include <linux/kernel.h> > #include <linux/init.h> > +#include <linux/leds.h> > #include <linux/pm_runtime.h> > #include <linux/pm.h> > #include <linux/soundwire/sdw.h> > @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol > *kcontrol, > unsigned int max = mc->max; > int val; > > + pr_err("++++++rt715_sdca_get_volsw++\n"); > val = snd_soc_component_read(component, mc->reg); > if (val < 0) > return -EINVAL; > @@ -261,6 +263,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > *kcontrol, > struct snd_ctl_elem_value *ucontrol) > { > struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); > + struct rt715_sdca_priv *rt715 = > snd_soc_component_get_drvdata(component); > struct soc_mixer_control *mc = > (struct soc_mixer_control *)kcontrol->private_value; > unsigned int val, val2, loop_cnt = 2, i; > @@ -268,6 +271,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > *kcontrol, > unsigned int reg2 = mc->rreg; > unsigned int reg = mc->reg; > unsigned int max = mc->max; > + unsigned int val0, val1; > int err; > > val = ucontrol->value.integer.value[0]; > @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > *kcontrol, > return err; > } > > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > + /* dell privacy LED trigger state changed by muted/unmute switch */ > + if (mc->invert) { > + if (ucontrol->value.integer.value[0] || ucontrol- > >value.integer.value[1]) { > + rt715->micmute_led = LED_OFF; > + } else { > + rt715->micmute_led = LED_ON; > + } > + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > + } > +#endif > + > return 0; > } > > diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h > index 840c237895dd..f8988ab88f80 100644 > --- a/sound/soc/codecs/rt715-sdca.h > +++ b/sound/soc/codecs/rt715-sdca.h > @@ -31,6 +31,7 @@ struct rt715_sdca_priv { > int l_is_unmute; > int r_is_unmute; > int hw_sdw_ver; > + bool micmute_led; > }; > > struct rt715_sdw_stream_data { > diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c > index cdcba70146da..b4e480744c94 100644 > --- a/sound/soc/codecs/rt715.c > +++ b/sound/soc/codecs/rt715.c > @@ -13,6 +13,7 @@ > #include <linux/init.h> > #include <linux/delay.h> > #include <linux/i2c.h> > +#include <linux/leds.h> > #include <linux/pm_runtime.h> > #include <linux/pm.h> > #include <linux/soundwire/sdw.h> > @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > *kcontrol, > RT715_SET_GAIN_MIX_ADC2_L}; > unsigned int addr_h, addr_l, val_h, val_ll, val_lr; > unsigned int read_ll, read_rl, i, j, loop_cnt; > + unsigned int val0, val1; > > if (strstr(ucontrol->id.name, "Main Capture Switch") || > strstr(ucontrol->id.name, "Main Capture Volume")) > @@ -95,6 +97,18 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > *kcontrol, > else > loop_cnt = 1; > > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > + /* Micmute LED state changed by muted/unmute switch */ > + if (mc->invert) { > + if (ucontrol->value.integer.value[0] || ucontrol- > >value.integer.value[1]) { > + rt715->micmute_led = LED_OFF; > + } else { > + rt715->micmute_led = LED_ON; > + } > + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > + } > +#endif > + You might have missed my other comment on v2 feedback, but is there a reason to keep it behind a compile time flag for dell privacy module? In practice any other future led backend provider should work too. Another way to think about it - if dell privacy wasn't enabled would this cause a problem to run this code? I think it would just be a no-op. > for (j = 0; j < loop_cnt; j++) { > /* Can't use update bit function, so read the original value first > */ > if (loop_cnt == 1) { > diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h > index 009a8266f606..57c9af041181 100644 > --- a/sound/soc/codecs/rt715.h > +++ b/sound/soc/codecs/rt715.h > @@ -22,6 +22,7 @@ struct rt715_priv { > struct sdw_bus_params params; > bool hw_init; > bool first_hw_init; > + bool micmute_led; > }; > > struct sdw_stream_data { > -- > 2.25.1
Dne 12. 01. 21 v 18:18 Perry Yuan napsal(a): > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > + /* dell privacy LED trigger state changed by muted/unmute switch */ > + if (mc->invert) { > + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { > + rt715->micmute_led = LED_OFF; > + } else { > + rt715->micmute_led = LED_ON; > + } > + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > + } > +#endif [removing lkml and x86-platform lists] Looking to this code, perhaps, it may be a good idea to move the LED trigger handling from the low-level drivers and do it in the top-level control code (sound/core/control.c). Adding a new flag SNDRV_CTL_ELEM_ACCESS_MIC_LED may be an option and we can nicely handle the situation for multiple microphones (OR operation). The motivation is to remove the duplicated code. The same situation is for the playback LED. Jaroslav
On 2021/1/13 1:50, Limonciello, Mario wrote: >> -----Original Message----- >> From: Yuan, Perry <Perry_Yuan@Dell.com> >> Sent: Tuesday, January 12, 2021 11:18 >> To: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; >> hdegoede@redhat.com; mgross@linux.intel.com >> Cc: lgirdwood@gmail.com; broonie@kernel.org; alsa-devel@alsa-project.org; >> linux-kernel@vger.kernel.org; platform-driver-x86@vger.kernel.org; Yuan, >> Perry; Limonciello, Mario >> Subject: [PATCH v3 3/3] ASoC: rt715:add micmute led state control supports >> >> From: Perry Yuan <perry_yuan@dell.com> >> >> Some new Dell system is going to support audio internal micphone >> privacy setting from hardware level with micmute led state changing >> When micmute hotkey pressed by user, soft mute will need to be enabled >> firstly in case of pop noise, and codec driver need to react to mic >> mute event to EC(embedded controller) notifying that SW mute is completed >> Then EC will do the hardware mute physically within the timeout reached >> >> This patch allow codec rt715 driver to ack EC when micmute key pressed >> through this micphone led control interface like hda_generic provided >> ACPI method defined in dell-privacy micmute led trigger will be called >> for notifying the EC that software mute has been completed >> >> Signed-off-by: Perry Yuan <perry_yuan@dell.com> >> >> -------- >> v2 -> v3 >> * simplify the patch to reuse some val value >> * add more detail to the commit info >> >> v1 -> v2: >> * fix some format issue >> -------- >> --- >> sound/soc/codecs/rt715-sdca.c | 16 ++++++++++++++++ >> sound/soc/codecs/rt715-sdca.h | 1 + >> sound/soc/codecs/rt715.c | 14 ++++++++++++++ >> sound/soc/codecs/rt715.h | 1 + >> 4 files changed, 32 insertions(+) >> >> diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c >> index b43ac8559e45..861a0d2a8957 100644 >> --- a/sound/soc/codecs/rt715-sdca.c >> +++ b/sound/soc/codecs/rt715-sdca.c >> @@ -12,6 +12,7 @@ >> #include <linux/version.h> >> #include <linux/kernel.h> >> #include <linux/init.h> >> +#include <linux/leds.h> >> #include <linux/pm_runtime.h> >> #include <linux/pm.h> >> #include <linux/soundwire/sdw.h> >> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol >> *kcontrol, >> unsigned int max = mc->max; >> int val; >> >> + pr_err("++++++rt715_sdca_get_volsw++\n"); >> val = snd_soc_component_read(component, mc->reg); >> if (val < 0) >> return -EINVAL; >> @@ -261,6 +263,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >> *kcontrol, >> struct snd_ctl_elem_value *ucontrol) >> { >> struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); >> + struct rt715_sdca_priv *rt715 = >> snd_soc_component_get_drvdata(component); >> struct soc_mixer_control *mc = >> (struct soc_mixer_control *)kcontrol->private_value; >> unsigned int val, val2, loop_cnt = 2, i; >> @@ -268,6 +271,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >> *kcontrol, >> unsigned int reg2 = mc->rreg; >> unsigned int reg = mc->reg; >> unsigned int max = mc->max; >> + unsigned int val0, val1; >> int err; >> >> val = ucontrol->value.integer.value[0]; >> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >> *kcontrol, >> return err; >> } >> >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* dell privacy LED trigger state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol- >>> value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif >> + >> return 0; >> } >> >> diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h >> index 840c237895dd..f8988ab88f80 100644 >> --- a/sound/soc/codecs/rt715-sdca.h >> +++ b/sound/soc/codecs/rt715-sdca.h >> @@ -31,6 +31,7 @@ struct rt715_sdca_priv { >> int l_is_unmute; >> int r_is_unmute; >> int hw_sdw_ver; >> + bool micmute_led; >> }; >> >> struct rt715_sdw_stream_data { >> diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c >> index cdcba70146da..b4e480744c94 100644 >> --- a/sound/soc/codecs/rt715.c >> +++ b/sound/soc/codecs/rt715.c >> @@ -13,6 +13,7 @@ >> #include <linux/init.h> >> #include <linux/delay.h> >> #include <linux/i2c.h> >> +#include <linux/leds.h> >> #include <linux/pm_runtime.h> >> #include <linux/pm.h> >> #include <linux/soundwire/sdw.h> >> @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >> *kcontrol, >> RT715_SET_GAIN_MIX_ADC2_L}; >> unsigned int addr_h, addr_l, val_h, val_ll, val_lr; >> unsigned int read_ll, read_rl, i, j, loop_cnt; >> + unsigned int val0, val1; >> >> if (strstr(ucontrol->id.name, "Main Capture Switch") || >> strstr(ucontrol->id.name, "Main Capture Volume")) >> @@ -95,6 +97,18 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >> *kcontrol, >> else >> loop_cnt = 1; >> >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* Micmute LED state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol- >>> value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif >> + > You might have missed my other comment on v2 feedback, but is there a reason > to keep it behind a compile time flag for dell privacy module? In practice > any other future led backend provider should work too. Another way to think > about it - if dell privacy wasn't enabled would this cause a problem to run > this code? I think it would just be a no-op. > >> for (j = 0; j < loop_cnt; j++) { >> /* Can't use update bit function, so read the original value first >> */ >> if (loop_cnt == 1) { >> diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h >> index 009a8266f606..57c9af041181 100644 >> --- a/sound/soc/codecs/rt715.h >> +++ b/sound/soc/codecs/rt715.h >> @@ -22,6 +22,7 @@ struct rt715_priv { >> struct sdw_bus_params params; >> bool hw_init; >> bool first_hw_init; >> + bool micmute_led; >> }; >> >> struct sdw_stream_data { >> -- >> 2.25.1 Pierre Louis suggested to just set the mic mute led state unconditionally . It is more common interface to allow other platforms to change micmute led. The discussion result is from "[PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support" Here is the change compared to V3 ,the CONFIG_DELL_PRIVACY will be removed -#if IS_ENABLED(CONFIG_DELL_PRIVACY) - /* dell privacy LED trigger state changed by muted/unmute switch */ + /* MicMute LED state changed by muted/unmute switch */ if (mc->invert) { if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { rt715->micmute_led = LED_OFF; diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index b4e480744c94..60bb3d98103e 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -97,8 +97,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, else loop_cnt = 1; -#if IS_ENABLED(CONFIG_DELL_PRIVACY) - /* Micmute LED state changed by muted/unmute switch */ + /* MicMute LED state changed by muted/unmute switch */ if (mc->invert) { if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { rt715->micmute_led = LED_OFF; @@ -107,7 +106,6 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, } ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); } -#endif
Hi Mark, Thanks for your review feedback. On 2021/1/13 1:54, Mark Brown wrote: > On Wed, Jan 13, 2021 at 01:18:14AM +0800, Perry Yuan wrote: > >> Some new Dell system is going to support audio internal micphone >> privacy setting from hardware level with micmute led state changing >> When micmute hotkey pressed by user, soft mute will need to be enabled >> firstly in case of pop noise, and codec driver need to react to mic >> mute event to EC(embedded controller) notifying that SW mute is completed >> Then EC will do the hardware mute physically within the timeout reached > >> This patch allow codec rt715 driver to ack EC when micmute key pressed >> through this micphone led control interface like hda_generic provided >> ACPI method defined in dell-privacy micmute led trigger will be called >> for notifying the EC that software mute has been completed > > It feels like there's an abstraction problem here with this being hard > coded in a specific CODEC driver. > I will remove the CONFIG_DELL_PRIVACY ,because other vendors and other platforms maybe need to set their Mic mute led state when they enable soundwire and sof driver for audio function. We can avoid hardcode in codec driver, indeed it is need for this new soundwire & sof architecture of alsa. >> #include <linux/soundwire/sdw.h> >> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol *kcontrol, >> unsigned int max = mc->max; >> int val; >> >> + pr_err("++++++rt715_sdca_get_volsw++\n"); >> val = snd_soc_component_read(component, mc->reg); >> if (val < 0) >> return -EINVAL; > > This shouldn't be in the patch. It is my mistake to leave the debug line here. will be removed in next V4 . > >> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, >> return err; >> } >> >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* dell privacy LED trigger state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif >> + > > This doesn't look good. There's nothing Dell specific here, and nothing > about this is conditional on any sort of runtime detection of Dell > systems, it's not obvious why this is conditional on DELL_PRIVACY or why > we only report the state if the control is inverted. I will remove the CONFIG_DELL_PRIVACY for the mic mute led operation is not only needed for dell platforms but also other Vendors all need to set micmute led necessaryily. > > I'm also not convinced that it's a good idea to set the mute LED if only > one channel in a stereo microphone is muted, that seems likely to lead > to surprising behaviour for users. > At first, i just want to handle val0 == 1 && val1 == 1 and val0 == 0 && val1 == 0 only. Intel suggested i need to cover all about other cases, the mute led should be off if any channel of mic is on. So i change the led state when any one channel is muted or unmuted. > TBH I don't understand why this isn't being done in generic code. > >> + bool micmute_led; > > What is this for, it never seems to be read except for in the function > where it's set? > Do you mean i can use a local micmute_led var in the function?
On Sat, Jan 16, 2021 at 11:50:31PM +0800, Perry Yuan wrote: > On 2021/1/13 1:54, Mark Brown wrote: > > > + bool micmute_led; > > What is this for, it never seems to be read except for in the function > > where it's set? > Do you mean i can use a local micmute_led var in the function? Yes.
> >> -----Original Message----- > >> From: Yuan, Perry <Perry_Yuan@Dell.com> > >> Sent: Tuesday, January 12, 2021 11:18 > >> To: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; > >> hdegoede@redhat.com; mgross@linux.intel.com > >> Cc: lgirdwood@gmail.com; broonie@kernel.org; alsa-devel@alsa-project.org; > >> linux-kernel@vger.kernel.org; platform-driver-x86@vger.kernel.org; Yuan, > >> Perry; Limonciello, Mario > >> Subject: [PATCH v3 3/3] ASoC: rt715:add micmute led state control supports > >> > >> From: Perry Yuan <perry_yuan@dell.com> > >> > >> Some new Dell system is going to support audio internal micphone > >> privacy setting from hardware level with micmute led state changing > >> When micmute hotkey pressed by user, soft mute will need to be enabled > >> firstly in case of pop noise, and codec driver need to react to mic > >> mute event to EC(embedded controller) notifying that SW mute is completed > >> Then EC will do the hardware mute physically within the timeout reached > >> > >> This patch allow codec rt715 driver to ack EC when micmute key pressed > >> through this micphone led control interface like hda_generic provided > >> ACPI method defined in dell-privacy micmute led trigger will be called > >> for notifying the EC that software mute has been completed > >> > >> Signed-off-by: Perry Yuan <perry_yuan@dell.com> > >> > >> -------- > >> v2 -> v3 > >> * simplify the patch to reuse some val value > >> * add more detail to the commit info > >> > >> v1 -> v2: > >> * fix some format issue > >> -------- > >> --- > >> sound/soc/codecs/rt715-sdca.c | 16 ++++++++++++++++ > >> sound/soc/codecs/rt715-sdca.h | 1 + > >> sound/soc/codecs/rt715.c | 14 ++++++++++++++ > >> sound/soc/codecs/rt715.h | 1 + > >> 4 files changed, 32 insertions(+) > >> > >> diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c > >> index b43ac8559e45..861a0d2a8957 100644 > >> --- a/sound/soc/codecs/rt715-sdca.c > >> +++ b/sound/soc/codecs/rt715-sdca.c > >> @@ -12,6 +12,7 @@ > >> #include <linux/version.h> > >> #include <linux/kernel.h> > >> #include <linux/init.h> > >> +#include <linux/leds.h> > >> #include <linux/pm_runtime.h> > >> #include <linux/pm.h> > >> #include <linux/soundwire/sdw.h> > >> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol > >> *kcontrol, > >> unsigned int max = mc->max; > >> int val; > >> > >> + pr_err("++++++rt715_sdca_get_volsw++\n"); > >> val = snd_soc_component_read(component, mc->reg); > >> if (val < 0) > >> return -EINVAL; > >> @@ -261,6 +263,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > >> *kcontrol, > >> struct snd_ctl_elem_value *ucontrol) > >> { > >> struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); > >> + struct rt715_sdca_priv *rt715 = > >> snd_soc_component_get_drvdata(component); > >> struct soc_mixer_control *mc = > >> (struct soc_mixer_control *)kcontrol->private_value; > >> unsigned int val, val2, loop_cnt = 2, i; > >> @@ -268,6 +271,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > >> *kcontrol, > >> unsigned int reg2 = mc->rreg; > >> unsigned int reg = mc->reg; > >> unsigned int max = mc->max; > >> + unsigned int val0, val1; > >> int err; > >> > >> val = ucontrol->value.integer.value[0]; > >> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > >> *kcontrol, > >> return err; > >> } > >> > >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > >> + /* dell privacy LED trigger state changed by muted/unmute switch */ > >> + if (mc->invert) { > >> + if (ucontrol->value.integer.value[0] || ucontrol- > >>> value.integer.value[1]) { > >> + rt715->micmute_led = LED_OFF; > >> + } else { > >> + rt715->micmute_led = LED_ON; > >> + } > >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > >> + } > >> +#endif > >> + > >> return 0; > >> } > >> > >> diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h > >> index 840c237895dd..f8988ab88f80 100644 > >> --- a/sound/soc/codecs/rt715-sdca.h > >> +++ b/sound/soc/codecs/rt715-sdca.h > >> @@ -31,6 +31,7 @@ struct rt715_sdca_priv { > >> int l_is_unmute; > >> int r_is_unmute; > >> int hw_sdw_ver; > >> + bool micmute_led; > >> }; > >> > >> struct rt715_sdw_stream_data { > >> diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c > >> index cdcba70146da..b4e480744c94 100644 > >> --- a/sound/soc/codecs/rt715.c > >> +++ b/sound/soc/codecs/rt715.c > >> @@ -13,6 +13,7 @@ > >> #include <linux/init.h> > >> #include <linux/delay.h> > >> #include <linux/i2c.h> > >> +#include <linux/leds.h> > >> #include <linux/pm_runtime.h> > >> #include <linux/pm.h> > >> #include <linux/soundwire/sdw.h> > >> @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > >> *kcontrol, > >> RT715_SET_GAIN_MIX_ADC2_L}; > >> unsigned int addr_h, addr_l, val_h, val_ll, val_lr; > >> unsigned int read_ll, read_rl, i, j, loop_cnt; > >> + unsigned int val0, val1; > >> > >> if (strstr(ucontrol->id.name, "Main Capture Switch") || > >> strstr(ucontrol->id.name, "Main Capture Volume")) > >> @@ -95,6 +97,18 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > >> *kcontrol, > >> else > >> loop_cnt = 1; > >> > >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > >> + /* Micmute LED state changed by muted/unmute switch */ > >> + if (mc->invert) { > >> + if (ucontrol->value.integer.value[0] || ucontrol- > >>> value.integer.value[1]) { > >> + rt715->micmute_led = LED_OFF; > >> + } else { > >> + rt715->micmute_led = LED_ON; > >> + } > >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > >> + } > >> +#endif > >> + > > You might have missed my other comment on v2 feedback, but is there a reason > > to keep it behind a compile time flag for dell privacy module? In practice > > any other future led backend provider should work too. Another way to think > > about it - if dell privacy wasn't enabled would this cause a problem to run > > this code? I think it would just be a no-op. > > > >> for (j = 0; j < loop_cnt; j++) { > >> /* Can't use update bit function, so read the original value first > >> */ > >> if (loop_cnt == 1) { > >> diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h > >> index 009a8266f606..57c9af041181 100644 > >> --- a/sound/soc/codecs/rt715.h > >> +++ b/sound/soc/codecs/rt715.h > >> @@ -22,6 +22,7 @@ struct rt715_priv { > >> struct sdw_bus_params params; > >> bool hw_init; > >> bool first_hw_init; > >> + bool micmute_led; > >> }; > >> > >> struct sdw_stream_data { > >> -- > >> 2.25.1 > > Pierre Louis suggested to just set the mic mute led state unconditionally . > It is more common interface to allow other platforms to change micmute led. > The discussion result is from "[PATCH v2 2/2] ASoC: rt715:add Mic Mute LED > control support" > > Here is the change compared to V3 ,the CONFIG_DELL_PRIVACY will be removed > > -#if IS_ENABLED(CONFIG_DELL_PRIVACY) > - /* dell privacy LED trigger state changed by muted/unmute switch */ > + /* MicMute LED state changed by muted/unmute switch */ > if (mc->invert) { > if (ucontrol->value.integer.value[0] || ucontrol- > >value.integer.value[1]) { > rt715->micmute_led = LED_OFF; > diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c > index b4e480744c94..60bb3d98103e 100644 > --- a/sound/soc/codecs/rt715.c > +++ b/sound/soc/codecs/rt715.c > @@ -97,8 +97,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > *kcontrol, > else > loop_cnt = 1; > > -#if IS_ENABLED(CONFIG_DELL_PRIVACY) > - /* Micmute LED state changed by muted/unmute switch */ > + /* MicMute LED state changed by muted/unmute switch */ > if (mc->invert) { > if (ucontrol->value.integer.value[0] || ucontrol- > >value.integer.value[1]) { > rt715->micmute_led = LED_OFF; > @@ -107,7 +106,6 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > *kcontrol, > } > ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); > } > -#endif I'm not sure which thread, but I believe there was still also another suggestion that this should be made more "generic" and to work for all codecs. So that when we have lets say a hypothetical rt717 we don't need the same in that module.
Hi, On 1/19/21 5:33 PM, Limonciello, Mario wrote: >>>> -----Original Message----- >>>> From: Yuan, Perry <Perry_Yuan@Dell.com> >>>> Sent: Tuesday, January 12, 2021 11:18 >>>> To: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; >>>> hdegoede@redhat.com; mgross@linux.intel.com >>>> Cc: lgirdwood@gmail.com; broonie@kernel.org; alsa-devel@alsa-project.org; >>>> linux-kernel@vger.kernel.org; platform-driver-x86@vger.kernel.org; Yuan, >>>> Perry; Limonciello, Mario >>>> Subject: [PATCH v3 3/3] ASoC: rt715:add micmute led state control supports >>>> >>>> From: Perry Yuan <perry_yuan@dell.com> >>>> >>>> Some new Dell system is going to support audio internal micphone >>>> privacy setting from hardware level with micmute led state changing >>>> When micmute hotkey pressed by user, soft mute will need to be enabled >>>> firstly in case of pop noise, and codec driver need to react to mic >>>> mute event to EC(embedded controller) notifying that SW mute is completed >>>> Then EC will do the hardware mute physically within the timeout reached >>>> >>>> This patch allow codec rt715 driver to ack EC when micmute key pressed >>>> through this micphone led control interface like hda_generic provided >>>> ACPI method defined in dell-privacy micmute led trigger will be called >>>> for notifying the EC that software mute has been completed >>>> >>>> Signed-off-by: Perry Yuan <perry_yuan@dell.com> >>>> >>>> -------- >>>> v2 -> v3 >>>> * simplify the patch to reuse some val value >>>> * add more detail to the commit info >>>> >>>> v1 -> v2: >>>> * fix some format issue >>>> -------- >>>> --- >>>> sound/soc/codecs/rt715-sdca.c | 16 ++++++++++++++++ >>>> sound/soc/codecs/rt715-sdca.h | 1 + >>>> sound/soc/codecs/rt715.c | 14 ++++++++++++++ >>>> sound/soc/codecs/rt715.h | 1 + >>>> 4 files changed, 32 insertions(+) >>>> >>>> diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c >>>> index b43ac8559e45..861a0d2a8957 100644 >>>> --- a/sound/soc/codecs/rt715-sdca.c >>>> +++ b/sound/soc/codecs/rt715-sdca.c >>>> @@ -12,6 +12,7 @@ >>>> #include <linux/version.h> >>>> #include <linux/kernel.h> >>>> #include <linux/init.h> >>>> +#include <linux/leds.h> >>>> #include <linux/pm_runtime.h> >>>> #include <linux/pm.h> >>>> #include <linux/soundwire/sdw.h> >>>> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol >>>> *kcontrol, >>>> unsigned int max = mc->max; >>>> int val; >>>> >>>> + pr_err("++++++rt715_sdca_get_volsw++\n"); >>>> val = snd_soc_component_read(component, mc->reg); >>>> if (val < 0) >>>> return -EINVAL; >>>> @@ -261,6 +263,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >>>> *kcontrol, >>>> struct snd_ctl_elem_value *ucontrol) >>>> { >>>> struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); >>>> + struct rt715_sdca_priv *rt715 = >>>> snd_soc_component_get_drvdata(component); >>>> struct soc_mixer_control *mc = >>>> (struct soc_mixer_control *)kcontrol->private_value; >>>> unsigned int val, val2, loop_cnt = 2, i; >>>> @@ -268,6 +271,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >>>> *kcontrol, >>>> unsigned int reg2 = mc->rreg; >>>> unsigned int reg = mc->reg; >>>> unsigned int max = mc->max; >>>> + unsigned int val0, val1; >>>> int err; >>>> >>>> val = ucontrol->value.integer.value[0]; >>>> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol >>>> *kcontrol, >>>> return err; >>>> } >>>> >>>> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >>>> + /* dell privacy LED trigger state changed by muted/unmute switch */ >>>> + if (mc->invert) { >>>> + if (ucontrol->value.integer.value[0] || ucontrol- >>>>> value.integer.value[1]) { >>>> + rt715->micmute_led = LED_OFF; >>>> + } else { >>>> + rt715->micmute_led = LED_ON; >>>> + } >>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >>>> + } >>>> +#endif >>>> + >>>> return 0; >>>> } >>>> >>>> diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h >>>> index 840c237895dd..f8988ab88f80 100644 >>>> --- a/sound/soc/codecs/rt715-sdca.h >>>> +++ b/sound/soc/codecs/rt715-sdca.h >>>> @@ -31,6 +31,7 @@ struct rt715_sdca_priv { >>>> int l_is_unmute; >>>> int r_is_unmute; >>>> int hw_sdw_ver; >>>> + bool micmute_led; >>>> }; >>>> >>>> struct rt715_sdw_stream_data { >>>> diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c >>>> index cdcba70146da..b4e480744c94 100644 >>>> --- a/sound/soc/codecs/rt715.c >>>> +++ b/sound/soc/codecs/rt715.c >>>> @@ -13,6 +13,7 @@ >>>> #include <linux/init.h> >>>> #include <linux/delay.h> >>>> #include <linux/i2c.h> >>>> +#include <linux/leds.h> >>>> #include <linux/pm_runtime.h> >>>> #include <linux/pm.h> >>>> #include <linux/soundwire/sdw.h> >>>> @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >>>> *kcontrol, >>>> RT715_SET_GAIN_MIX_ADC2_L}; >>>> unsigned int addr_h, addr_l, val_h, val_ll, val_lr; >>>> unsigned int read_ll, read_rl, i, j, loop_cnt; >>>> + unsigned int val0, val1; >>>> >>>> if (strstr(ucontrol->id.name, "Main Capture Switch") || >>>> strstr(ucontrol->id.name, "Main Capture Volume")) >>>> @@ -95,6 +97,18 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >>>> *kcontrol, >>>> else >>>> loop_cnt = 1; >>>> >>>> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >>>> + /* Micmute LED state changed by muted/unmute switch */ >>>> + if (mc->invert) { >>>> + if (ucontrol->value.integer.value[0] || ucontrol- >>>>> value.integer.value[1]) { >>>> + rt715->micmute_led = LED_OFF; >>>> + } else { >>>> + rt715->micmute_led = LED_ON; >>>> + } >>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >>>> + } >>>> +#endif >>>> + >>> You might have missed my other comment on v2 feedback, but is there a reason >>> to keep it behind a compile time flag for dell privacy module? In practice >>> any other future led backend provider should work too. Another way to think >>> about it - if dell privacy wasn't enabled would this cause a problem to run >>> this code? I think it would just be a no-op. >>> >>>> for (j = 0; j < loop_cnt; j++) { >>>> /* Can't use update bit function, so read the original value first >>>> */ >>>> if (loop_cnt == 1) { >>>> diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h >>>> index 009a8266f606..57c9af041181 100644 >>>> --- a/sound/soc/codecs/rt715.h >>>> +++ b/sound/soc/codecs/rt715.h >>>> @@ -22,6 +22,7 @@ struct rt715_priv { >>>> struct sdw_bus_params params; >>>> bool hw_init; >>>> bool first_hw_init; >>>> + bool micmute_led; >>>> }; >>>> >>>> struct sdw_stream_data { >>>> -- >>>> 2.25.1 >> >> Pierre Louis suggested to just set the mic mute led state unconditionally . >> It is more common interface to allow other platforms to change micmute led. >> The discussion result is from "[PATCH v2 2/2] ASoC: rt715:add Mic Mute LED >> control support" >> >> Here is the change compared to V3 ,the CONFIG_DELL_PRIVACY will be removed >> >> -#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> - /* dell privacy LED trigger state changed by muted/unmute switch */ >> + /* MicMute LED state changed by muted/unmute switch */ >> if (mc->invert) { >> if (ucontrol->value.integer.value[0] || ucontrol- >>> value.integer.value[1]) { >> rt715->micmute_led = LED_OFF; >> diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c >> index b4e480744c94..60bb3d98103e 100644 >> --- a/sound/soc/codecs/rt715.c >> +++ b/sound/soc/codecs/rt715.c >> @@ -97,8 +97,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >> *kcontrol, >> else >> loop_cnt = 1; >> >> -#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> - /* Micmute LED state changed by muted/unmute switch */ >> + /* MicMute LED state changed by muted/unmute switch */ >> if (mc->invert) { >> if (ucontrol->value.integer.value[0] || ucontrol- >>> value.integer.value[1]) { >> rt715->micmute_led = LED_OFF; >> @@ -107,7 +106,6 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol >> *kcontrol, >> } >> ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> } >> -#endif > > I'm not sure which thread, but I believe there was still also another suggestion > that this should be made more "generic" and to work for all codecs. So that when > we have lets say a hypothetical rt717 we don't need the same in that module. Right: On 1/15/21 6:45 PM, Jaroslav Kysela wrote: > Dne 12. 01. 21 v 18:18 Perry Yuan napsal(a): > >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* dell privacy LED trigger state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif > > [removing lkml and x86-platform lists] > > Looking to this code, perhaps, it may be a good idea to move the LED trigger > handling from the low-level drivers and do it in the top-level control code > (sound/core/control.c). Adding a new flag SNDRV_CTL_ELEM_ACCESS_MIC_LED may be > an option and we can nicely handle the situation for multiple microphones (OR > operation). The motivation is to remove the duplicated code. > > The same situation is for the playback LED. I believe that this is an excellent suggestion and that this is the way to go. Regards, Hans
Hi Mark: Thanks for your review. On 2021/1/13 1:54, Mark Brown wrote: > On Wed, Jan 13, 2021 at 01:18:14AM +0800, Perry Yuan wrote: > >> Some new Dell system is going to support audio internal micphone >> privacy setting from hardware level with micmute led state changing >> When micmute hotkey pressed by user, soft mute will need to be enabled >> firstly in case of pop noise, and codec driver need to react to mic >> mute event to EC(embedded controller) notifying that SW mute is completed >> Then EC will do the hardware mute physically within the timeout reached > >> This patch allow codec rt715 driver to ack EC when micmute key pressed >> through this micphone led control interface like hda_generic provided >> ACPI method defined in dell-privacy micmute led trigger will be called >> for notifying the EC that software mute has been completed > > It feels like there's an abstraction problem here with this being hard > coded in a specific CODEC driver. > >> #include <linux/soundwire/sdw.h> >> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol *kcontrol, >> unsigned int max = mc->max; >> int val; >> >> + pr_err("++++++rt715_sdca_get_volsw++\n"); >> val = snd_soc_component_read(component, mc->reg); >> if (val < 0) >> return -EINVAL; > > This shouldn't be in the patch. Removed in V4, I forget to clear this debug code > >> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, >> return err; >> } >> >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* dell privacy LED trigger state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif >> + > > This doesn't look good. There's nothing Dell specific here, and nothing > about this is conditional on any sort of runtime detection of Dell > systems, it's not obvious why this is conditional on DELL_PRIVACY or why > we only report the state if the control is inverted. > I will remove the CONFIG_DELL_PRIVACY from V4 patch and allow it to run if CONFIG_DELL_PRIVACY is not set, the result will be a no-op. > I'm also not convinced that it's a good idea to set the mute LED if only > one channel in a stereo microphone is muted, that seems likely to lead > to surprising behaviour for users. > https://github.com/thesofproject/linux/pull/2660#discussion_r555480210 There is a discussion for the channel mute changing behavior. If the anyone of value[0] or value[1] is 1, it means mic is NOT muted The muted state will be LED_ON state need to set. > TBH I don't understand why this isn't being done in generic code. > >> + bool micmute_led; > > What is this for, it never seems to be read except for in the function > where it's set? > I have moved this part code to the local definition of rt715_set_amp_gain_put and removed from rt715_priv. new code will be like this in V4. @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt; + bool micmute_led;
Hi Mark: Thanks for your review. On 2021/1/13 1:54, Mark Brown wrote: > On Wed, Jan 13, 2021 at 01:18:14AM +0800, Perry Yuan wrote: > >> Some new Dell system is going to support audio internal micphone >> privacy setting from hardware level with micmute led state changing >> When micmute hotkey pressed by user, soft mute will need to be enabled >> firstly in case of pop noise, and codec driver need to react to mic >> mute event to EC(embedded controller) notifying that SW mute is completed >> Then EC will do the hardware mute physically within the timeout reached > >> This patch allow codec rt715 driver to ack EC when micmute key pressed >> through this micphone led control interface like hda_generic provided >> ACPI method defined in dell-privacy micmute led trigger will be called >> for notifying the EC that software mute has been completed > > It feels like there's an abstraction problem here with this being hard > coded in a specific CODEC driver. > >> #include <linux/soundwire/sdw.h> >> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol *kcontrol, >> unsigned int max = mc->max; >> int val; >> >> + pr_err("++++++rt715_sdca_get_volsw++\n"); >> val = snd_soc_component_read(component, mc->reg); >> if (val < 0) >> return -EINVAL; > > This shouldn't be in the patch. Removed in V4, I forget to clear this debug code > >> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, >> return err; >> } >> >> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >> + /* dell privacy LED trigger state changed by muted/unmute switch */ >> + if (mc->invert) { >> + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { >> + rt715->micmute_led = LED_OFF; >> + } else { >> + rt715->micmute_led = LED_ON; >> + } >> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >> + } >> +#endif >> + > > This doesn't look good. There's nothing Dell specific here, and nothing > about this is conditional on any sort of runtime detection of Dell > systems, it's not obvious why this is conditional on DELL_PRIVACY or why > we only report the state if the control is inverted. > I will remove the CONFIG_DELL_PRIVACY from V4 patch and allow it to run if CONFIG_DELL_PRIVACY is not set, the result will be a no-op. > I'm also not convinced that it's a good idea to set the mute LED if only > one channel in a stereo microphone is muted, that seems likely to lead > to surprising behaviour for users. > https://github.com/thesofproject/linux/pull/2660#discussion_r555480210 There is a discussion for the channel mute changing behavior. If the anyone of value[0] or value[1] is 1, it means mic is NOT muted The muted state will be LED_ON state need to set. > TBH I don't understand why this isn't being done in generic code. > >> + bool micmute_led; > > What is this for, it never seems to be read except for in the function > where it's set? > I have moved this part code to the local definition of rt715_set_amp_gain_put and removed from rt715_priv. new code will be like this in V4. @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt; + bool micmute_led;
Dne 14. 02. 21 v 7:43 Perry Yuan napsal(a): >>> @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, >>> return err; >>> } >>> >>> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >>> + /* dell privacy LED trigger state changed by muted/unmute switch */ >>> + if (mc->invert) { >>> + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { >>> + rt715->micmute_led = LED_OFF; >>> + } else { >>> + rt715->micmute_led = LED_ON; >>> + } >>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); >>> + } >>> +#endif >>> + My question is, how do we know that the rt715 codec has connected internal microphone to this input? I believe that this should be covered in the machine specific code (runtime check), not in the codec code. #if CONFIG is not sufficient here. > I have moved this part code to the local definition of > rt715_set_amp_gain_put and removed from rt715_priv. > new code will be like this in V4. > > @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol > *kcontrol, > RT715_SET_GAIN_MIX_ADC2_L}; > unsigned int addr_h, addr_l, val_h, val_ll, val_lr; > unsigned int read_ll, read_rl, i, j, loop_cnt; > + bool micmute_led; > The whole LED trigger mechanism for the sound is covered in my LED generic code : https://lore.kernel.org/alsa-devel/20210211111400.1131020-1-perex@perex.cz/ Jaroslav
diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index b43ac8559e45..861a0d2a8957 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -12,6 +12,7 @@ #include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -244,6 +245,7 @@ static int rt715_sdca_get_volsw(struct snd_kcontrol *kcontrol, unsigned int max = mc->max; int val; + pr_err("++++++rt715_sdca_get_volsw++\n"); val = snd_soc_component_read(component, mc->reg); if (val < 0) return -EINVAL; @@ -261,6 +263,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); + struct rt715_sdca_priv *rt715 = snd_soc_component_get_drvdata(component); struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; unsigned int val, val2, loop_cnt = 2, i; @@ -268,6 +271,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, unsigned int reg2 = mc->rreg; unsigned int reg = mc->reg; unsigned int max = mc->max; + unsigned int val0, val1; int err; val = ucontrol->value.integer.value[0]; @@ -287,6 +291,18 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, return err; } +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* dell privacy LED trigger state changed by muted/unmute switch */ + if (mc->invert) { + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { + rt715->micmute_led = LED_OFF; + } else { + rt715->micmute_led = LED_ON; + } + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); + } +#endif + return 0; } diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h index 840c237895dd..f8988ab88f80 100644 --- a/sound/soc/codecs/rt715-sdca.h +++ b/sound/soc/codecs/rt715-sdca.h @@ -31,6 +31,7 @@ struct rt715_sdca_priv { int l_is_unmute; int r_is_unmute; int hw_sdw_ver; + bool micmute_led; }; struct rt715_sdw_stream_data { diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index cdcba70146da..b4e480744c94 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -88,6 +89,7 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt; + unsigned int val0, val1; if (strstr(ucontrol->id.name, "Main Capture Switch") || strstr(ucontrol->id.name, "Main Capture Volume")) @@ -95,6 +97,18 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, else loop_cnt = 1; +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* Micmute LED state changed by muted/unmute switch */ + if (mc->invert) { + if (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) { + rt715->micmute_led = LED_OFF; + } else { + rt715->micmute_led = LED_ON; + } + ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led); + } +#endif + for (j = 0; j < loop_cnt; j++) { /* Can't use update bit function, so read the original value first */ if (loop_cnt == 1) { diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h index 009a8266f606..57c9af041181 100644 --- a/sound/soc/codecs/rt715.h +++ b/sound/soc/codecs/rt715.h @@ -22,6 +22,7 @@ struct rt715_priv { struct sdw_bus_params params; bool hw_init; bool first_hw_init; + bool micmute_led; }; struct sdw_stream_data {