From patchwork Wed Dec 9 12:43:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 11961261 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 66CEFC4361B for ; Wed, 9 Dec 2020 12:45:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 79FFB235F7 for ; Wed, 9 Dec 2020 12:45:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 79FFB235F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id EBA4216CB; Wed, 9 Dec 2020 13:45:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EBA4216CB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1607517957; bh=hoSusc6DDDZG9gakRMV3tve5/LkAoxPQPpNfgTZXQJs=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=WaxQwygtXf4vWw5AnNlvR4BsWojzKidMtj3VG/AOb7DHbq8c7nWbkH88LJ1bZN0ka 6tKEiY5vuwTxVtQGhmoGa5RipnIoqPAR3+R0ycbTKCti0shm10uv7tQYGZN8HD8WUo jPV5npMwNs5vhLotahm45Qid8NdAVM33mfClwEzE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1D95FF804B0; Wed, 9 Dec 2020 13:44:15 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 44FE9F80240; Wed, 9 Dec 2020 13:44:13 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3FD6DF801D8 for ; Wed, 9 Dec 2020 13:44:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3FD6DF801D8 Received: from [123.114.42.209] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kmyp6-0003Vb-Qd; Wed, 09 Dec 2020 12:44:01 +0000 From: Hui Wang To: alsa-devel@alsa-project.org, tiwai@suse.de Subject: [RFC][PATCH 1/2] alsa: jack: expand snd_jack_report parameter for jack sw_inject Date: Wed, 9 Dec 2020 20:43:43 +0800 Message-Id: <20201209124344.219158-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201209124344.219158-1-hui.wang@canonical.com> References: <20201209124344.219158-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" This is the preparation for supporting jack software plug in/out injection, when users enable the software injection, the jack state shouldn't be changed by hw events or other non-injection events anymore, so adding a parameter in the snd_jack_report() to distinguish if the function is called from software injection or not. Signed-off-by: Hui Wang --- include/sound/jack.h | 4 ++-- sound/core/jack.c | 3 ++- sound/pci/hda/hda_jack.c | 6 +++--- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/soc-jack.c | 2 +- sound/x86/intel_hdmi_audio.c | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 9eb2b5ec1ec4..17f71fe38ed5 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -81,7 +81,7 @@ void snd_jack_set_parent(struct snd_jack *jack, struct device *parent); int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type, int keytype); #endif -void snd_jack_report(struct snd_jack *jack, int status); +void snd_jack_report(struct snd_jack *jack, int status, bool sw_inject); #else static inline int snd_jack_new(struct snd_card *card, const char *id, int type, @@ -95,7 +95,7 @@ static inline int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name return 0; } -static inline void snd_jack_report(struct snd_jack *jack, int status) +static inline void snd_jack_report(struct snd_jack *jack, int status, bool sw_inject) { } diff --git a/sound/core/jack.c b/sound/core/jack.c index 503c8af79d55..49b9461aef51 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -336,8 +336,9 @@ EXPORT_SYMBOL(snd_jack_set_key); * * @jack: The jack to report status for * @status: The current status of the jack + * @sw_inject: Indicate if this is called from jack software inject */ -void snd_jack_report(struct snd_jack *jack, int status) +void snd_jack_report(struct snd_jack *jack, int status, bool sw_inject) { struct snd_jack_kctl *jack_kctl; #ifdef CONFIG_SND_JACK_INPUT_DEV diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c index 588059428d8f..152d651df74e 100644 --- a/sound/pci/hda/hda_jack.c +++ b/sound/pci/hda/hda_jack.c @@ -414,10 +414,10 @@ void snd_hda_jack_report_sync(struct hda_codec *codec) state = jack->button_state; if (get_jack_plug_state(jack->pin_sense)) state |= jack->type; - snd_jack_report(jack->jack, state); + snd_jack_report(jack->jack, state, false); if (jack->button_state) { snd_jack_report(jack->jack, - state & ~jack->button_state); + state & ~jack->button_state, false); jack->button_state = 0; /* button released */ } } @@ -503,7 +503,7 @@ int snd_hda_jack_add_kctl_mst(struct hda_codec *codec, hda_nid_t nid, } state = snd_hda_jack_detect_mst(codec, nid, dev_id); - snd_jack_report(jack->jack, state ? jack->type : 0); + snd_jack_report(jack->jack, state ? jack->type : 0, false); return 0; } diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index b0068f8ca46d..f19762a6e9e7 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1590,7 +1590,7 @@ static void update_eld(struct hda_codec *codec, if (eld_changed && pcm_jack) snd_jack_report(pcm_jack, (eld->monitor_present && eld->eld_valid) ? - SND_JACK_AVOUT : 0); + SND_JACK_AVOUT : 0, false); } /* update ELD and jack state via HD-audio verbs */ diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c index 8aa92f3e5ee8..595e10275bd9 100644 --- a/sound/pci/oxygen/xonar_wm87x6.c +++ b/sound/pci/oxygen/xonar_wm87x6.c @@ -251,7 +251,7 @@ static void xonar_ds_handle_hp_jack(struct oxygen *chip) reg |= WM8766_MUTEALL; wm8766_write_cached(chip, WM8766_DAC_CTRL, reg); - snd_jack_report(data->hp_jack, hp_plugged ? SND_JACK_HEADPHONE : 0); + snd_jack_report(data->hp_jack, hp_plugged ? SND_JACK_HEADPHONE : 0, false); mutex_unlock(&chip->mutex); } diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 0f1820f36b4d..5b98f5fa4537 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -78,7 +78,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) if (sync) snd_soc_dapm_sync(dapm); - snd_jack_report(jack->jack, jack->status); + snd_jack_report(jack->jack, jack->status, false); mutex_unlock(&jack->mutex); } diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index 9f9fcd2749f2..e12dce8daed0 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1363,7 +1363,7 @@ static void had_process_hot_plug(struct snd_intelhad *intelhaddata) had_substream_put(intelhaddata); } - snd_jack_report(intelhaddata->jack, SND_JACK_AVOUT); + snd_jack_report(intelhaddata->jack, SND_JACK_AVOUT, false); } /* process hot unplug, called from wq with mutex locked */ @@ -1398,7 +1398,7 @@ static void had_process_hot_unplug(struct snd_intelhad *intelhaddata) had_substream_put(intelhaddata); } - snd_jack_report(intelhaddata->jack, 0); + snd_jack_report(intelhaddata->jack, 0, false); } /* From patchwork Wed Dec 9 12:43:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 11961259 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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 25A83C4361B for ; Wed, 9 Dec 2020 12:45:54 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 865D923BC7 for ; Wed, 9 Dec 2020 12:45:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 865D923BC7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 29B8916CD; Wed, 9 Dec 2020 13:45:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 29B8916CD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1607517951; bh=lO4T1ylt2xckGiPvcpJHVHugakz6edg4G95mq6Yy3Zk=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qqJUAZMuNVK35anvDcjZnneoQAW4ixMyGcukZ2FqI6+eUEKMEK9kG/6vqlzWiKZBQ W84gMxb4NLrLI58Vaddx00fcUNEYh13Cvuz5ZVuWi/LvHxT9sz94uMdquEwxk0/AV1 miJylmXkUN8D4jWUhoz7wXsOzcqwnpzllTD9Hx0s= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5F49EF800EF; Wed, 9 Dec 2020 13:44:13 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B45CEF8027C; Wed, 9 Dec 2020 13:44:11 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6B93AF800EF for ; Wed, 9 Dec 2020 13:44:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6B93AF800EF Received: from [123.114.42.209] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kmyp9-0003Vb-Sw; Wed, 09 Dec 2020 12:44:04 +0000 From: Hui Wang To: alsa-devel@alsa-project.org, tiwai@suse.de Subject: [RFC][PATCH 2/2] alsa: jack: adding support for software jack in or out injection Date: Wed, 9 Dec 2020 20:43:44 +0800 Message-Id: <20201209124344.219158-3-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201209124344.219158-1-hui.wang@canonical.com> References: <20201209124344.219158-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" We want to perform remote audio auto test, need the audio jack to change from plugout to plugin or vice versa by software ways. Here the design is if the sound card has at least one Jack, the kernel will build a sysfs interface of jack injection for this sound card, it will create 2 files: jackin_inject and sw_inject_enable users need to cat sw_inject_enable first to check all jacks and their injection enable status, like below (0 means disabled): Jack: Mic 0 Jack: Headphone 0 Jack: HDMI/DP,pcm=3 0 Jack: HDMI/DP,pcm=4 0 Jack: HDMI/DP,pcm=5 0 Suppose users want to enable jack injection for Headphone, they need to run $sudo sh -c 'echo Headphone 1 > sw_inject_enable', then users could change the Headphone Jack state through jackin_inject and this Jack's state will not changed by non-injection ways anymore. Users could run $sudo sh -c 'echo Headphone 1 > jackin_inject' to trigger the Headphone jack to plugin or echo Headphone 0 to trigger it to plugout. If users finish their test, they could run $sudo sh -c 'echo Headphone 0 > sw_inject_enable' to disable injection and let non-injection ways control this Jack. Signed-off-by: Hui Wang --- include/sound/core.h | 1 + include/sound/jack.h | 1 + sound/core/jack.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) diff --git a/include/sound/core.h b/include/sound/core.h index 0462c577d7a3..6860bfe5bb46 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -122,6 +122,7 @@ struct snd_card { size_t total_pcm_alloc_bytes; /* total amount of allocated buffers */ struct mutex memory_mutex; /* protection for the above */ + bool jack_inject_attr_registered; /* jack software inject sysfs interface registered? */ #ifdef CONFIG_PM unsigned int power_state; /* power state */ diff --git a/include/sound/jack.h b/include/sound/jack.h index 17f71fe38ed5..082664f2aff2 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -67,6 +67,7 @@ struct snd_jack { char name[100]; unsigned int key[6]; /* Keep in sync with definitions above */ #endif /* CONFIG_SND_JACK_INPUT_DEV */ + bool sw_inject_enable; void *private_data; void (*private_free)(struct snd_jack *); }; diff --git a/sound/core/jack.c b/sound/core/jack.c index 49b9461aef51..2d8eef9dcab8 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -180,6 +181,123 @@ int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask) } EXPORT_SYMBOL(snd_jack_add_new_kctl); +static struct snd_jack *parsing_jack_and_enable(struct snd_card *card, const char *buf, + size_t count, unsigned long *enable) +{ + struct snd_device *sdev; + struct snd_jack *jack = NULL; + bool jack_found = 0; + char *jackid, *ena; + int i, err; + + /* skip the '\n\r' at the end of buf */ + for (i = count - 2; i > 0; i--) + if (isspace(buf[i])) + break; + if (i == 0) + return NULL; + + jackid = kstrndup(buf, i, GFP_KERNEL); + if (!jackid) + return NULL; + + if (strstr(jackid, "Phantom")) + goto exit1; + + ena = kstrndup(&buf[i+1], count - i - 2, GFP_KERNEL); + if (!ena) + goto exit1; + + err = kstrtoul(ena, 0, enable); + if (err) + goto exit; + + list_for_each_entry(sdev, &card->devices, list) + if (sdev->type == SNDRV_DEV_JACK) { + jack = (struct snd_jack *) sdev->device_data; + if (!strcmp(jack->id, jackid)) { + jack_found = 1; + break; + } + } + + if (!jack_found) + jack = NULL; + exit: + kfree(ena); + exit1: + kfree(jackid); + return jack; +} + +static ssize_t +jackin_inject_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + struct snd_jack *jack; + unsigned long enable; + + jack = parsing_jack_and_enable(card, buf, count, &enable); + if (!jack) + return -EINVAL; + + if (jack->sw_inject_enable) + snd_jack_report(jack, enable ? jack->type : 0, true); + + return count; +} +static DEVICE_ATTR_WO(jackin_inject); + +static ssize_t +sw_inject_enable_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + struct snd_device *sdev; + struct snd_jack *jack = NULL; + ssize_t ret_count = 0; + + list_for_each_entry(sdev, &card->devices, list) + if (sdev->type == SNDRV_DEV_JACK) { + jack = (struct snd_jack *) sdev->device_data; + if (strstr(jack->id, "Phantom")) + continue; + ret_count += scnprintf(buf + ret_count, PAGE_SIZE, "%s: %s %i\n", + "Jack", jack->id, jack->sw_inject_enable); + } + return ret_count; +} + +static ssize_t +sw_inject_enable_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t count) +{ + struct snd_card *card = container_of(dev, struct snd_card, card_dev); + struct snd_jack *jack; + unsigned long enable; + + jack = parsing_jack_and_enable(card, buf, count, &enable); + if (!jack) + return -EINVAL; + + jack->sw_inject_enable = !!enable; + + return count; +} +static DEVICE_ATTR_RW(sw_inject_enable); + +static struct attribute *snd_jack_dev_attrs[] = { + &dev_attr_jackin_inject.attr, + &dev_attr_sw_inject_enable.attr, + NULL +}; + +static const struct attribute_group snd_jack_dev_attr_group = { + .name = "jack", + .attrs = snd_jack_dev_attrs, +}; + /** * snd_jack_new - Create a new jack * @card: the card instance @@ -256,6 +374,11 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, *jjack = jack; + if (!jack->card->jack_inject_attr_registered) { + jack->card->jack_inject_attr_registered = true; + snd_card_add_dev_attr(jack->card, &snd_jack_dev_attr_group); + } + return 0; fail_input: @@ -348,6 +471,9 @@ void snd_jack_report(struct snd_jack *jack, int status, bool sw_inject) if (!jack) return; + if (jack->sw_inject_enable && !sw_inject) + return; + list_for_each_entry(jack_kctl, &jack->kctl_list, list) snd_kctl_jack_report(jack->card, jack_kctl->kctl, status & jack_kctl->mask_bits);