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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 C909BC433E1 for ; Thu, 25 Mar 2021 07:20:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B34261A25 for ; Thu, 25 Mar 2021 07:20:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbhCYHUD (ORCPT ); Thu, 25 Mar 2021 03:20:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:38866 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbhCYHT4 (ORCPT ); Thu, 25 Mar 2021 03:19:56 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3AE8FAA55; Thu, 25 Mar 2021 07:19:55 +0000 (UTC) Date: Thu, 25 Mar 2021 08:19:54 +0100 Message-ID: From: Takashi Iwai To: Kai-Heng Feng Cc: tiwai@suse.com, Jaroslav Kysela , Lars-Peter Clausen , Chris Chiu , Joe Perches , Tom Yan , alsa-devel@alsa-project.org (moderated list:SOUND), linux-kernel@vger.kernel.org (open list) Subject: Re: [PATCH 2/2] ALSA: usb-audio: Check connector value on resume In-Reply-To: <20210324171410.285848-2-kai.heng.feng@canonical.com> References: <20210324171410.285848-1-kai.heng.feng@canonical.com> <20210324171410.285848-2-kai.heng.feng@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 24 Mar 2021 18:14:08 +0100, Kai-Heng Feng wrote: > > Rear Mic on Lenovo P620 cannot record after S3, despite that there's no > error and the other two functions of the USB audio, Line In and Line > Out, work just fine. > > The mic starts to work again after running userspace app like "alsactl > store". Following the lead, the evidence shows that as soon as connector > status is queried, the mic can work again. > > So also check connector value on resume to "wake up" the USB audio to > make it functional. > > This can be device specific, however I think this generic approach may > benefit more than one device. > > Signed-off-by: Kai-Heng Feng Just to be sure: this workaround is always needed no matter whether reset_resume is set or not? If so, it's better to change the resume callback to take reset_resume argument and call it always. The resume_connector() can be folded into there. thanks, Takashi > --- > sound/usb/mixer.c | 18 ++++++++++++++++++ > sound/usb/mixer.h | 1 + > 2 files changed, 19 insertions(+) > > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 98f5417a70e4..6a553d891b0f 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -3631,11 +3631,28 @@ static int restore_mixer_value(struct usb_mixer_elem_list *list) > return 0; > } > > +static int resume_connector(struct usb_mixer_elem_list *list) > +{ > + struct usb_mixer_elem_info *cval = mixer_elem_list_to_info(list); > + > + if (cval->val_type != USB_MIXER_BOOLEAN || cval->channels != 1) > + return 0; > + > + return get_connector_value(cval, NULL, NULL); > +} > + > int snd_usb_mixer_resume(struct usb_mixer_interface *mixer, bool reset_resume) > { > struct usb_mixer_elem_list *list; > int id, err; > > + for (id = 0; id < MAX_ID_ELEMS; id++) { > + for_each_mixer_elem(list, mixer, id) { > + if (list->resume_connector) > + list->resume_connector(list); > + } > + } > + > if (reset_resume) { > /* restore cached mixer values */ > for (id = 0; id < MAX_ID_ELEMS; id++) { > @@ -3664,5 +3681,6 @@ void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, > list->dump = snd_usb_mixer_dump_cval; > #ifdef CONFIG_PM > list->resume = restore_mixer_value; > + list->resume_connector = resume_connector; > #endif > } > diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h > index c29e27ac43a7..843ccff0eea3 100644 > --- a/sound/usb/mixer.h > +++ b/sound/usb/mixer.h > @@ -69,6 +69,7 @@ struct usb_mixer_elem_list { > bool is_std_info; > usb_mixer_elem_dump_func_t dump; > usb_mixer_elem_resume_func_t resume; > + usb_mixer_elem_resume_func_t resume_connector; > }; > > /* iterate over mixer element list of the given unit id */ > -- > 2.30.2 >