From patchwork Tue Dec 14 13:38:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Chiu X-Patchwork-Id: 1567743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=dc88Nruk; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JCzx04P0zz9s5P for ; Wed, 15 Dec 2021 00:38:44 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mx80s-000238-Hm; Tue, 14 Dec 2021 13:38:38 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mx80q-00021W-MU for kernel-team@lists.ubuntu.com; Tue, 14 Dec 2021 13:38:36 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 4355D3F1AA for ; Tue, 14 Dec 2021 13:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1639489116; bh=4YiSL8iJuWQnScAfrKH7qPWoDrk2IhLGzjy7va5x3gI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dc88Nrukmk2tAavHK22AzQ6kboOsQLndUCXgMT1X9biV6Xs9H4Az3xvPzSGSIEJrt ijzhr5qZQkjl9THCLXbDDEJmBHqMY7vAs4ZYwf333OXbeiROsqO6qkMI3TYXVxDAnA rwjPFP88YFnYfwZfhg73g+DavD2mBSzVX73Lc5pgugMhwmYdIo/T9v13Tec0jy2Ig+ 02p/CoaNO55FFMXsNc3tcmv/qTAvSS5nehaRt2s3fSvdXrp+GWFbC3o+WsDlcKUApM DMysFKZxPPUpUUXunpPh0qLV1CN9s/h+In6fl2l4+i1a04m7lHe4thnwqWhvtZIBFT BcoXxcwLahzkw== Received: by mail-pf1-f200.google.com with SMTP id y68-20020a626447000000b004a2b2d0c39eso11803564pfb.14 for ; Tue, 14 Dec 2021 05:38:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4YiSL8iJuWQnScAfrKH7qPWoDrk2IhLGzjy7va5x3gI=; b=iJvXbJ/SNR8lOXd1y2fP1NiO8xJmpFp8s0BSm2Is1iy768Uva3zq6JNmCubpxnQXIj eet94mCqeAnfOi9HAXowWGQVU/mYhRUMQOjRNy/hCyjreMN6V+nQ6QiQooyk/viMc7Mk Lsr1cQrWiwDJ58XHdp3teVlFEZXD1hg7k0Wn1tzWch/CGZ1XSm778P6ZtPwn19lG2Qbe kNS8O9oFyrUepPN/BRGv2zf0qH9kwMiQ+VMV//DXFCKDdMZqHvGg/PzOxRNcm75EYuqc +Y9b9MCOzCXwKE4YEOegQut/xc0Z55GloBM+/RW+u7OLzbaDV2muEF/frBEUZyb7DQDB DYYw== X-Gm-Message-State: AOAM533dk1e2Rck3M09M3MPxZjgh71wuOpYy5Tqlj1TB0caUf10vaD04 caOu7+DMyWRkVia6a5sp9+bZJNyPUWtH/ybpKIsfIqxJ8JpNIt+hN2hDPoLZdS4MVlE7itPzIXO +kiqFmen4w4WiwfCLvbzK1X7b5Qk2h7VMSUwLHJgEew== X-Received: by 2002:a63:c155:: with SMTP id p21mr3698881pgi.156.1639489114483; Tue, 14 Dec 2021 05:38:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxFyqmcbnE0saR3dspXW6P2IG+C0tq4oF8tnSPvXIDMOdykVxCjcB6032GXNgGqRsSNwM5AEg== X-Received: by 2002:a63:c155:: with SMTP id p21mr3698859pgi.156.1639489114041; Tue, 14 Dec 2021 05:38:34 -0800 (PST) Received: from localhost.localdomain (2001-b400-e254-16ab-15b2-cb7c-9603-ce9c.emome-ip6.hinet.net. [2001:b400:e254:16ab:15b2:cb7c:9603:ce9c]) by smtp.gmail.com with ESMTPSA id j7sm16831371pfu.164.2021.12.14.05.38.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Dec 2021 05:38:33 -0800 (PST) From: Chris Chiu To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][SRU][OEM-5.14] Revert "UBUNTU: SAUCE: ALSA: hda/cs8409: Schedule delayed work for jack detect on resume" Date: Tue, 14 Dec 2021 21:38:28 +0800 Message-Id: <20211214133829.413311-2-chris.chiu@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211214133829.413311-1-chris.chiu@canonical.com> References: <20211214133829.413311-1-chris.chiu@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1954773 This reverts commit e3241734e283f7906d67ad81fb0f85a1fd661a67. Signed-off-by: Chris Chiu --- sound/pci/hda/patch_cs8409.c | 79 +++++++----------------------------- sound/pci/hda/patch_cs8409.h | 1 - 2 files changed, 15 insertions(+), 65 deletions(-) diff --git a/sound/pci/hda/patch_cs8409.c b/sound/pci/hda/patch_cs8409.c index 88213e95f0b3..31ff11ab868e 100644 --- a/sound/pci/hda/patch_cs8409.c +++ b/sound/pci/hda/patch_cs8409.c @@ -634,30 +634,6 @@ 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; @@ -773,6 +749,8 @@ 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 @@ -822,7 +800,6 @@ 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); @@ -886,7 +863,6 @@ 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); @@ -994,8 +970,6 @@ 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; @@ -1055,16 +1029,9 @@ 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) { - /* 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); - } - } + if (spec->init_done && spec->build_ctrl_done + && !spec->scodecs[CS8409_CODEC0]->hp_jack_in) + cs42l42_run_jack_detect(spec->scodecs[CS8409_CODEC0]); break; case HDA_FIXUP_ACT_BUILD: spec->build_ctrl_done = 1; @@ -1073,16 +1040,9 @@ 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) { - /* 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); - } - } + if (spec->init_done && spec->build_ctrl_done + && !spec->scodecs[CS8409_CODEC0]->hp_jack_in) + cs42l42_run_jack_detect(spec->scodecs[CS8409_CODEC0]); break; default: break; @@ -1218,6 +1178,7 @@ 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: @@ -1232,8 +1193,6 @@ 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 */ @@ -1278,13 +1237,9 @@ 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) { - /* 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); + for (i = 0; i < spec->num_scodecs; i++) { + if (!spec->scodecs[i]->hp_jack_in) + cs42l42_run_jack_detect(spec->scodecs[i]); } } break; @@ -1296,13 +1251,9 @@ 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) { - /* 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); + for (i = 0; i < spec->num_scodecs; i++) { + if (!spec->scodecs[i]->hp_jack_in) + cs42l42_run_jack_detect(spec->scodecs[i]); } } break; diff --git a/sound/pci/hda/patch_cs8409.h b/sound/pci/hda/patch_cs8409.h index 632d3ec8322d..ade2b838590c 100644 --- a/sound/pci/hda/patch_cs8409.h +++ b/sound/pci/hda/patch_cs8409.h @@ -330,7 +330,6 @@ 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;