From patchwork Wed Nov 24 18:19:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Rodionov X-Patchwork-Id: 12637345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 60F9EC433FE for ; Wed, 24 Nov 2021 18:20:16 +0000 (UTC) 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 CD2381773; Wed, 24 Nov 2021 19:19:23 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz CD2381773 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1637778013; bh=qOuh27RN0UlbRY3l7TAqbkJA4mAFRZHPNyDPBNRnU/g=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=RWN3zmN95NB99E+tQY2chpwsk41Dea7+7tW6B1D7DxGwmfmfI4hcS56/w45olqIGi Ail+hY2Sr1tW1AG1Xg+v0g5OpF0SbX6LbQHCy8dumwecxlMXk7e4kwELenKxbqJCuG 6n4jMeVc50KmvjyQmcNFfswY/ILyAyigcw1HbuMw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5EDA6F8014D; Wed, 24 Nov 2021 19:19:23 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D20D4F8013A; Wed, 24 Nov 2021 19:19:21 +0100 (CET) Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BC072F8013A for ; Wed, 24 Nov 2021 19:19:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BC072F8013A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="GT6Wg99f" Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AO7P93t013358; Wed, 24 Nov 2021 12:19:11 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=U8Ap+OhwHy2SWvzy0sqCvywt4yyXDWnVtiddXPBdUQ8=; b=GT6Wg99ftCaP4vptM9MfwILGC8BHoT8bTM2YjL+jYL2yyLLxFRkSC1I9zvEJivFg5F4j FwSlwwMVNn0vav4x1LiiJIkIfr4VPpKjpU7V/rkVCTjJoVAdhqroisZbhe3umDCEX6Mm Y+f+8xt8oN5+yzey4iL8gt26qK98iBB//ikawhQAA9BaoFB3P01jiu9ROCgwi1Fl+w1k hH3BTZI+AeoZ93dMgOSXlE7PMKN4P+5uCegni31Jw1+cIjmROjx4ZxiblX3bFL5eaIZ2 Qmukx0Bu2ecJsYks2wFi1esKcPBEH3TSrSAuN5dEenYgkNblBdaLHGduziFwD9z2mUwA NQ== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3chds7gtp8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 24 Nov 2021 12:19:11 -0600 Received: from EDIEX01.ad.cirrus.com (198.61.84.80) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 24 Nov 2021 18:19:09 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by EDIEX01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Wed, 24 Nov 2021 18:19:09 +0000 Received: from vitaly-Inspiron-5415.ad.cirrus.com (unknown [198.90.238.68]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 2D9EC2A1; Wed, 24 Nov 2021 18:19:08 +0000 (UTC) From: Vitaly Rodionov To: James Schulman , David Rhodes , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH] ALSA: hda/cs8409: Schedule delayed work for jack detect on resume Date: Wed, 24 Nov 2021 18:19:08 +0000 Message-ID: <20211124181908.50672-1-vitalyr@opensource.cirrus.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: OecZu0N3k7o4BupfIvgv86XUL39FNquW X-Proofpoint-ORIG-GUID: OecZu0N3k7o4BupfIvgv86XUL39FNquW X-Proofpoint-Spam-Reason: safe Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Binding 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" From: Stefan Binding CS42L42 runs jack detect on resume, however this requires unsol events, and unsol events are ignored whilst the power state is not set to ON. The power state is set to ON only after the resume finishes. Schedule a delayed work timer to run jack detect after the resume call finishes. Signed-off-by: Stefan Binding Signed-off-by: Vitaly Rodionov --- sound/pci/hda/patch_cs8409.c | 79 +++++++++++++++++++++++++++++------- sound/pci/hda/patch_cs8409.h | 1 + 2 files changed, 65 insertions(+), 15 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 31ff11ab868e..88213e95f0b3 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -634,6 +634,30 @@ static void cs42l42_run_jack_detect(struct sub_codec *cs42l42) cs8409_i2c_write(cs42l42, 0x1120, 0xc0); } +static void cs42l42_run_jack_detect_all(struct hda_codec *codec) +{ + struct cs8409_spec *spec = codec->spec; + struct sub_codec *cs42l42; + int i; + + for (i = 0; i < spec->num_scodecs; i++) { + cs42l42 = spec->scodecs[i]; + cs42l42_enable_jack_detect(cs42l42); + if (!cs42l42->hp_jack_in) + cs42l42_run_jack_detect(cs42l42); + } +} + +/* + * cs42l42_jack_detect_worker - Worker that retries jack detect + */ +static void cs42l42_jack_detect_worker(struct work_struct *work) +{ + struct cs8409_spec *spec = container_of(work, struct cs8409_spec, jack_detect_work.work); + + cs42l42_run_jack_detect_all(spec->codec); +} + static int cs42l42_handle_tip_sense(struct sub_codec *cs42l42, unsigned int reg_ts_status) { int status_changed = 0; @@ -749,8 +773,6 @@ static void cs42l42_resume(struct sub_codec *cs42l42) if (cs42l42->full_scale_vol) cs8409_i2c_write(cs42l42, 0x2001, 0x01); - - cs42l42_enable_jack_detect(cs42l42); } #ifdef CONFIG_PM @@ -800,6 +822,7 @@ static void cs8409_free(struct hda_codec *codec) /* Cancel i2c clock disable timer, and disable clock if left enabled */ cancel_delayed_work_sync(&spec->i2c_clk_work); + cancel_delayed_work_sync(&spec->jack_detect_work); cs8409_disable_i2c_clock(codec); snd_hda_gen_free(codec); @@ -863,6 +886,7 @@ static int cs8409_cs42l42_suspend(struct hda_codec *codec) /* Cancel i2c clock disable timer, and disable clock if left enabled */ cancel_delayed_work_sync(&spec->i2c_clk_work); + cancel_delayed_work_sync(&spec->jack_detect_work); cs8409_disable_i2c_clock(codec); snd_hda_shutup_pins(codec); @@ -970,6 +994,8 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, spec->scodecs[CS8409_CODEC0]->codec = codec; codec->patch_ops = cs8409_cs42l42_patch_ops; + INIT_DELAYED_WORK(&spec->jack_detect_work, cs42l42_jack_detect_worker); + spec->gen.suppress_auto_mute = 1; spec->gen.no_primary_hp = 1; spec->gen.suppress_vmaster = 1; @@ -1029,9 +1055,16 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, case HDA_FIXUP_ACT_INIT: cs8409_cs42l42_hw_init(codec); spec->init_done = 1; - if (spec->init_done && spec->build_ctrl_done - && !spec->scodecs[CS8409_CODEC0]->hp_jack_in) - cs42l42_run_jack_detect(spec->scodecs[CS8409_CODEC0]); + if (spec->init_done && spec->build_ctrl_done) { + /* No point in running jack detect until we have fully resumed */ + if (codec->core.dev.power.power_state.event != PM_EVENT_ON) { + codec_warn(codec, "Not ready to detect jack, deferring...\n"); + schedule_delayed_work(&spec->jack_detect_work, msecs_to_jiffies(25)); + return; + } else { + cs42l42_run_jack_detect_all(codec); + } + } break; case HDA_FIXUP_ACT_BUILD: spec->build_ctrl_done = 1; @@ -1040,9 +1073,16 @@ void cs8409_cs42l42_fixups(struct hda_codec *codec, const struct hda_fixup *fix, * been already plugged in. * Run immediately after init. */ - if (spec->init_done && spec->build_ctrl_done - && !spec->scodecs[CS8409_CODEC0]->hp_jack_in) - cs42l42_run_jack_detect(spec->scodecs[CS8409_CODEC0]); + if (spec->init_done && spec->build_ctrl_done) { + /* No point in running jack detect until we have fully resumed */ + if (codec->core.dev.power.power_state.event != PM_EVENT_ON) { + codec_warn(codec, "Not ready to detect jack, deferring...\n"); + schedule_delayed_work(&spec->jack_detect_work, msecs_to_jiffies(25)); + return; + } else { + cs42l42_run_jack_detect_all(codec); + } + } break; default: break; @@ -1178,7 +1218,6 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac { struct cs8409_spec *spec = codec->spec; struct snd_kcontrol_new *kctrl; - int i; switch (action) { case HDA_FIXUP_ACT_PRE_PROBE: @@ -1193,6 +1232,8 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac spec->scodecs[CS8409_CODEC1]->codec = codec; spec->num_scodecs = 2; + INIT_DELAYED_WORK(&spec->jack_detect_work, cs42l42_jack_detect_worker); + codec->patch_ops = cs8409_dolphin_patch_ops; /* GPIO 1,5 out, 0,4 in */ @@ -1237,9 +1278,13 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac dolphin_hw_init(codec); spec->init_done = 1; if (spec->init_done && spec->build_ctrl_done) { - for (i = 0; i < spec->num_scodecs; i++) { - if (!spec->scodecs[i]->hp_jack_in) - cs42l42_run_jack_detect(spec->scodecs[i]); + /* No point in running jack detect until we have fully resumed */ + if (codec->core.dev.power.power_state.event != PM_EVENT_ON) { + codec_warn(codec, "Not ready to detect jack, deferring...\n"); + schedule_delayed_work(&spec->jack_detect_work, msecs_to_jiffies(25)); + return; + } else { + cs42l42_run_jack_detect_all(codec); } } break; @@ -1251,9 +1296,13 @@ void dolphin_fixups(struct hda_codec *codec, const struct hda_fixup *fix, int ac * Run immediately after init. */ if (spec->init_done && spec->build_ctrl_done) { - for (i = 0; i < spec->num_scodecs; i++) { - if (!spec->scodecs[i]->hp_jack_in) - cs42l42_run_jack_detect(spec->scodecs[i]); + /* No point in running jack detect until we have fully resumed */ + if (codec->core.dev.power.power_state.event != PM_EVENT_ON) { + codec_warn(codec, "Not ready to detect jack, deferring...\n"); + schedule_delayed_work(&spec->jack_detect_work, msecs_to_jiffies(25)); + return; + } else { + cs42l42_run_jack_detect_all(codec); } } break; diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index ade2b838590c..632d3ec8322d 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -330,6 +330,7 @@ struct cs8409_spec { unsigned int i2c_clck_enabled; unsigned int dev_addr; struct delayed_work i2c_clk_work; + struct delayed_work jack_detect_work; unsigned int playback_started:1; unsigned int capture_started:1;