From patchwork Tue Jul 10 18:16:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 141641 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4202623ljj; Tue, 10 Jul 2018 11:17:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfRdoOWDt/L3v4fFx6kCZfE9KN+SFTP8fTpBGebGWBMiOw5y6btsWLHNqlhUey5Cdb+ZAyO X-Received: by 2002:a1c:a342:: with SMTP id m63-v6mr14725009wme.141.1531246638831; Tue, 10 Jul 2018 11:17:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531246638; cv=none; d=google.com; s=arc-20160816; b=Y1RC4w0lSNSiEkg1NvAO4AGS+5eFB9unii9r/7vr0lHCfcEhpwMYef6prHFs2aqEgO xt6ExKPe6cOXdUyaqpN1n/5RFx0wVJjJcY2/ErzghzgUcRiaf6w3/VMffJ+ytKrXvGvk QjnTBntxzQEr80zwREJl+p6MVL07fQtvBPZCdLE/zDATq5jDFjOfCLoR5Rj/0bgRvadT MV0FuVpQtRgGzUZvFt7yN/98h8n7mz/Qbqbv/BXM1ypOdIIzmgs4I6OL1S8O19bFI6jQ bniVDFSCTYQEyaCHKqQvvYd4iy1ReqhU92v87M7vUteF26yRNZRFgPKvPwoBRLQCdmfV zGFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=ZW3v2foIqnc0BhQ+GqLDrlxt8pHzzi+ruW7hokDPHp4=; b=vpSGSYXilud505hjjaHxpFTr4b9VGD2rP70LH6slS8U1EM8PNFmYzWvNEHQ2PgV+e1 n0a/lGqeTVJdQCkZsmJHOvGdvMD4Q5+Hk2+3vfYR9jJHaOBcpoLUP2tg6+08sig9O56a 8zA1jtje2KiT0v4QotO4/dxCK9WB6eCG8O+wvuEAQeXwzGJ0cpfw4OMNA+YqINzBYA+p o47Eq34bNQ6KRHcjC2yTx0AULqOWQkc3D40K8zXWAk12u//mY+qLVr4v99JQerF7YRcM TDNyUbeG+ZrIZ7sO5Tz3wAFxre9jV/1UTRwDJLqgxMeI08ZjIDFj+FPxFLS4TBIgzX+V hhOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=XMGa7OXj; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id l11-v6si16313403wro.140.2018.07.10.11.17.18; Tue, 10 Jul 2018 11:17:18 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=XMGa7OXj; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A17AF267714; Tue, 10 Jul 2018 20:16:53 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 6DC23267715; Tue, 10 Jul 2018 20:16:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 2E968267718 for ; Tue, 10 Jul 2018 20:16:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=5COcZHDWpWa6XdGsXZqQ24lorJ+l2msGvlRBvaNzfss=; b=XMGa7OXjw67+ h/XEc8vbU1KCeH0yCc2OL+2b1/gDV0a1g4JnF3vBvLPGuleaRD17l2yQt+7eCJhOu9+xMTVh80a/y cNN46uBiYz1RcCirYc39U9kz02HAq+oyK8txXLaxNu+E5kgpYuHbTCNFfSJoab6S28TXAAngFy7xY UluNw=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fcxBn-00029I-8c; Tue, 10 Jul 2018 18:16:39 +0000 Received: from broonie by debutante with local (Exim 4.91) (envelope-from ) id 1fcxBm-0001jO-QL; Tue, 10 Jul 2018 19:16:38 +0100 From: Mark Brown To: Hans de Goede In-Reply-To: <20180704225935.7902-1-hdegoede@redhat.com> Message-Id: Date: Tue, 10 Jul 2018 19:16:38 +0100 Cc: Oder Chiou , alsa-devel@alsa-project.org, Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: rt5651: Fix workqueue cancel vs irq free race on remove" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: rt5651: Fix workqueue cancel vs irq free race on remove has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 8d2d7bcdc1645dc243f7735278675b083c0e506c Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 5 Jul 2018 00:59:31 +0200 Subject: [PATCH] ASoC: rt5651: Fix workqueue cancel vs irq free race on remove On removal we must free the IRQ *before* cancelling the jack-detect work, so that the jack-detect work cannot be rescheduled by the IRQ. Before this commit we were cancelling the jack-detect work from the driver remove callback, while relying on devm to free the IRQ, which happens after the remove callback. This is the wrong order. This commit uses a devm-action to register a devm callback which cancels the work, before requesting the IRQ (devm tears things down in reverse order). This also allows us to remove the now empty remove driver callback. Cc: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/codecs/rt5651.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) -- 2.18.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 6b5669f3e85d..39d2c67cd064 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1696,6 +1696,13 @@ static irqreturn_t rt5651_irq(int irq, void *data) return IRQ_HANDLED; } +static void rt5651_cancel_work(void *data) +{ + struct rt5651_priv *rt5651 = data; + + cancel_work_sync(&rt5651->jack_detect_work); +} + static int rt5651_set_jack(struct snd_soc_component *component, struct snd_soc_jack *hp_jack, void *data) { @@ -2036,6 +2043,11 @@ static int rt5651_i2c_probe(struct i2c_client *i2c, INIT_WORK(&rt5651->jack_detect_work, rt5651_jack_detect_work); + /* Make sure work is stopped on probe-error / remove */ + ret = devm_add_action_or_reset(&i2c->dev, rt5651_cancel_work, rt5651); + if (ret) + return ret; + ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_rt5651, rt5651_dai, ARRAY_SIZE(rt5651_dai)); @@ -2043,15 +2055,6 @@ static int rt5651_i2c_probe(struct i2c_client *i2c, return ret; } -static int rt5651_i2c_remove(struct i2c_client *i2c) -{ - struct rt5651_priv *rt5651 = i2c_get_clientdata(i2c); - - cancel_work_sync(&rt5651->jack_detect_work); - - return 0; -} - static struct i2c_driver rt5651_i2c_driver = { .driver = { .name = "rt5651", @@ -2059,7 +2062,6 @@ static struct i2c_driver rt5651_i2c_driver = { .of_match_table = of_match_ptr(rt5651_of_match), }, .probe = rt5651_i2c_probe, - .remove = rt5651_i2c_remove, .id_table = rt5651_i2c_id, }; module_i2c_driver(rt5651_i2c_driver);