From patchwork Thu Feb 20 00:59:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 193493 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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, 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 59114C5ACC4 for ; Thu, 20 Feb 2020 01:00:43 +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 D139321D56 for ; Thu, 20 Feb 2020 01:00:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="redzF1lp" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D139321D56 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.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 24BC71698; Thu, 20 Feb 2020 01:59:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 24BC71698 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1582160441; bh=WIREyY1ApqBMYu/Usk6zeSyz0He67nvO51UZSEKu7rg=; h=Date:From:Subject:To:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=redzF1lpbKXUhmoeWm0TD5Pc3qU/vFZ8k/aMDcNDDj8bsiYjUYSj1NeCPPk1B09h1 jfybnioh1tY5iAcE6AN+pU5rgOsWj6N0upRkZ006cr1wU1gN820k1Sy8pGlsIuYOyA vzfYmy7e9xnlAW6W4Lt5xI/Q+BxQam1ozUYqcXaw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 9835AF8025F; Thu, 20 Feb 2020 01:59:50 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id B7BDAF80273; Thu, 20 Feb 2020 01:59:48 +0100 (CET) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa1.perex.cz (Postfix) with ESMTP id BAEB8F80114 for ; Thu, 20 Feb 2020 01:59:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BAEB8F80114 Date: 20 Feb 2020 09:59:40 +0900 X-IronPort-AV: E=Sophos;i="5.70,462,1574089200"; d="scan'208";a="39540269" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 20 Feb 2020 09:59:40 +0900 Received: from mercury.renesas.com (unknown [10.166.252.133]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id E7AAC400A88D; Thu, 20 Feb 2020 09:59:39 +0900 (JST) Message-ID: <878skyt6om.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH][RFC] ASoC: soc-component: count snd_soc_component_open/close() User-Agent: Wanderlust/2.15.9 Emacs/25.2 Mule/6.0 To: Kai Vehmanen , broonie@kernel.org In-Reply-To: <87blput7hh.wl-kuninori.morimoto.gx@renesas.com> References: <20200219182650.1416-1-kai.vehmanen@linux.intel.com> <87blput7hh.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Cc: alsa-devel@alsa-project.org, ranjani.sridharan@linux.intel.com, digetx@gmail.com, pierre-louis.bossart@linux.intel.com 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" ASoC component open/close and snd_soc_component_module_get/put are called once for each component, but we need it for each substream. To solve this issue, this patch counts open / get, and call close / put accordingly. Fixes: dd03907bf129 ("ASoC: soc-pcm: call snd_soc_component_open/close() once") Reported-by: Kai Vehmanen Signed-off-by: Kuninori Morimoto --- I tidyuped code. I hope it can solve the issue. include/sound/soc-component.h | 5 +++-- sound/soc/soc-component.c | 35 ++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 1866ecc8e94b..4e78925858c0 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -181,10 +181,11 @@ struct snd_soc_component { const char *debugfs_prefix; #endif + u8 opened; + u8 module; + /* bit field */ unsigned int suspended:1; /* is in suspend PM state */ - unsigned int opened:1; - unsigned int module:1; }; #define for_each_component_dais(component, dai)\ diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index ee00c09df5e7..bdd36be1fb70 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -297,14 +297,16 @@ EXPORT_SYMBOL_GPL(snd_soc_component_set_jack); int snd_soc_component_module_get(struct snd_soc_component *component, int upon_open) { - if (component->module) - return 0; + if (unlikely(component->module == 0xff)) { + dev_warn(component->dev, "too many module get (%s)\n", component->name); + return -EBUSY; + } if (component->driver->module_get_upon_open == !!upon_open && !try_module_get(component->dev->driver->owner)) return -ENODEV; - component->module = 1; + component->module++; return 0; } @@ -312,11 +314,13 @@ int snd_soc_component_module_get(struct snd_soc_component *component, void snd_soc_component_module_put(struct snd_soc_component *component, int upon_open) { - if (component->module && - component->driver->module_get_upon_open == !!upon_open) + if (!component->module) + return; + + if (component->driver->module_get_upon_open == !!upon_open) module_put(component->dev->driver->owner); - component->module = 0; + component->module--; } int snd_soc_component_open(struct snd_soc_component *component, @@ -324,12 +328,15 @@ int snd_soc_component_open(struct snd_soc_component *component, { int ret = 0; - if (!component->opened && - component->driver->open) + if (unlikely(component->opened == 0xff)) { + dev_warn(component->dev, "too many open (%s)\n", component->name); + return -EBUSY; + } + + if (component->driver->open) ret = component->driver->open(component, substream); - if (ret == 0) - component->opened = 1; + component->opened++; return ret; } @@ -339,11 +346,13 @@ int snd_soc_component_close(struct snd_soc_component *component, { int ret = 0; - if (component->opened && - component->driver->close) + if (!component->opened) + return; + + if (component->driver->close) ret = component->driver->close(component, substream); - component->opened = 0; + component->opened--; return ret; }