From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27E31C433E0 for ; Tue, 19 Jan 2021 20:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CF21F23104 for ; Tue, 19 Jan 2021 20:35:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392007AbhASUfT (ORCPT ); Tue, 19 Jan 2021 15:35:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28345 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391403AbhASUev (ORCPT ); Tue, 19 Jan 2021 15:34:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611088388; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=23er8d4qGSqJb9+O8wFFWdVfoc1tFodQp+QH8dpUNoA=; b=OmkZJvb5YCU8lb4nt+rVG+NDgyS9brX6xSF9U7wCH6odBZgJ1akzCp7fkc8+WoBx/OTviV qzXIBAty7BmsdaimgT1GKlumjSuilFSfRod/77HXEscjXL4qIlACMX9v3tcuyvjnVHKzMq d9GjYpe4QdrLYPN2uIlGhqgkR1wfxBM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-581-fiZtBkW9P4-Ifbg4iVc-8Q-1; Tue, 19 Jan 2021 15:33:07 -0500 X-MC-Unique: fiZtBkW9P4-Ifbg4iVc-8Q-1 Received: by mail-ej1-f70.google.com with SMTP id f1so3355407ejq.20 for ; Tue, 19 Jan 2021 12:33:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=23er8d4qGSqJb9+O8wFFWdVfoc1tFodQp+QH8dpUNoA=; b=IK9BAZk8UofPoCmtHavIqVmCjZ+xOVAh8865nsQv4kvBwgHIhPx2uPZphbkbtnVyVn CCa0/rYJGpJtNEvNKoQIHwKvCxbyRLXvZBYqpC4WAqiRfnUF92QcKnxJK7L9gi2PSyN3 6QCcq3XZgAYONjebfFFwPGuxYpyUhq2145iyadC2LhGwQ64Cxk+flcHQQ2R/ty7E9Uk+ siOF0/mjtwnVmIs155UGPgkzVJZXKwbZlNoSxkrehXuBDViAcAue+0WEAMXL4Hh90qpg N04sVbrtRHDfughhE5/bD0T8HGxbfhhOUkFouO+0gfsUsalxVwCNCJZeOgs6QO0FGO0n +Dgw== X-Gm-Message-State: AOAM530Tilbw6TMiAvlxAS9sRfzWDkvilt7Um1MpeKIZ2zDOs9cxCBD/ zz/ckLpPrpiODJdRmm3YxMr6mwO+i1OKTxo0mmhjp0/bodS/efT1y9Kaad4TYwSWoRp0OJjhIn1 0778Z8xIECWm0L6+tMeUBn+HA X-Received: by 2002:a05:6402:35ca:: with SMTP id z10mr4892579edc.186.1611088385946; Tue, 19 Jan 2021 12:33:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJy33Eg9h8JbuZTX6k5/kDSmWInMmfJEaiXUN+F2hixliyB0mPa+RgXNILd+5n9Uwu42CZTX0A== X-Received: by 2002:a05:6402:35ca:: with SMTP id z10mr4892569edc.186.1611088385774; Tue, 19 Jan 2021 12:33:05 -0800 (PST) Received: from x1.localdomain (2001-1c00-0c1e-bf00-37a3-353b-be90-1238.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:37a3:353b:be90:1238]) by smtp.gmail.com with ESMTPSA id m10sm7230897edi.54.2021.01.19.12.33.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jan 2021 12:33:05 -0800 (PST) Subject: Re: [PATCH v3 3/3] ASoC: rt715:add micmute led state control supports To: "Limonciello, Mario" , Perry Yuan , "Yuan, Perry" , "oder_chiou@realtek.com" , "perex@perex.cz" , "tiwai@suse.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" References: <20210112171814.5404-1-Perry_Yuan@Dell.com> <44d8e280-c8f3-4e3a-7ef7-b68224c96def@gmail.com> From: Hans de Goede Message-ID: <47830d92-e98a-00f8-bf91-79e187ba7c5b@redhat.com> Date: Tue, 19 Jan 2021 21:33:04 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 1/19/21 5:33 PM, Limonciello, Mario wrote: >>>> -----Original Message----- >>>> From: Yuan, Perry >>>> 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 >>>> >>>> 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 >>>> >>>> -------- >>>> 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 >>>> #include >>>> #include >>>> +#include >>>> #include >>>> #include >>>> #include >>>> @@ -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 >>>> #include >>>> #include >>>> +#include >>>> #include >>>> #include >>>> #include >>>> @@ -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